From be3de511f2ea5e210467bd5f7160f2b00fae8972 Mon Sep 17 00:00:00 2001 From: Firestar99 Date: Sun, 31 Aug 2025 12:22:34 +0200 Subject: [PATCH 1/5] Desktop: Pin CEF version (#3113) Fixed CEF cargo dependency so `cargo update` does not update it --- Cargo.lock | 9 +++++---- Cargo.toml | 3 ++- desktop/Cargo.toml | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 37c248252d..3105ea07e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -656,9 +656,9 @@ dependencies = [ [[package]] name = "cef" -version = "139.6.0+139.0.37" +version = "139.0.1+139.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92479592f7519e5843f711b07aa2194021259a5e8301ddc1ce1ac2bee5cf1575" +checksum = "39b749cfc4124f9505b3fbe32279c0e93f30831f1ecf3c2cf85863179319cd7b" dependencies = [ "cef-dll-sys", "libloading", @@ -667,9 +667,9 @@ dependencies = [ [[package]] name = "cef-dll-sys" -version = "139.6.0+139.0.37" +version = "139.0.1+139.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de4c379eb16bafc1fe3f40f9635827d2c5dcef44bb703245ce08c2086dfaa0f3" +checksum = "fc42adb0adc477860b705e967d9f899be05ba3775fe4d6dc4d844a1391ffa3dd" dependencies = [ "anyhow", "cmake", @@ -2107,6 +2107,7 @@ dependencies = [ "ash", "bytemuck", "cef", + "cef-dll-sys", "core-foundation", "derivative", "dirs", diff --git a/Cargo.toml b/Cargo.toml index 874f3a2b88..94671aec4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -181,7 +181,8 @@ iai-callgrind = { version = "0.16" } ndarray = "0.16" strum = { version = "0.27", features = ["derive"] } dirs = "6.0" -cef = "139.0" +cef = "=139.0.1" +cef-dll-sys = "=139.0.1" include_dir = "0.7" tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing = "0.1" diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index fe97a9d1fa..0ed348e82b 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -30,6 +30,7 @@ winit = { workspace = true, features = ["serde"] } thiserror = { workspace = true } futures = { workspace = true } cef = { workspace = true } +cef-dll-sys = { workspace = true } tracing-subscriber = { workspace = true } tracing = { workspace = true } dirs = { workspace = true } From b5ebe78f5efaaf9b4ab6901882fe144965784adc Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Mon, 1 Sep 2025 17:22:30 -0700 Subject: [PATCH 2/5] Update all frontend npm dependencies except Svelte and Vite (#3120) * Upgrade node dependencies except Svelte 5 and its peer deps * Fix lint errors * Fix previous Rust deps upgrade breakage * Fix demo artwork * Allow profiling CI workflow to fail --- .devcontainer/devcontainer.json | 1 - .../workflows/comment-profiling-changes.yaml | 17 +- .vscode/extensions.json | 1 - frontend/.eslintrc.cjs | 109 - frontend/eslint.config.js | 125 + frontend/package-lock.json | 3764 +++++++++++------ frontend/package.json | 42 +- frontend/src/components/Editor.svelte | 5 +- .../floating-menus/ColorPicker.svelte | 4 +- .../src/components/panels/Document.svelte | 8 +- frontend/src/components/panels/Layers.svelte | 8 +- frontend/src/components/views/Graph.svelte | 20 +- .../components/widgets/WidgetSection.svelte | 8 +- .../src/components/widgets/WidgetTable.svelte | 20 +- .../widgets/inputs/CurveInput.svelte | 2 +- .../widgets/inputs/FieldInput.svelte | 8 +- .../widgets/inputs/NumberInput.svelte | 2 +- .../widgets/labels/UserInputLabel.svelte | 2 +- .../window/status-bar/StatusBar.svelte | 2 +- .../title-bar/WindowButtonsLinux.svelte | 4 +- .../title-bar/WindowButtonsWindows.svelte | 4 +- .../components/window/workspace/Panel.svelte | 54 +- frontend/src/editor.ts | 3 +- frontend/src/messages.ts | 12 - frontend/src/state-providers/app-window.ts | 3 - frontend/src/state-providers/dialog.ts | 1 - frontend/src/state-providers/document.ts | 1 - frontend/src/state-providers/fonts.ts | 1 - frontend/src/state-providers/fullscreen.ts | 11 +- frontend/src/state-providers/node-graph.ts | 1 - frontend/src/state-providers/portfolio.ts | 7 +- frontend/src/subscription-router.ts | 1 - frontend/src/utility-functions/debounce.ts | 1 - frontend/src/utility-functions/icons.ts | 2 - frontend/src/utility-functions/images.ts | 2 - frontend/src/utility-functions/panic-proxy.ts | 3 - frontend/tsconfig.json | 6 +- frontend/vite.config.ts | 15 +- .../benches/compile_demo_art_iai.rs | 4 +- 39 files changed, 2686 insertions(+), 1598 deletions(-) delete mode 100644 frontend/.eslintrc.cjs create mode 100644 frontend/eslint.config.js diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6b4ee383f2..bddfffaf1f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -23,7 +23,6 @@ "streetsidesoftware.code-spell-checker", // Helpful "mhutchie.git-graph", - "waderyan.gitblame", "qezhu.gitlink", "wmaurer.change-case" ] diff --git a/.github/workflows/comment-profiling-changes.yaml b/.github/workflows/comment-profiling-changes.yaml index e51341538c..7dec9532e5 100644 --- a/.github/workflows/comment-profiling-changes.yaml +++ b/.github/workflows/comment-profiling-changes.yaml @@ -1,7 +1,7 @@ name: Profiling Changes on: - pull_request: + pull_request: {} env: CARGO_TERM_COLOR: always @@ -9,6 +9,7 @@ env: jobs: profile: runs-on: ubuntu-latest + continue-on-error: true steps: - uses: actions/checkout@v4 with: @@ -63,7 +64,7 @@ jobs: run: | # Compile benchmarks cargo bench --bench compile_demo_art_iai -- --save-baseline=master - + # Runtime benchmarks cargo bench --bench update_executor_iai -- --save-baseline=master cargo bench --bench run_once_iai -- --save-baseline=master @@ -78,25 +79,25 @@ jobs: run: | # Compile benchmarks COMPILE_OUTPUT=$(cargo bench --bench compile_demo_art_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g') - + # Runtime benchmarks UPDATE_OUTPUT=$(cargo bench --bench update_executor_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g') RUN_ONCE_OUTPUT=$(cargo bench --bench run_once_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g') RUN_CACHED_OUTPUT=$(cargo bench --bench run_cached_iai -- --baseline=master --output-format=json | jq -sc | sed 's/\\"//g') - + # Store outputs echo "COMPILE_OUTPUT<> $GITHUB_OUTPUT echo "$COMPILE_OUTPUT" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - + echo "UPDATE_OUTPUT<> $GITHUB_OUTPUT echo "$UPDATE_OUTPUT" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - + echo "RUN_ONCE_OUTPUT<> $GITHUB_OUTPUT echo "$RUN_ONCE_OUTPUT" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - + echo "RUN_CACHED_OUTPUT<> $GITHUB_OUTPUT echo "$RUN_CACHED_OUTPUT" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT @@ -135,7 +136,7 @@ jobs: const updateOutput = JSON.parse(`${{ steps.benchmark.outputs.UPDATE_OUTPUT }}`); const runOnceOutput = JSON.parse(`${{ steps.benchmark.outputs.RUN_ONCE_OUTPUT }}`); const runCachedOutput = JSON.parse(`${{ steps.benchmark.outputs.RUN_CACHED_OUTPUT }}`); - + let significantChanges = false; let commentBody = ""; diff --git a/.vscode/extensions.json b/.vscode/extensions.json index e37a0efd11..25148f729c 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -13,7 +13,6 @@ "streetsidesoftware.code-spell-checker", // Helpful "mhutchie.git-graph", - "waderyan.gitblame", "qezhu.gitlink", "wmaurer.change-case" ] diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs deleted file mode 100644 index c71b3ff332..0000000000 --- a/frontend/.eslintrc.cjs +++ /dev/null @@ -1,109 +0,0 @@ -module.exports = { - root: true, - env: { browser: true, node: true }, - extends: [ - "eslint:recommended", - "plugin:import/recommended", - "plugin:@typescript-eslint/recommended", - "plugin:import/typescript", - "plugin:svelte/recommended", - "plugin:svelte/prettier", - "prettier", - ], - plugins: ["import", "@typescript-eslint", "prettier"], - settings: { - "import/parsers": { "@typescript-eslint/parser": [".ts"] }, - "import/resolver": { typescript: true, node: true }, - }, - parser: "@typescript-eslint/parser", - parserOptions: { - ecmaVersion: "latest", - project: "./tsconfig.json", - extraFileExtensions: [".svelte"], - }, - ignorePatterns: [ - // Ignore generated directories - "node_modules/", - "dist/", - "pkg/", - "wasm/pkg/", - // Don't ignore JS and TS dotfiles in this folder - "!.*.js", - "!.*.ts", - ], - overrides: [ - { - files: ["*.svelte"], - parser: "svelte-eslint-parser", - // Parse the ` - {#each widgetData.tableWidgets as row} - - {#each row as cell} - - {/each} - - {/each} + + {#each widgetData.tableWidgets as row} + + {#each row as cell} + + {/each} + + {/each} +
- -
+ +