github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-02 19:40:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Upgrade to Electron v34.3.4 https://github.com/siyuan-note/siyuan/issues/14403

Browse Source
This commit is contained in:
Daniel 2025-03-20 17:40:12 +08:00
parent 96f17b46c4
commit ba8207773c
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
4 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CONTRIBUTING.md vendored
View File

@ -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@v34.3.3 -D` * macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v34.3.4 -D`
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v34.3.3 -D` * `pnpm install electron@v34.3.4 -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@v34.3.3 -D` * `pnpm install electron@v34.3.4 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View File

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

4
app/package.json
View File

@ -56,8 +56,8 @@
"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": "34.3.3", "electron": "34.3.4",
"electron-builder": "26.0.9", "electron-builder": "26.0.11",
"encoding": "^0.1.13", "encoding": "^0.1.13",
"esbuild-loader": "^3.0.1", "esbuild-loader": "^3.0.1",
"eslint": "^9.15.0", "eslint": "^9.15.0",

85
app/pnpm-lock.yaml
View File

@ -10,7 +10,7 @@ importers:
dependencies: dependencies:
'@electron/remote': '@electron/remote':
specifier: ^2.1.2 specifier: ^2.1.2
version: 2.1.2(electron@34.3.3) version: 2.1.2(electron@34.3.4)
devDependencies: devDependencies:
'@types/node': '@types/node':
specifier: ^18.13.0 specifier: ^18.13.0
@ -34,11 +34,11 @@ importers:
specifier: ^1.11.5 specifier: ^1.11.5
version: 1.11.5 version: 1.11.5
electron: electron:
specifier: 34.3.3 specifier: 34.3.4
version: 34.3.3 version: 34.3.4
electron-builder: electron-builder:
specifier: 26.0.9 specifier: 26.0.11
version: 26.0.9(electron-builder-squirrel-windows@25.0.5) version: 26.0.11(electron-builder-squirrel-windows@25.0.5)
encoding: encoding:
specifier: ^0.1.13 specifier: ^0.1.13
version: 0.1.13 version: 0.1.13
@ -730,12 +730,12 @@ packages:
dmg-builder: 25.0.5 dmg-builder: 25.0.5
electron-builder-squirrel-windows: 25.0.5 electron-builder-squirrel-windows: 25.0.5
app-builder-lib@26.0.9: app-builder-lib@26.0.11:
resolution: {integrity: sha512-usROoLQLJDHEkLHF2nNQKWuT6Qbj1GnO+iNKVJQ7OvY7/K0/XTzr1i+gGgTmd02tQBCnBiBgNFSOw/NZZxomfg==} resolution: {integrity: sha512-bsfSjSZp9dg7q28+4NPLJ2ldq3j1ESP2LJ+8AibaPqQb2lTIJeQW1JmgdAs9KuYTtkswiZ/+PMyokC9M7hwnjQ==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
peerDependencies: peerDependencies:
dmg-builder: 26.0.9 dmg-builder: 26.0.11
electron-builder-squirrel-windows: 26.0.9 electron-builder-squirrel-windows: 26.0.11
aproba@2.0.0: aproba@2.0.0:
resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
@ -857,8 +857,8 @@ packages:
builder-util@25.0.3: builder-util@25.0.3:
resolution: {integrity: sha512-eH5c1ukdY2xjtFQWQ6jlzEuXuqcuAVc3UQ6V6fdYu9Kg3CkDbCR82Mox42uaJDmee9WXSbP/88cOworFdOHPhw==} resolution: {integrity: sha512-eH5c1ukdY2xjtFQWQ6jlzEuXuqcuAVc3UQ6V6fdYu9Kg3CkDbCR82Mox42uaJDmee9WXSbP/88cOworFdOHPhw==}
builder-util@26.0.7: builder-util@26.0.11:
resolution: {integrity: sha512-rZL8wTMtpAM8CZO4l6eIM36oie95LP7de4nEp7ZhQ94JsL7kKT4orPwp6weRzxldXPzNyalUPkhCxJcFDanFIg==} resolution: {integrity: sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==}
cacache@16.1.3: cacache@16.1.3:
resolution: {integrity: sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==} resolution: {integrity: sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==}
@ -1091,8 +1091,8 @@ packages:
dir-compare@4.2.0: dir-compare@4.2.0:
resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==} resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}
dmg-builder@26.0.9: dmg-builder@26.0.11:
resolution: {integrity: sha512-qDR9jFsJjFaaFZcvOBi2uMfDILnD6OsobW3akHg5IaxjG/15LuX5YkxcF1buqPhtTaPf1Oi+q155RsQmqe19qA==} resolution: {integrity: sha512-C+SaRneQ11OxG99EeGp3TvPrlkW9ZaiukxB9Z7+OhhO1ge0nAtq9uD0ILt1JpvNAQ1de3gzX7TFRYJrSGsNe+Q==}
dmg-license@1.0.11: dmg-license@1.0.11:
resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==} resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==}
@ -1141,22 +1141,22 @@ packages:
electron-builder-squirrel-windows@25.0.5: electron-builder-squirrel-windows@25.0.5:
resolution: {integrity: sha512-N2U7LGSdt4hmEhjEeIV2XJbjj2YIrTL6enfsGKfOhGTpL6GEejUmT3gjdKUqKBS5+NBx0GWhnEwD3MpO2P6Nfg==} resolution: {integrity: sha512-N2U7LGSdt4hmEhjEeIV2XJbjj2YIrTL6enfsGKfOhGTpL6GEejUmT3gjdKUqKBS5+NBx0GWhnEwD3MpO2P6Nfg==}
electron-builder@26.0.9: electron-builder@26.0.11:
resolution: {integrity: sha512-ea27aPZEw2x83XakzT+f1H+G1VOs8jIN++NVhy2srmdjX0pGpaaxYvHJSZgEcY+ev/20ArroJtOcSqvCo2Rwzg==} resolution: {integrity: sha512-u7Qgge5ue5oOPDbZEseor7RjxKSYAekVflHkbNIY6te1kbtShQFqESq3FZakMBsQf/3SkEycvWhHHRb8zjqBqg==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
hasBin: true hasBin: true
electron-publish@25.0.3: electron-publish@25.0.3:
resolution: {integrity: sha512-wSGm+TFK2lArswIFBPLuIRHbo945s3MCvG5y1xVC57zL/PsrElUkaGH2ERtRrcKNpaDNq77rDA9JnMJhAFJjUg==} resolution: {integrity: sha512-wSGm+TFK2lArswIFBPLuIRHbo945s3MCvG5y1xVC57zL/PsrElUkaGH2ERtRrcKNpaDNq77rDA9JnMJhAFJjUg==}
electron-publish@26.0.7: electron-publish@26.0.11:
resolution: {integrity: sha512-zSCBtAXnLi1QhCDEomIEu22mjKgsf17VYW3fMyZ4Y9Q7s+Ftu9dqbTMaM/e/FBCn9VthnG7C/zPCr1yKpkI+dg==} resolution: {integrity: sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==}
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@34.3.3: electron@34.3.4:
resolution: {integrity: sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ==} resolution: {integrity: sha512-bIsjBh5EN229K4orJpVfjLb7JEoCYkUVg3tS981E1elEjvhBITqwm+K1j9goEqMIlxqYWgogREYpSZRQ+aLWgQ==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
@ -2871,9 +2871,9 @@ snapshots:
- bluebird - bluebird
- supports-color - supports-color
'@electron/remote@2.1.2(electron@34.3.3)': '@electron/remote@2.1.2(electron@34.3.4)':
dependencies: dependencies:
electron: 34.3.3 electron: 34.3.4
'@electron/universal@2.0.1': '@electron/universal@2.0.1':
dependencies: dependencies:
@ -3425,7 +3425,7 @@ snapshots:
app-builder-bin@5.0.0-alpha.7: {} app-builder-bin@5.0.0-alpha.7: {}
app-builder-lib@25.0.5(dmg-builder@26.0.9)(electron-builder-squirrel-windows@25.0.5): app-builder-lib@25.0.5(dmg-builder@26.0.11)(electron-builder-squirrel-windows@25.0.5):
dependencies: dependencies:
'@develar/schema-utils': 2.6.5 '@develar/schema-utils': 2.6.5
'@electron/notarize': 2.3.2 '@electron/notarize': 2.3.2
@ -3440,9 +3440,9 @@ snapshots:
builder-util-runtime: 9.2.5 builder-util-runtime: 9.2.5
chromium-pickle-js: 0.2.0 chromium-pickle-js: 0.2.0
debug: 4.3.4 debug: 4.3.4
dmg-builder: 26.0.9(electron-builder-squirrel-windows@25.0.5) dmg-builder: 26.0.11(electron-builder-squirrel-windows@25.0.5)
ejs: 3.1.10 ejs: 3.1.10
electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.9) electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.11)
electron-publish: 25.0.3 electron-publish: 25.0.3
form-data: 4.0.0 form-data: 4.0.0
fs-extra: 10.1.0 fs-extra: 10.1.0
@ -3462,7 +3462,7 @@ snapshots:
- bluebird - bluebird
- supports-color - supports-color
app-builder-lib@26.0.9(dmg-builder@26.0.9)(electron-builder-squirrel-windows@25.0.5): app-builder-lib@26.0.11(dmg-builder@26.0.11)(electron-builder-squirrel-windows@25.0.5):
dependencies: dependencies:
'@develar/schema-utils': 2.6.5 '@develar/schema-utils': 2.6.5
'@electron/asar': 3.2.18 '@electron/asar': 3.2.18
@ -3474,17 +3474,17 @@ snapshots:
'@malept/flatpak-bundler': 0.4.0 '@malept/flatpak-bundler': 0.4.0
'@types/fs-extra': 9.0.13 '@types/fs-extra': 9.0.13
async-exit-hook: 2.0.1 async-exit-hook: 2.0.1
builder-util: 26.0.7 builder-util: 26.0.11
builder-util-runtime: 9.3.1 builder-util-runtime: 9.3.1
chromium-pickle-js: 0.2.0 chromium-pickle-js: 0.2.0
config-file-ts: 0.2.8-rc1 config-file-ts: 0.2.8-rc1
debug: 4.3.4 debug: 4.3.4
dmg-builder: 26.0.9(electron-builder-squirrel-windows@25.0.5) dmg-builder: 26.0.11(electron-builder-squirrel-windows@25.0.5)
dotenv: 16.4.5 dotenv: 16.4.5
dotenv-expand: 11.0.6 dotenv-expand: 11.0.6
ejs: 3.1.10 ejs: 3.1.10
electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.9) electron-builder-squirrel-windows: 25.0.5(dmg-builder@26.0.11)
electron-publish: 26.0.7 electron-publish: 26.0.11
fs-extra: 10.1.0 fs-extra: 10.1.0
hosted-git-info: 4.1.0 hosted-git-info: 4.1.0
is-ci: 3.0.1 is-ci: 3.0.1
@ -3493,6 +3493,7 @@ snapshots:
json5: 2.2.3 json5: 2.2.3
lazy-val: 1.0.5 lazy-val: 1.0.5
minimatch: 10.0.1 minimatch: 10.0.1
plist: 3.1.0
resedit: 1.7.1 resedit: 1.7.1
semver: 7.6.3 semver: 7.6.3
tar: 6.2.1 tar: 6.2.1
@ -3658,7 +3659,7 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
builder-util@26.0.7: builder-util@26.0.11:
dependencies: dependencies:
7zip-bin: 5.2.0 7zip-bin: 5.2.0
'@types/debug': 4.1.7 '@types/debug': 4.1.7
@ -3928,10 +3929,10 @@ snapshots:
minimatch: 3.1.2 minimatch: 3.1.2
p-limit: 3.1.0 p-limit: 3.1.0
dmg-builder@26.0.9(electron-builder-squirrel-windows@25.0.5): dmg-builder@26.0.11(electron-builder-squirrel-windows@25.0.5):
dependencies: dependencies:
app-builder-lib: 26.0.9(dmg-builder@26.0.9)(electron-builder-squirrel-windows@25.0.5) app-builder-lib: 26.0.11(dmg-builder@26.0.11)(electron-builder-squirrel-windows@25.0.5)
builder-util: 26.0.7 builder-util: 26.0.11
builder-util-runtime: 9.3.1 builder-util-runtime: 9.3.1
fs-extra: 10.1.0 fs-extra: 10.1.0
iconv-lite: 0.6.3 iconv-lite: 0.6.3
@ -3996,9 +3997,9 @@ snapshots:
dependencies: dependencies:
jake: 10.8.5 jake: 10.8.5
electron-builder-squirrel-windows@25.0.5(dmg-builder@26.0.9): electron-builder-squirrel-windows@25.0.5(dmg-builder@26.0.11):
dependencies: dependencies:
app-builder-lib: 25.0.5(dmg-builder@26.0.9)(electron-builder-squirrel-windows@25.0.5) app-builder-lib: 25.0.5(dmg-builder@26.0.11)(electron-builder-squirrel-windows@25.0.5)
archiver: 5.3.2 archiver: 5.3.2
builder-util: 25.0.3 builder-util: 25.0.3
fs-extra: 10.1.0 fs-extra: 10.1.0
@ -4007,13 +4008,13 @@ snapshots:
- dmg-builder - dmg-builder
- supports-color - supports-color
electron-builder@26.0.9(electron-builder-squirrel-windows@25.0.5): electron-builder@26.0.11(electron-builder-squirrel-windows@25.0.5):
dependencies: dependencies:
app-builder-lib: 26.0.9(dmg-builder@26.0.9)(electron-builder-squirrel-windows@25.0.5) app-builder-lib: 26.0.11(dmg-builder@26.0.11)(electron-builder-squirrel-windows@25.0.5)
builder-util: 26.0.7 builder-util: 26.0.11
builder-util-runtime: 9.3.1 builder-util-runtime: 9.3.1
chalk: 4.1.2 chalk: 4.1.2
dmg-builder: 26.0.9(electron-builder-squirrel-windows@25.0.5) dmg-builder: 26.0.11(electron-builder-squirrel-windows@25.0.5)
fs-extra: 10.1.0 fs-extra: 10.1.0
is-ci: 3.0.1 is-ci: 3.0.1
lazy-val: 1.0.5 lazy-val: 1.0.5
@ -4036,10 +4037,10 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
electron-publish@26.0.7: electron-publish@26.0.11:
dependencies: dependencies:
'@types/fs-extra': 9.0.13 '@types/fs-extra': 9.0.13
builder-util: 26.0.7 builder-util: 26.0.11
builder-util-runtime: 9.3.1 builder-util-runtime: 9.3.1
chalk: 4.1.2 chalk: 4.1.2
form-data: 4.0.0 form-data: 4.0.0
@ -4051,7 +4052,7 @@ snapshots:
electron-to-chromium@1.5.39: {} electron-to-chromium@1.5.39: {}
electron@34.3.3: electron@34.3.4:
dependencies: dependencies:
'@electron/get': 2.0.2 '@electron/get': 2.0.2
'@types/node': 20.14.5 '@types/node': 20.14.5