Ver código fonte

:recycle: Upgrade to Electron v32.2.5 https://github.com/siyuan-note/siyuan/issues/13161

Daniel 8 meses atrás
pai
commit
3c31baaf04
4 arquivos alterados com 15 adições e 15 exclusões
  1. 3 3
      .github/CONTRIBUTING.md
  2. 3 3
      .github/CONTRIBUTING_zh_CN.md
  3. 1 1
      app/package.json
  4. 8 8
      app/pnpm-lock.yaml

+ 3 - 3
.github/CONTRIBUTING.md

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

+ 3 - 3
.github/CONTRIBUTING_zh_CN.md

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

+ 1 - 1
app/package.json

@@ -56,7 +56,7 @@
     "clean-webpack-plugin": "^4.0.0",
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.7.1",
     "css-loader": "^6.7.1",
     "dayjs": "^1.11.5",
     "dayjs": "^1.11.5",
-    "electron": "32.2.2",
+    "electron": "32.2.5",
     "electron-builder": "24.13.3",
     "electron-builder": "24.13.3",
     "encoding": "^0.1.13",
     "encoding": "^0.1.13",
     "esbuild-loader": "^3.0.1",
     "esbuild-loader": "^3.0.1",

+ 8 - 8
app/pnpm-lock.yaml

@@ -10,7 +10,7 @@ importers:
     dependencies:
     dependencies:
       '@electron/remote':
       '@electron/remote':
         specifier: ^2.1.2
         specifier: ^2.1.2
-        version: 2.1.2(electron@32.2.2)
+        version: 2.1.2(electron@32.2.5)
     devDependencies:
     devDependencies:
       '@types/node':
       '@types/node':
         specifier: ^18.13.0
         specifier: ^18.13.0
@@ -34,8 +34,8 @@ importers:
         specifier: ^1.11.5
         specifier: ^1.11.5
         version: 1.11.5
         version: 1.11.5
       electron:
       electron:
-        specifier: 32.2.2
-        version: 32.2.2
+        specifier: 32.2.5
+        version: 32.2.5
       electron-builder:
       electron-builder:
         specifier: 24.13.3
         specifier: 24.13.3
         version: 24.13.3(electron-builder-squirrel-windows@25.0.5)
         version: 24.13.3(electron-builder-squirrel-windows@25.0.5)
@@ -1122,8 +1122,8 @@ packages:
   electron-to-chromium@1.5.39:
   electron-to-chromium@1.5.39:
     resolution: {integrity: sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==}
     resolution: {integrity: sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==}
 
 
-  electron@32.2.2:
-    resolution: {integrity: sha512-c7TRE42JcgEmJ4elJyCdKk/2os0UX7YMkRDeXBkxFEoM34iX1/2x+c5T9PgeroKz8FEG7omRU5TvjulqVtXvdw==}
+  electron@32.2.5:
+    resolution: {integrity: sha512-8t5IGOvms/JTcLNnlOH7rFCAJIZJAazwYrF7kQsKQSLzDHh4z8mGFrU11NN3W4bIT6Yg5DJNniSWz3O5wJLmCw==}
     engines: {node: '>= 12.20.55'}
     engines: {node: '>= 12.20.55'}
     hasBin: true
     hasBin: true
 
 
@@ -2813,9 +2813,9 @@ snapshots:
       - bluebird
       - bluebird
       - supports-color
       - supports-color
 
 
-  '@electron/remote@2.1.2(electron@32.2.2)':
+  '@electron/remote@2.1.2(electron@32.2.5)':
     dependencies:
     dependencies:
-      electron: 32.2.2
+      electron: 32.2.5
 
 
   '@electron/universal@1.5.1':
   '@electron/universal@1.5.1':
     dependencies:
     dependencies:
@@ -3990,7 +3990,7 @@ snapshots:
 
 
   electron-to-chromium@1.5.39: {}
   electron-to-chromium@1.5.39: {}
 
 
-  electron@32.2.2:
+  electron@32.2.5:
     dependencies:
     dependencies:
       '@electron/get': 2.0.2
       '@electron/get': 2.0.2
       '@types/node': 20.14.5
       '@types/node': 20.14.5