Skip to content

Commit 5e7f6e7

Browse files
tsconfig
1 parent 3d06d40 commit 5e7f6e7

File tree

19 files changed

+231
-42
lines changed

19 files changed

+231
-42
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
runs-on: windows-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: dtolnay/rust-toolchain@stable
2019
- uses: swatinem/rust-cache@v2
2120
- uses: actions/setup-node@v4
2221
with:

Cargo.lock

Lines changed: 110 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/backend/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "blending"
33
version = "0.0.0"
4-
description = "Blender Launcher"
4+
description = "Fluently manage Blender versions"
55
authors.workspace = true
66
edition.workspace = true
77
license.workspace = true
@@ -19,6 +19,7 @@ tauri-plugin-single-instance = "2.0.0-beta"
1919
tauri-plugin-dialog = "2.0.0-beta"
2020
tauri-plugin-autostart = "2.0.0-beta"
2121
tauri-plugin-log = "2.0.0-beta"
22+
tauri-plugin-cli = "2.0.0-beta"
2223
serde = { version = "1", features = ["derive"] }
2324
serde_json = "1"
2425
raw-window-handle = "0.6"

apps/backend/src/main.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn main() {
4141
// stream.login("anonymous", "").unwrap();
4242
// println!("Connected!");
4343

44-
44+
4545
// println!("Going to Blender 4.1 directory...");
4646
// stream.cwd("/blender/blender-release/Blender4.1").unwrap();
4747

@@ -66,7 +66,7 @@ fn main() {
6666
// total,
6767
// };
6868
// copy(&mut progress, &mut file).unwrap();
69-
69+
7070
// Ok(())
7171
// }
7272
// ).unwrap();
@@ -89,6 +89,7 @@ fn main() {
8989
.plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, None))
9090
.plugin(tauri_plugin_shell::init())
9191
.plugin(tauri_plugin_window_state::Builder::default().build())
92+
.plugin(tauri_plugin_cli::init())
9293
.plugin(
9394
tauri_plugin_single_instance::init(|app, args, cwd| {
9495

@@ -111,7 +112,7 @@ fn main() {
111112
}
112113

113114

114-
let app = app.handle();
115+
let app = app.handle();
115116
let tray = app.tray_by_id("main").unwrap();
116117

117118
// let icon_play = Image::from_path(get_resource(app, "icon_play.png")?)?;
@@ -165,7 +166,7 @@ fn main() {
165166
}
166167
}
167168
});
168-
169+
169170

170171
let window = app.get_webview_window("main").unwrap();
171172
#[cfg(windows)]

apps/backend/tauri.conf.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"csp": null
2626
}
2727
},
28+
"plugins": {
29+
"cli": {
30+
31+
}
32+
},
2833
"bundle": {
2934
"copyright": "Copyright (c) deminearchiver 2024",
3035
"active": true,

apps/docs/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"unist-util-visit": "^5.0.0"
3434
},
3535
"devDependencies": {
36+
"@blending/config": "workspace:^",
3637
"wrangler": "^3.44.0"
3738
}
3839
}

apps/docs/tsconfig.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
"extends": "astro/tsconfigs/strict",
3-
"compilerOptions": {
4-
"jsx": "preserve",
5-
"jsxImportSource": "solid-js"
6-
}
7-
}
2+
"extends": [
3+
"astro/tsconfigs/strict",
4+
"@blending/config/tsconfigs/solid",
5+
],
6+
}

apps/frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"solid-transition-group": "^0.2.3"
2727
},
2828
"devDependencies": {
29+
"@blending/config": "workspace:^",
2930
"@solid-primitives/event-listener": "^2.3.3",
3031
"@solid-primitives/refs": "^1.0.8",
3132
"@types/node": "^20.12.3",

apps/frontend/tsconfig.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
{
2+
"extends": [
3+
"@blending/config/tsconfigs/base",
4+
"@blending/config/tsconfigs/strict",
5+
"@blending/config/tsconfigs/solid",
6+
],
27
"compilerOptions": {
3-
"target": "ES2020",
4-
"useDefineForClassFields": true,
5-
"module": "ESNext",
6-
"lib": ["ES2020", "DOM", "DOM.Iterable"],
7-
"skipLibCheck": true,
8+
// "target": "ES2020",
9+
// "useDefineForClassFields": true,
10+
// "module": "ESNext",
11+
// "lib": ["ES2020", "DOM", "DOM.Iterable"],
12+
// "skipLibCheck": true,
813

914
/* Bundler mode */
1015
"moduleResolution": "bundler",
1116
"allowImportingTsExtensions": true,
1217
"resolveJsonModule": true,
1318
"isolatedModules": true,
1419
"noEmit": true,
15-
"jsx": "preserve",
16-
"jsxImportSource": "solid-js",
20+
// "jsx": "preserve",
21+
// "jsxImportSource": "solid-js",
1722

1823
/* Linting */
19-
"strict": true
24+
// "strict": true
2025
},
2126
"include": ["src"],
2227
"references": [{ "path": "./tsconfig.node.json" }]

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
"packages/*"
1313
],
1414
"scripts": {
15-
":": "yarn workspace"
15+
":": "yarn workspace",
16+
":docs": "yarn workspace @blending/docs",
17+
":backend": "yarn workspace @blending/backend",
18+
":frontend": "yarn workspace @blending/frontend"
1619
},
1720
"devDependencies": {
1821
"typescript": "^5.4.3",

packages/common/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
},
99
"packageManager": "yarn@4.1.1",
1010
"devDependencies": {
11+
"@blending/config": "workspace:^",
1112
"typescript": "^5.4.3"
1213
},
1314
"dependencies": {

packages/common/tsconfig.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
{
2+
"extends": [
3+
"@blending/config/tsconfigs/base",
4+
"@blending/config/tsconfigs/strict",
5+
],
26
"compilerOptions": {
3-
"target": "ES2020",
4-
"useDefineForClassFields": true,
5-
"module": "ESNext",
6-
"lib": ["ES2020", "DOM", "DOM.Iterable"],
7-
"skipLibCheck": true,
7+
// "target": "ES2020",
8+
// "useDefineForClassFields": true,
9+
// "module": "ESNext",
10+
// "lib": ["ES2020", "DOM", "DOM.Iterable"],
11+
// "skipLibCheck": true,
812

913
/* Bundler mode */
1014
"moduleResolution": "bundler",
1115
"allowImportingTsExtensions": true,
1216
"resolveJsonModule": true,
1317
"isolatedModules": true,
1418
"noEmit": true,
15-
"jsx": "preserve",
16-
"jsxImportSource": "solid-js",
19+
// No SolidJS!
20+
// "jsx": "preserve",
21+
// "jsxImportSource": "solid-js",
1722

1823
/* Linting */
19-
"strict": true,
20-
"noImplicitOverride": true,
24+
// "strict": true,
25+
// "noImplicitOverride": true,
2126
},
22-
"include": ["src"]
27+
"include": ["src"],
2328
}

packages/config/package.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"private": true,
3+
"name": "@blending/config",
4+
"version": "0.0.0",
5+
"type": "module",
6+
"packageManager": "yarn@4.1.1",
7+
"exports": {
8+
"./tsconfigs/*": "./tsconfigs/*.json"
9+
}
10+
}

0 commit comments

Comments
 (0)