Skip to content

Commit 559ed2e

Browse files
authored
update to electron v37 (#2260)
1 parent 091b52f commit 559ed2e

5 files changed

Lines changed: 554 additions & 609 deletions

File tree

Taskfile.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@ tasks:
262262
- "pkg/**/*.go"
263263
# don't add generates key (otherwise will always execute)
264264

265+
outdated:
266+
desc: Check for outdated packages using npm-check-updates.
267+
cmd: yarn dlx npm-check-updates
268+
265269
version:
266270
desc: Get the current package version, or bump version if args are present. To pass args to `version.cjs`, add them after `--`. See `version.cjs` for usage definitions for the arguments.
267271
cmd: node version.cjs {{.CLI_ARGS}}

docs/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@
3939
"@docusaurus/module-type-aliases": "3.7.0",
4040
"@docusaurus/tsconfig": "3.7.0",
4141
"@docusaurus/types": "3.7.0",
42-
"@eslint/js": "^9.33.0",
42+
"@eslint/js": "^8.57.0",
4343
"@mdx-js/typescript-plugin": "^0.0.8",
4444
"@types/eslint": "^9.6.1",
4545
"@types/eslint-config-prettier": "^6.11.3",
46-
"eslint": "^9.33.0",
46+
"@types/react": "^18.3.0",
47+
"@types/react-dom": "^18.3.0",
48+
"eslint": "^8.57.0",
4749
"eslint-config-prettier": "^10.1.8",
4850
"eslint-plugin-mdx": "^3.1.5",
4951
"prettier": "^3.4.2",

emain/emain.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,14 @@ let webviewKeys: string[] = []; // the keys to trap when webview has focus
7373
console.log = log;
7474
console.log(
7575
sprintf(
76-
"waveterm-app starting, data_dir=%s, config_dir=%s electronpath=%s gopath=%s arch=%s/%s",
76+
"waveterm-app starting, data_dir=%s, config_dir=%s electronpath=%s gopath=%s arch=%s/%s electron=%s",
7777
waveDataDir,
7878
waveConfigDir,
7979
getElectronAppBasePath(),
8080
getElectronAppUnpackedBasePath(),
8181
unamePlatform,
82-
unameArch
82+
unameArch,
83+
process.versions.electron
8384
)
8485
);
8586
if (isDev) {

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"devDependencies": {
3333
"@chromatic-com/storybook": "^3.2.7",
34-
"@eslint/js": "^9.33.0",
34+
"@eslint/js": "^8.57.0",
3535
"@rollup/plugin-node-resolve": "^16.0.1",
3636
"@storybook/addon-essentials": "^8.5.8",
3737
"@storybook/addon-interactions": "^8.5.8",
@@ -60,12 +60,12 @@
6060
"@types/tinycolor2": "^1",
6161
"@types/uuid": "^10.0.0",
6262
"@types/ws": "^8",
63-
"@vitejs/plugin-react-swc": "^3.8.1",
63+
"@vitejs/plugin-react-swc": "^4.0.0",
6464
"@vitest/coverage-istanbul": "^3.0.9",
65-
"electron": "34.5.8",
65+
"electron": "^37.3.0",
6666
"electron-builder": "^26.0",
67-
"electron-vite": "^2.3.0",
68-
"eslint": "^9.33.0",
67+
"electron-vite": "^4.0.0",
68+
"eslint": "^8.57.0",
6969
"eslint-config-prettier": "^10.1.8",
7070
"node-abi": "^4.6.0",
7171
"postcss": "^8.5.6",
@@ -84,9 +84,9 @@
8484
"tsx": "^4.20.4",
8585
"typescript": "^5.9.2",
8686
"typescript-eslint": "^8.39.1",
87-
"vite": "^6.1.6",
88-
"vite-plugin-image-optimizer": "^1.1.9",
89-
"vite-plugin-static-copy": "^2.2.0",
87+
"vite": "^6.0.0",
88+
"vite-plugin-image-optimizer": "^2.0.2",
89+
"vite-plugin-static-copy": "^3.1.1",
9090
"vite-plugin-svgr": "^4.3.0",
9191
"vite-tsconfig-paths": "^5.1.4",
9292
"vitest": "^3.0.9"
@@ -149,7 +149,7 @@
149149
"remark-gfm": "^4.0.1",
150150
"remark-github-blockquote-alert": "^1.3.1",
151151
"rxjs": "^7.8.2",
152-
"sharp": "^0.33.5",
152+
"sharp": "^0.34.0",
153153
"shell-quote": "^1.8.3",
154154
"sprintf-js": "^1.1.3",
155155
"tailwind-merge": "^3.3.1",
@@ -167,7 +167,8 @@
167167
"esbuild@npm:^0.24.2": "^0.25",
168168
"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0": "^0.25",
169169
"esbuild@npm:^0.21.5": "^0.25",
170-
"esbuild@npm:~0.23.0": "^0.25"
170+
"esbuild@npm:~0.23.0": "^0.25",
171+
"node-abi": "^4.6.0"
171172
},
172173
"packageManager": "yarn@4.6.0",
173174
"workspaces": [

0 commit comments

Comments
 (0)