♻️ Upgrade to Electron v28.3.3 https://github.com/siyuan-note/siyuan/issues/11654

.github/CONTRIBUTING.md

@@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@9.1.1`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.1 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.3 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@28.3.1 -D`
+    * `pnpm install electron@28.3.3 -D`
 
 NPM mirror:
 
@@ -28,7 +28,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@28.3.1 -D`
+* `pnpm install electron@28.3.3 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -16,11 +16,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.1 -D
+ ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.3 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@28.3.1 -D`
+    * `pnpm install electron@28.3.3 -D`
 
 NPM 镜像：
 
@@ -30,7 +30,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@28.3.1 -D`
+* `pnpm install electron@28.3.3 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

app/package.json

@@ -55,7 +55,7 @@
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.7.1",
     "dayjs": "^1.11.5",
-    "electron": "28.3.1",
+    "electron": "28.3.3",
     "electron-builder": "24.9.1",
     "encoding": "^0.1.13",
     "esbuild-loader": "^3.0.1",

app/pnpm-lock.yaml

@@ -10,14 +10,14 @@ importers:
     dependencies:
       '@electron/remote':
         specifier: ^2.1.2
-        version: 2.1.2(electron@28.3.1)
+        version: 2.1.2(electron@28.3.3)
     devDependencies:
       '@types/node':
         specifier: ^18.13.0
         version: 18.13.0
       '@typescript-eslint/eslint-plugin':
         specifier: ^5.30.6
-        version: 5.30.6(@typescript-eslint/parser@5.30.6)(eslint@8.19.0)(typescript@4.7.4)
+        version: 5.30.6(@typescript-eslint/parser@5.30.6(eslint@8.19.0)(typescript@4.7.4))(eslint@8.19.0)(typescript@4.7.4)
       '@typescript-eslint/parser':
         specifier: ^5.30.6
         version: 5.30.6(eslint@8.19.0)(typescript@4.7.4)
@@ -26,16 +26,16 @@ importers:
         version: 2.19.0
       clean-webpack-plugin:
         specifier: ^4.0.0
-        version: 4.0.0(webpack@5.76.0)
+        version: 4.0.0(webpack@5.76.0(webpack-cli@4.10.0))
       css-loader:
         specifier: ^6.7.1
-        version: 6.7.1(webpack@5.76.0)
+        version: 6.7.1(webpack@5.76.0(webpack-cli@4.10.0))
       dayjs:
         specifier: ^1.11.5
         version: 1.11.5
       electron:
-        specifier: 28.3.1
+        specifier: 28.3.3
-        version: 28.3.1
+        version: 28.3.3
       electron-builder:
         specifier: 24.9.1
         version: 24.9.1
@@ -44,19 +44,19 @@ importers:
         version: 0.1.13
       esbuild-loader:
         specifier: ^3.0.1
-        version: 3.0.1(webpack@5.76.0)
+        version: 3.0.1(webpack@5.76.0(webpack-cli@4.10.0))
       eslint:
         specifier: ^8.19.0
         version: 8.19.0
       file-loader:
         specifier: ^6.2.0
-        version: 6.2.0(webpack@5.76.0)
+        version: 6.2.0(webpack@5.76.0(webpack-cli@4.10.0))
       html-loader:
         specifier: ^2.1.2
-        version: 2.1.2(webpack@5.76.0)
+        version: 2.1.2(webpack@5.76.0(webpack-cli@4.10.0))
       html-webpack-plugin:
         specifier: ^5.5.0
-        version: 5.5.0(webpack@5.76.0)
+        version: 5.5.0(webpack@5.76.0(webpack-cli@4.10.0))
       iconv-lite:
         specifier: ^0.6.3
         version: 0.6.3
@@ -65,7 +65,7 @@ importers:
         version: 2.3.2
       mini-css-extract-plugin:
         specifier: 2.7.6
-        version: 2.7.6(webpack@5.76.0)
+        version: 2.7.6(webpack@5.76.0(webpack-cli@4.10.0))
       path-browserify:
         specifier: ^1.0.1
         version: 1.0.1
@@ -77,7 +77,7 @@ importers:
         version: 1.53.0
       sass-loader:
         specifier: ^12.6.0
-        version: 12.6.0(sass@1.53.0)(webpack@5.76.0)
+        version: 12.6.0(sass@1.53.0)(webpack@5.76.0(webpack-cli@4.10.0))
       typescript:
         specifier: ^4.7.4
         version: 4.7.4
@@ -922,8 +922,8 @@ packages:
   electron-to-chromium@1.4.186:
     resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
 
-  electron@28.3.1:
+  electron@28.3.3:
-    resolution: {integrity: sha512-aF9fONuhVDJlctJS7YOw76ynxVAQdfIWmlhRMKits24tDcdSL0eMHUS0wWYiRfGWbQnUKB6V49Rf17o32f4/fg==}
+    resolution: {integrity: sha512-ObKMLSPNhomtCOBAxFS8P2DW/4umkh72ouZUlUKzXGtYuPzgr1SYhskhFWgzAsPtUzhL2CzyV2sfbHcEW4CXqw==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
@@ -2243,9 +2243,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/remote@2.1.2(electron@28.3.1)':
+  '@electron/remote@2.1.2(electron@28.3.3)':
     dependencies:
-      electron: 28.3.1
+      electron: 28.3.3
 
   '@electron/universal@1.4.1':
     dependencies:
@@ -2472,7 +2472,7 @@ snapshots:
       '@types/node': 18.13.0
     optional: true
 
-  '@typescript-eslint/eslint-plugin@5.30.6(@typescript-eslint/parser@5.30.6)(eslint@8.19.0)(typescript@4.7.4)':
+  '@typescript-eslint/eslint-plugin@5.30.6(@typescript-eslint/parser@5.30.6(eslint@8.19.0)(typescript@4.7.4))(eslint@8.19.0)(typescript@4.7.4)':
     dependencies:
       '@typescript-eslint/parser': 5.30.6(eslint@8.19.0)(typescript@4.7.4)
       '@typescript-eslint/scope-manager': 5.30.6
@@ -2485,6 +2485,7 @@ snapshots:
       regexpp: 3.2.0
       semver: 7.3.8
       tsutils: 3.21.0(typescript@4.7.4)
+    optionalDependencies:
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
@@ -2496,6 +2497,7 @@ snapshots:
       '@typescript-eslint/typescript-estree': 5.30.6(typescript@4.7.4)
       debug: 4.3.4
       eslint: 8.19.0
+    optionalDependencies:
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
@@ -2511,6 +2513,7 @@ snapshots:
       debug: 4.3.4
       eslint: 8.19.0
       tsutils: 3.21.0(typescript@4.7.4)
+    optionalDependencies:
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
@@ -2526,6 +2529,7 @@ snapshots:
       is-glob: 4.0.3
       semver: 7.5.4
       tsutils: 3.21.0(typescript@4.7.4)
+    optionalDependencies:
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
@@ -2624,17 +2628,17 @@ snapshots:
       '@webassemblyjs/ast': 1.11.1
       '@xtuc/long': 4.2.2
 
-  '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0)(webpack@5.76.0)':
+  '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0))(webpack@5.76.0(webpack-cli@4.10.0))':
     dependencies:
       webpack: 5.76.0(webpack-cli@4.10.0)
       webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0)
 
-  '@webpack-cli/info@1.5.0(webpack-cli@4.10.0)':
+  '@webpack-cli/info@1.5.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0))':
     dependencies:
       envinfo: 7.8.1
       webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0)
 
-  '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0)':
+  '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0))':
     dependencies:
       webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0)
 
@@ -2661,7 +2665,7 @@ snapshots:
       - supports-color
 
   ajv-formats@2.1.1(ajv@8.12.0):
-    dependencies:
+    optionalDependencies:
       ajv: 8.12.0
 
   ajv-keywords@3.5.2(ajv@6.12.6):
@@ -2892,7 +2896,7 @@ snapshots:
     dependencies:
       source-map: 0.6.1
 
-  clean-webpack-plugin@4.0.0(webpack@5.76.0):
+  clean-webpack-plugin@4.0.0(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       del: 4.1.1
       webpack: 5.76.0(webpack-cli@4.10.0)
@@ -2964,7 +2968,7 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  css-loader@6.7.1(webpack@5.76.0):
+  css-loader@6.7.1(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.31)
       postcss: 8.4.31
@@ -3128,7 +3132,7 @@ snapshots:
 
   electron-to-chromium@1.4.186: {}
 
-  electron@28.3.1:
+  electron@28.3.3:
     dependencies:
       '@electron/get': 2.0.2
       '@types/node': 18.13.0
@@ -3166,7 +3170,7 @@ snapshots:
   es6-error@4.1.1:
     optional: true
 
-  esbuild-loader@3.0.1(webpack@5.76.0):
+  esbuild-loader@3.0.1(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       esbuild: 0.17.10
       get-tsconfig: 4.4.0
@@ -3325,7 +3329,7 @@ snapshots:
     dependencies:
       flat-cache: 3.0.4
 
-  file-loader@6.2.0(webpack@5.76.0):
+  file-loader@6.2.0(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 3.1.1
@@ -3499,7 +3503,7 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
-  html-loader@2.1.2(webpack@5.76.0):
+  html-loader@2.1.2(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       html-minifier-terser: 5.1.1
       parse5: 6.0.1
@@ -3525,7 +3529,7 @@ snapshots:
       relateurl: 0.2.7
       terser: 5.14.1
 
-  html-webpack-plugin@5.5.0(webpack@5.76.0):
+  html-webpack-plugin@5.5.0(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       '@types/html-minifier-terser': 6.1.0
       html-minifier-terser: 6.1.0
@@ -3772,7 +3776,7 @@ snapshots:
 
   mimic-response@3.1.0: {}
 
-  mini-css-extract-plugin@2.7.6(webpack@5.76.0):
+  mini-css-extract-plugin@2.7.6(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       schema-utils: 4.2.0
       webpack: 5.76.0(webpack-cli@4.10.0)
@@ -4067,12 +4071,13 @@ snapshots:
     dependencies:
       truncate-utf8-bytes: 1.0.2
 
-  sass-loader@12.6.0(sass@1.53.0)(webpack@5.76.0):
+  sass-loader@12.6.0(sass@1.53.0)(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       klona: 2.0.5
       neo-async: 2.6.2
-      sass: 1.53.0
       webpack: 5.76.0(webpack-cli@4.10.0)
+    optionalDependencies:
+      sass: 1.53.0
 
   sass@1.53.0:
     dependencies:
@@ -4209,7 +4214,7 @@ snapshots:
       async-exit-hook: 2.0.1
       fs-extra: 10.1.0
 
-  terser-webpack-plugin@5.3.3(webpack@5.76.0):
+  terser-webpack-plugin@5.3.3(webpack@5.76.0(webpack-cli@4.10.0)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.14
       jest-worker: 27.5.1
@@ -4324,9 +4329,9 @@ snapshots:
   webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0):
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0)(webpack@5.76.0)
+      '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0))(webpack@5.76.0(webpack-cli@4.10.0))
-      '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0)
+      '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0))
-      '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0)
+      '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0))
       colorette: 2.0.19
       commander: 7.2.0
       cross-spawn: 7.0.3
@@ -4335,8 +4340,9 @@ snapshots:
       interpret: 2.2.0
       rechoir: 0.7.1
       webpack: 5.76.0(webpack-cli@4.10.0)
-      webpack-bundle-analyzer: 4.5.0
       webpack-merge: 5.8.0
+    optionalDependencies:
+      webpack-bundle-analyzer: 4.5.0
 
   webpack-merge@5.8.0:
     dependencies:
@@ -4373,10 +4379,11 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 3.1.1
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.3(webpack@5.76.0)
+      terser-webpack-plugin: 5.3.3(webpack@5.76.0(webpack-cli@4.10.0))
       watchpack: 2.4.0
-      webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0)
       webpack-sources: 3.2.3
+    optionalDependencies:
+      webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.76.0)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild