1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00

Desktop: Fixes #11508: Upgrade electron-builder and @electron/rebuild (#11512)

This commit is contained in:
Henry Heino 2024-12-17 10:06:24 -08:00 committed by GitHub
parent b147cc6235
commit ac28d31cce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 274 additions and 186 deletions

View File

@ -1,13 +0,0 @@
diff --git a/templates/nsis/include/allowOnlyOneInstallerInstance.nsh b/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
index a1fd1875d852ff69c087a3103eff827c20d37ca5..5222614ddad3276876857e7a9dde4017a6b9fc85 100644
--- a/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
+++ b/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
@@ -42,7 +42,7 @@
${nsProcess::FindProcess} "${_FILE}" ${_ERR}
!else
# find process owned by current user
- nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"`
+ nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "PID ne $pid" /FI "IMAGENAME eq ${_FILE}" | %SYSTEMROOT%\System32\find.exe "${_FILE}"`
Pop ${_ERR}
!endif
!macroend

View File

@ -105,7 +105,6 @@
"react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch", "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
"react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch", "react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
"eslint": "patch:eslint@8.57.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch", "eslint": "patch:eslint@8.57.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
"app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
"nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch", "nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch",
"pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch", "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
"@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch", "@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch",

View File

@ -115,8 +115,10 @@
"icon": "../../Assets/LinuxIcons", "icon": "../../Assets/LinuxIcons",
"category": "Office", "category": "Office",
"desktop": { "desktop": {
"Icon": "joplin", "entry": {
"MimeType": "x-scheme-handler/joplin;" "Icon": "joplin",
"MimeType": "x-scheme-handler/joplin;"
}
}, },
"target": ["AppImage", "deb"], "target": ["AppImage", "deb"],
"executableName": "joplin", "executableName": "joplin",
@ -128,7 +130,7 @@
"devDependencies": { "devDependencies": {
"7zip-bin": "5.2.0", "7zip-bin": "5.2.0",
"@axe-core/playwright": "4.10.0", "@axe-core/playwright": "4.10.0",
"@electron/rebuild": "3.6.0", "@electron/rebuild": "3.7.1",
"@joplin/default-plugins": "~3.2", "@joplin/default-plugins": "~3.2",
"@joplin/tools": "~3.2", "@joplin/tools": "~3.2",
"@playwright/test": "1.45.3", "@playwright/test": "1.45.3",
@ -142,7 +144,7 @@
"@types/tesseract.js": "2.0.0", "@types/tesseract.js": "2.0.0",
"axios": "^1.7.7", "axios": "^1.7.7",
"electron": "32.2.0", "electron": "32.2.0",
"electron-builder": "24.13.3", "electron-builder": "26.0.0-alpha.7",
"glob": "10.4.5", "glob": "10.4.5",
"gulp": "4.0.2", "gulp": "4.0.2",
"jest": "29.7.0", "jest": "29.7.0",

View File

@ -28,7 +28,6 @@
"@types/node-rsa": "1.1.4", "@types/node-rsa": "1.1.4",
"@types/react": "18.3.3", "@types/react": "18.3.3",
"@types/uuid": "9.0.7", "@types/uuid": "9.0.7",
"canvas": "2.11.2",
"clean-html": "1.5.0", "clean-html": "1.5.0",
"jest": "29.7.0", "jest": "29.7.0",
"jsdom": "23.2.0", "jsdom": "23.2.0",

435
yarn.lock
View File

@ -6610,17 +6610,29 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@electron/asar@npm:^3.2.1": "@electron/asar@npm:3.2.17, @electron/asar@npm:^3.2.7":
version: 3.2.4 version: 3.2.17
resolution: "@electron/asar@npm:3.2.4" resolution: "@electron/asar@npm:3.2.17"
dependencies: dependencies:
chromium-pickle-js: ^0.2.0
commander: ^5.0.0 commander: ^5.0.0
glob: ^7.1.6 glob: ^7.1.6
minimatch: ^3.0.4 minimatch: ^3.0.4
bin: bin:
asar: bin/asar.js asar: bin/asar.js
checksum: 06e3e8fe7c894f7e7727410af5a9957ec77088f775b22441acf4ef718a9e6642a4dc1672f77ee1ce325fc367c8d59ac1e02f7db07869c8ced8a00132a3b54643 checksum: 0b9fae8c508c86e1f844f7e55499ce199609187e2bf9af11a1a2a773805b2bb0ff1d8af43c5e6c0cec8c0de1541b9e263c9bbe5fbf168e44f8c2c1414d6cec6c
languageName: node
linkType: hard
"@electron/fuses@npm:^1.8.0":
version: 1.8.0
resolution: "@electron/fuses@npm:1.8.0"
dependencies:
chalk: ^4.1.1
fs-extra: ^9.0.1
minimist: ^1.2.5
bin:
electron-fuses: dist/bin.js
checksum: 94cb8ba10d69c0750401fc29cde38215c2b1934014008e98c231f16e78a653209b716a56223a09063e7b6a8526cfeed9223cd8d95559ff4a244d1c3783dec23f
languageName: node languageName: node
linkType: hard linkType: hard
@ -6643,14 +6655,23 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@electron/notarize@npm:2.2.1": "@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2":
version: 2.2.1 version: 10.2.0-electron.1
resolution: "@electron/notarize@npm:2.2.1" resolution: "@electron/node-gyp@https://github.com/electron/node-gyp.git#commit=06b29aafb7708acef8b3669835c8a7857ebc92d2"
dependencies: dependencies:
debug: ^4.1.1 env-paths: ^2.2.0
fs-extra: ^9.0.1 exponential-backoff: ^3.1.1
promise-retry: ^2.0.1 glob: ^8.1.0
checksum: c791a631acb397ec7ad6fa7966e878bbf147c29afae29844276bfcde36509fcd326ac0ad0a3e477ed2aa01abcb3001816311a2d002f6e7e7b81e4fe678915a8b graceful-fs: ^4.2.6
make-fetch-happen: ^10.2.1
nopt: ^6.0.0
proc-log: ^2.0.1
semver: ^7.3.5
tar: ^6.2.1
which: ^2.0.2
bin:
node-gyp: ./bin/node-gyp.js
checksum: c3a5c3b3a69286db9beceb5beb5141e37e2ccc2dc5f0dffbf53b623c8a6b6e1a762939d143bb2e38b7323b2db8f97f2777309e1cd6351c37b7b2e00ad7797576
languageName: node languageName: node
linkType: hard linkType: hard
@ -6665,9 +6686,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@electron/osx-sign@npm:1.0.5": "@electron/notarize@npm:2.5.0":
version: 1.0.5 version: 2.5.0
resolution: "@electron/osx-sign@npm:1.0.5" resolution: "@electron/notarize@npm:2.5.0"
dependencies:
debug: ^4.1.1
fs-extra: ^9.0.1
promise-retry: ^2.0.1
checksum: b8935a9648ae53429d6d476b473ae180d76ad281ccd34318ddc45c030c112501b966cd2609f00b74d0127f6f77dec8de134c2b8bbe356da9a84cfa3fea2d06ab
languageName: node
linkType: hard
"@electron/osx-sign@npm:1.3.1":
version: 1.3.1
resolution: "@electron/osx-sign@npm:1.3.1"
dependencies: dependencies:
compare-version: ^0.1.2 compare-version: ^0.1.2
debug: ^4.3.4 debug: ^4.3.4
@ -6678,14 +6710,15 @@ __metadata:
bin: bin:
electron-osx-flat: bin/electron-osx-flat.js electron-osx-flat: bin/electron-osx-flat.js
electron-osx-sign: bin/electron-osx-sign.js electron-osx-sign: bin/electron-osx-sign.js
checksum: 6c662e8bb4322b83f0147ddb4f5815770aca980a2cefc58a8423d502ccee4428168e11fa3c50f9660d29a74e3397f96c4f6ebddf1695ed28366aac0b92a49029 checksum: b35f3ee3220473b3578c5e7b279b3e0596d3161e19cede6ff283dcb1ba92183982fbd8d9c31929ecc3d1b57aa2e7cb787a9c0fce1c82f3a24a612bb3280033a0
languageName: node languageName: node
linkType: hard linkType: hard
"@electron/rebuild@npm:3.6.0": "@electron/rebuild@npm:3.7.0":
version: 3.6.0 version: 3.7.0
resolution: "@electron/rebuild@npm:3.6.0" resolution: "@electron/rebuild@npm:3.7.0"
dependencies: dependencies:
"@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
"@malept/cross-spawn-promise": ^2.0.0 "@malept/cross-spawn-promise": ^2.0.0
chalk: ^4.0.0 chalk: ^4.0.0
debug: ^4.1.1 debug: ^4.1.1
@ -6694,7 +6727,7 @@ __metadata:
got: ^11.7.0 got: ^11.7.0
node-abi: ^3.45.0 node-abi: ^3.45.0
node-api-version: ^0.2.0 node-api-version: ^0.2.0
node-gyp: ^9.0.0 node-gyp: latest
ora: ^5.1.0 ora: ^5.1.0
read-binary-file-arch: ^1.0.6 read-binary-file-arch: ^1.0.6
semver: ^7.3.5 semver: ^7.3.5
@ -6702,7 +6735,32 @@ __metadata:
yargs: ^17.0.1 yargs: ^17.0.1
bin: bin:
electron-rebuild: lib/cli.js electron-rebuild: lib/cli.js
checksum: 0dbf320b71ba5bc31ff7e0f46b157a16d56a7ee2b2d503ad60b46fe4673f9ba63c5b270a00e44856564e6a9fd5da216034a26eb3321679c40b681156ab6289a2 checksum: b51e4782032e7ae3bc4bef581a257efff4f4afad833d30b22dbbe5d11c727817748aeb7032cdf12c6edf3613108654fde0c777a37dbeb156d1301683893e5400
languageName: node
linkType: hard
"@electron/rebuild@npm:3.7.1":
version: 3.7.1
resolution: "@electron/rebuild@npm:3.7.1"
dependencies:
"@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
"@malept/cross-spawn-promise": ^2.0.0
chalk: ^4.0.0
debug: ^4.1.1
detect-libc: ^2.0.1
fs-extra: ^10.0.0
got: ^11.7.0
node-abi: ^3.45.0
node-api-version: ^0.2.0
node-gyp: latest
ora: ^5.1.0
read-binary-file-arch: ^1.0.6
semver: ^7.3.5
tar: ^6.0.5
yargs: ^17.0.1
bin:
electron-rebuild: lib/cli.js
checksum: 8789c02bd5ee91372988c2698d9b476f6732daf801ae62e92818077e3bdf6de1ffd4e363cfcad66de8be4077fd41e8369a7a67191a9dd1bfbe3b39c184289683
languageName: node languageName: node
linkType: hard linkType: hard
@ -6715,18 +6773,18 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@electron/universal@npm:1.5.1": "@electron/universal@npm:2.0.1":
version: 1.5.1 version: 2.0.1
resolution: "@electron/universal@npm:1.5.1" resolution: "@electron/universal@npm:2.0.1"
dependencies: dependencies:
"@electron/asar": ^3.2.1 "@electron/asar": ^3.2.7
"@malept/cross-spawn-promise": ^1.1.0 "@malept/cross-spawn-promise": ^2.0.0
debug: ^4.3.1 debug: ^4.3.1
dir-compare: ^3.0.0 dir-compare: ^4.2.0
fs-extra: ^9.0.1 fs-extra: ^11.1.1
minimatch: ^3.0.4 minimatch: ^9.0.3
plist: ^3.0.4 plist: ^3.1.0
checksum: 55eb09dce1f870efaf0bfd98b65042ff3dd5d868deeede2e5266ed5d041b75d9c5108050de6ebfda299d756f31ce66633a0d7585fdcad849337d8c2925709154 checksum: adbfcc4306d39dcbff97030f86c96559c17cc76858a93a598dce7d1f7a735c71379e74a74baf4dea35a4bda959e6b42356886e8765f8e6ff7d43f92ab846f316
languageName: node languageName: node
linkType: hard linkType: hard
@ -8269,7 +8327,7 @@ __metadata:
7zip-bin: 5.2.0 7zip-bin: 5.2.0
"@axe-core/playwright": 4.10.0 "@axe-core/playwright": 4.10.0
"@electron/notarize": 2.3.2 "@electron/notarize": 2.3.2
"@electron/rebuild": 3.6.0 "@electron/rebuild": 3.7.1
"@electron/remote": 2.1.2 "@electron/remote": 2.1.2
"@fortawesome/fontawesome-free": 5.15.4 "@fortawesome/fontawesome-free": 5.15.4
"@joeattardi/emoji-button": 4.6.4 "@joeattardi/emoji-button": 4.6.4
@ -8298,7 +8356,7 @@ __metadata:
countable: 3.0.1 countable: 3.0.1
debounce: 1.2.1 debounce: 1.2.1
electron: 32.2.0 electron: 32.2.0
electron-builder: 24.13.3 electron-builder: 26.0.0-alpha.7
electron-updater: 6.2.1 electron-updater: 6.2.1
electron-window-state: 5.0.3 electron-window-state: 5.0.3
formatcoords: 1.1.3 formatcoords: 1.1.3
@ -8620,7 +8678,6 @@ __metadata:
base-64: 1.0.0 base-64: 1.0.0
base64-stream: 1.0.0 base64-stream: 1.0.0
builtin-modules: 3.3.0 builtin-modules: 3.3.0
canvas: 2.11.2
chokidar: 3.6.0 chokidar: 3.6.0
clean-html: 1.5.0 clean-html: 1.5.0
color: 3.2.1 color: 3.2.1
@ -10155,15 +10212,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@malept/cross-spawn-promise@npm:^1.1.0":
version: 1.1.1
resolution: "@malept/cross-spawn-promise@npm:1.1.1"
dependencies:
cross-spawn: ^7.0.1
checksum: 1aa468f9ff3aa59dbaa720731ddf9c1928228b6844358d8821b86628953e0608420e88c6366d85af35acad73b1addaa472026a1836ad3fec34813eb38b2bd25a
languageName: node
linkType: hard
"@malept/cross-spawn-promise@npm:^2.0.0": "@malept/cross-spawn-promise@npm:^2.0.0":
version: 2.0.0 version: 2.0.0
resolution: "@malept/cross-spawn-promise@npm:2.0.0" resolution: "@malept/cross-spawn-promise@npm:2.0.0"
@ -15157,6 +15205,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"agent-base@npm:^7.1.2":
version: 7.1.3
resolution: "agent-base@npm:7.1.3"
checksum: 87bb7ee54f5ecf0ccbfcba0b07473885c43ecd76cb29a8db17d6137a19d9f9cd443a2a7c5fd8a3f24d58ad8145f9eb49116344a66b107e1aeab82cf2383f4753
languageName: node
linkType: hard
"agent-base@npm:~4.2.1": "agent-base@npm:~4.2.1":
version: 4.2.1 version: 4.2.1
resolution: "agent-base@npm:4.2.1" resolution: "agent-base@npm:4.2.1"
@ -15568,48 +15623,53 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"app-builder-bin@npm:4.0.0": "app-builder-bin@npm:5.0.0-alpha.11":
version: 4.0.0 version: 5.0.0-alpha.11
resolution: "app-builder-bin@npm:4.0.0" resolution: "app-builder-bin@npm:5.0.0-alpha.11"
checksum: c3c8fd85c371b7a396c1bb1160ab2e3231ba4309abea5b36a5b366e42511e347c65a33ff50d56f4960b337833d539c263137b0ba131e2fa268c32edeb6c9f683 checksum: d448169c7f58ca6cb189df2f7b67ca7a8ebae946a81e5622b01a3f9e3c3caed77087762408aef64ba4c762cdb3909d38d5bab8f995861e0f2647005ef1358eed
languageName: node languageName: node
linkType: hard linkType: hard
"app-builder-lib@npm:24.13.3": "app-builder-lib@npm:26.0.0-alpha.7":
version: 24.13.3 version: 26.0.0-alpha.7
resolution: "app-builder-lib@npm:24.13.3" resolution: "app-builder-lib@npm:26.0.0-alpha.7"
dependencies: dependencies:
"@develar/schema-utils": ~2.6.5 "@develar/schema-utils": ~2.6.5
"@electron/notarize": 2.2.1 "@electron/asar": 3.2.17
"@electron/osx-sign": 1.0.5 "@electron/fuses": ^1.8.0
"@electron/universal": 1.5.1 "@electron/notarize": 2.5.0
"@electron/osx-sign": 1.3.1
"@electron/rebuild": 3.7.0
"@electron/universal": 2.0.1
"@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
bluebird-lst: ^1.0.9 bluebird-lst: ^1.0.9
builder-util: 24.13.1 builder-util: 26.0.0-alpha.7
builder-util-runtime: 9.2.4 builder-util-runtime: 9.2.10
chromium-pickle-js: ^0.2.0 chromium-pickle-js: ^0.2.0
config-file-ts: 0.2.8-rc1
debug: ^4.3.4 debug: ^4.3.4
dotenv: ^16.4.5
dotenv-expand: ^11.0.6
ejs: ^3.1.8 ejs: ^3.1.8
electron-publish: 24.13.1 electron-publish: 26.0.0-alpha.7
form-data: ^4.0.0
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.0 is-ci: ^3.0.0
isbinaryfile: ^5.0.0 isbinaryfile: ^5.0.0
js-yaml: ^4.1.0 js-yaml: ^4.1.0
json5: ^2.2.3
lazy-val: ^1.0.5 lazy-val: ^1.0.5
minimatch: ^5.1.1 minimatch: ^10.0.0
read-config-file: 6.3.2 resedit: ^1.7.0
sanitize-filename: ^1.6.3
semver: ^7.3.8 semver: ^7.3.8
tar: ^6.1.12 tar: ^6.1.12
temp-file: ^3.4.0 temp-file: ^3.4.0
peerDependencies: peerDependencies:
dmg-builder: 24.13.3 dmg-builder: 26.0.0-alpha.7
electron-builder-squirrel-windows: 24.13.3 electron-builder-squirrel-windows: 26.0.0-alpha.7
checksum: 68ea3295efe99b8e8d4f9a1e77f3eae34de01b9829f8907e467d658b9406aa04c95baa2c06142b29bd8184d4efdc69f176a53d62fec36e7eba80024c46ce5adc checksum: 6a0852f51e352755cb1b1d99b5c24cc801ec528e1f301d2d3a2fa19c02b2edc383428a4a15b635c4f5f86afa4039d8a404006462f7c28e4caa99736ffd497001
languageName: node languageName: node
linkType: hard linkType: hard
@ -17758,6 +17818,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"builder-util-runtime@npm:9.2.10":
version: 9.2.10
resolution: "builder-util-runtime@npm:9.2.10"
dependencies:
debug: ^4.3.4
sax: ^1.2.4
checksum: 4507253fc7d50943526d00725322cbfdc9b80aad44c4a160eb4257a8ec97ddc6262448ddd840aa1520e2a4252b2b5b04d0a5caac2138be033117f1d445cf5ce7
languageName: node
linkType: hard
"builder-util-runtime@npm:9.2.4": "builder-util-runtime@npm:9.2.4":
version: 9.2.4 version: 9.2.4
resolution: "builder-util-runtime@npm:9.2.4" resolution: "builder-util-runtime@npm:9.2.4"
@ -17768,27 +17838,28 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"builder-util@npm:24.13.1": "builder-util@npm:26.0.0-alpha.7":
version: 24.13.1 version: 26.0.0-alpha.7
resolution: "builder-util@npm:24.13.1" resolution: "builder-util@npm:26.0.0-alpha.7"
dependencies: dependencies:
7zip-bin: ~5.2.0 7zip-bin: ~5.2.0
"@types/debug": ^4.1.6 "@types/debug": ^4.1.6
app-builder-bin: 4.0.0 app-builder-bin: 5.0.0-alpha.11
bluebird-lst: ^1.0.9 bluebird-lst: ^1.0.9
builder-util-runtime: 9.2.4 builder-util-runtime: 9.2.10
chalk: ^4.1.2 chalk: ^4.1.2
cross-spawn: ^7.0.3 cross-spawn: ^7.0.3
debug: ^4.3.4 debug: ^4.3.4
fs-extra: ^10.1.0 fs-extra: ^10.1.0
http-proxy-agent: ^5.0.0 http-proxy-agent: ^7.0.0
https-proxy-agent: ^5.0.1 https-proxy-agent: ^7.0.0
is-ci: ^3.0.0 is-ci: ^3.0.0
js-yaml: ^4.1.0 js-yaml: ^4.1.0
sanitize-filename: ^1.6.3
source-map-support: ^0.5.19 source-map-support: ^0.5.19
stat-mode: ^1.0.0 stat-mode: ^1.0.0
temp-file: ^3.4.0 temp-file: ^3.4.0
checksum: 2991ee7ce2677736ca918d408180f93f2178decd17951164e31b90f01b7165a7e30d3d4d2a552978ec67b66be5cbe7a858deb581ff2aa9c4ba18fc1e72bf057d checksum: 7dfe6d5559b63b5506a27bfcc67d8d15f2b96c82168dfc8c69437eb4408e909d6df36ae0d3bfa8d8a64079f041eac15c96404a92b5bf4adc2ec47c6ad3895fd8
languageName: node languageName: node
linkType: hard linkType: hard
@ -18315,7 +18386,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"canvas@npm:2.11.2, canvas@npm:^2.11.2": "canvas@npm:^2.11.2":
version: 2.11.2 version: 2.11.2
resolution: "canvas@npm:2.11.2" resolution: "canvas@npm:2.11.2"
dependencies: dependencies:
@ -18385,7 +18456,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"chalk@npm:4, chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2": "chalk@npm:4, chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
version: 4.1.2 version: 4.1.2
resolution: "chalk@npm:4.1.2" resolution: "chalk@npm:4.1.2"
dependencies: dependencies:
@ -19533,13 +19604,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"config-file-ts@npm:^0.2.4": "config-file-ts@npm:0.2.8-rc1":
version: 0.2.4 version: 0.2.8-rc1
resolution: "config-file-ts@npm:0.2.4" resolution: "config-file-ts@npm:0.2.8-rc1"
dependencies: dependencies:
glob: ^7.1.6 glob: ^10.3.12
typescript: ^4.0.2 typescript: ^5.4.3
checksum: c7032064c0b00d7a3c429ea4dad477cc32a66370a0a2c39440feea0568158e662781cb905a54319be50f0345a63045ecbd7cc9a9ccbf0cc15744f874deea8029 checksum: 820547f430e6b977b0be2ff25b37b890f7541edf523017afeba5351013bd7910aa3050679e5a58cde9b8414c59ef4d5b0a215f29fa5ab74e558fa56d31b6f65e
languageName: node languageName: node
linkType: hard linkType: hard
@ -22144,13 +22215,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"dir-compare@npm:^3.0.0": "dir-compare@npm:^4.2.0":
version: 3.3.0 version: 4.2.0
resolution: "dir-compare@npm:3.3.0" resolution: "dir-compare@npm:4.2.0"
dependencies: dependencies:
buffer-equal: ^1.0.0 minimatch: ^3.0.5
minimatch: ^3.0.4 p-limit: "^3.1.0 "
checksum: 05e7381509b17cb4e6791bd9569c12ce4267f44b1ee36594946ed895ed7ad24da9285130dc42af3a60707d58c76307bb3a1cbae2acd0a9cce8c74664e6a26828 checksum: 138ee3c7716f45c1dc100efdf6b9517459428f1cb83fecda1f0dc633326d911a01f6456ff68333f916209649321c70fa004f448f137531664582ecddde4e2601
languageName: node languageName: node
linkType: hard linkType: hard
@ -22181,13 +22252,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"dmg-builder@npm:24.13.3": "dmg-builder@npm:26.0.0-alpha.7":
version: 24.13.3 version: 26.0.0-alpha.7
resolution: "dmg-builder@npm:24.13.3" resolution: "dmg-builder@npm:26.0.0-alpha.7"
dependencies: dependencies:
app-builder-lib: 24.13.3 app-builder-lib: 26.0.0-alpha.7
builder-util: 24.13.1 builder-util: 26.0.0-alpha.7
builder-util-runtime: 9.2.4 builder-util-runtime: 9.2.10
dmg-license: ^1.0.11 dmg-license: ^1.0.11
fs-extra: ^10.1.0 fs-extra: ^10.1.0
iconv-lite: ^0.6.2 iconv-lite: ^0.6.2
@ -22195,7 +22266,7 @@ __metadata:
dependenciesMeta: dependenciesMeta:
dmg-license: dmg-license:
optional: true optional: true
checksum: 5c25293d795bb3326baee9d911d797a1ec703ad78ba57b60c6e6ce672582fe820590c59913b6800885e8303c853b3797ce518e304aa83f568caab147e1e8979a checksum: 9f7c0f48e48264257684b84514ae82d47ff950d18d24f42da836b1d7c93e2b6c909a6e1e574cc32afabcad81f9d1f23821e5965823d03c28c7b79a798ccdaeec
languageName: node languageName: node
linkType: hard linkType: hard
@ -22476,10 +22547,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"dotenv-expand@npm:^5.1.0": "dotenv-expand@npm:^11.0.6":
version: 5.1.0 version: 11.0.7
resolution: "dotenv-expand@npm:5.1.0" resolution: "dotenv-expand@npm:11.0.7"
checksum: 8017675b7f254384915d55f9eb6388e577cf0a1231a28d54b0ca03b782be9501b0ac90ac57338636d395fa59051e6209e9b44b8ddf169ce6076dffb5dea227d3 dependencies:
dotenv: ^16.4.5
checksum: 58455ad9ffedbf6180b49f8f35596da54f10b02efcaabcba5400363f432e1da057113eee39b42365535da41df1e794d54a4aa67b22b37c41686c3dce4e6a28c5
languageName: node languageName: node
linkType: hard linkType: hard
@ -22499,10 +22572,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"dotenv@npm:^9.0.2": "dotenv@npm:^16.4.5":
version: 9.0.2 version: 16.4.7
resolution: "dotenv@npm:9.0.2" resolution: "dotenv@npm:16.4.7"
checksum: 6b7980330a653089bc9b83362248547791151ee74f9881eb223ac2f4d641b174b708f77315d88708b551d45b4177afd3ba71bca4832f8807e003f71c2a0f83e7 checksum: c27419b5875a44addcc56cc69b7dc5b0e6587826ca85d5b355da9303c6fc317fc9989f1f18366a16378c9fdd9532d14117a1abe6029cc719cdbbef6eaef2cea4
languageName: node languageName: node
linkType: hard linkType: hard
@ -22609,40 +22682,40 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"electron-builder@npm:24.13.3": "electron-builder@npm:26.0.0-alpha.7":
version: 24.13.3 version: 26.0.0-alpha.7
resolution: "electron-builder@npm:24.13.3" resolution: "electron-builder@npm:26.0.0-alpha.7"
dependencies: dependencies:
app-builder-lib: 24.13.3 app-builder-lib: 26.0.0-alpha.7
builder-util: 24.13.1 builder-util: 26.0.0-alpha.7
builder-util-runtime: 9.2.4 builder-util-runtime: 9.2.10
chalk: ^4.1.2 chalk: ^4.1.2
dmg-builder: 24.13.3 dmg-builder: 26.0.0-alpha.7
fs-extra: ^10.1.0 fs-extra: ^10.1.0
is-ci: ^3.0.0 is-ci: ^3.0.0
lazy-val: ^1.0.5 lazy-val: ^1.0.5
read-config-file: 6.3.2
simple-update-notifier: 2.0.0 simple-update-notifier: 2.0.0
yargs: ^17.6.2 yargs: ^17.6.2
bin: bin:
electron-builder: cli.js electron-builder: cli.js
install-app-deps: install-app-deps.js install-app-deps: install-app-deps.js
checksum: 8d7943d990363e547f1fbe391fee6b94d5e35e78c355645399f1f9b6709b6c167f0781abf8926c984c8a92475e6647f863f5e6a6938101a8a3a18ca85559810b checksum: 352da4ae782db336ff17102b0f7d9db24bc710ef2848d77cde7a99345d5f9f65b4e177a1f9dc5e36e9a5ac0c104b6a1d6eb6c588e8b302cc89a50fc1fd33eaf8
languageName: node languageName: node
linkType: hard linkType: hard
"electron-publish@npm:24.13.1": "electron-publish@npm:26.0.0-alpha.7":
version: 24.13.1 version: 26.0.0-alpha.7
resolution: "electron-publish@npm:24.13.1" resolution: "electron-publish@npm:26.0.0-alpha.7"
dependencies: dependencies:
"@types/fs-extra": ^9.0.11 "@types/fs-extra": ^9.0.11
builder-util: 24.13.1 builder-util: 26.0.0-alpha.7
builder-util-runtime: 9.2.4 builder-util-runtime: 9.2.10
chalk: ^4.1.2 chalk: ^4.1.2
form-data: ^4.0.0
fs-extra: ^10.1.0 fs-extra: ^10.1.0
lazy-val: ^1.0.5 lazy-val: ^1.0.5
mime: ^2.5.2 mime: ^2.5.2
checksum: 7cd9924c967418074126f090404265efd93108a5ece7a5fe053df6ae647da9da264991f98a2463f5ac06c56e2e8f58f0d44ada04ad7a6374d3b870e95198117e checksum: aaf5d19c419975d5bf608eb7ec1ea974204269e42cdba61b9479eb3a1f2fba14f34915994f43812d6825a688ca50e6ffdc13463abfc8e302193220bca17add81
languageName: node languageName: node
linkType: hard linkType: hard
@ -25666,7 +25739,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"fs-extra@npm:11.2.0": "fs-extra@npm:11.2.0, fs-extra@npm:^11.1.1":
version: 11.2.0 version: 11.2.0
resolution: "fs-extra@npm:11.2.0" resolution: "fs-extra@npm:11.2.0"
dependencies: dependencies:
@ -26481,7 +26554,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"glob@npm:10.4.5, glob@npm:^10.3.7, glob@npm:^10.4.2": "glob@npm:10.4.5, glob@npm:^10.3.12, glob@npm:^10.3.7, glob@npm:^10.4.2":
version: 10.4.5 version: 10.4.5
resolution: "glob@npm:10.4.5" resolution: "glob@npm:10.4.5"
dependencies: dependencies:
@ -26568,7 +26641,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"glob@npm:^8.0.1": "glob@npm:^8.0.1, glob@npm:^8.1.0":
version: 8.1.0 version: 8.1.0
resolution: "glob@npm:8.1.0" resolution: "glob@npm:8.1.0"
dependencies: dependencies:
@ -27986,6 +28059,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"https-proxy-agent@npm:^7.0.0":
version: 7.0.6
resolution: "https-proxy-agent@npm:7.0.6"
dependencies:
agent-base: ^7.1.2
debug: 4
checksum: b882377a120aa0544846172e5db021fa8afbf83fea2a897d397bd2ddd8095ab268c24bc462f40a15f2a8c600bf4aa05ce52927f70038d4014e68aefecfa94e8d
languageName: node
linkType: hard
"https-proxy-agent@npm:^7.0.2": "https-proxy-agent@npm:^7.0.2":
version: 7.0.2 version: 7.0.2
resolution: "https-proxy-agent@npm:7.0.2" resolution: "https-proxy-agent@npm:7.0.2"
@ -31299,7 +31382,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"json5@npm:^2.2.0, json5@npm:^2.2.2, json5@npm:^2.2.3": "json5@npm:^2.2.2, json5@npm:^2.2.3":
version: 2.2.3 version: 2.2.3
resolution: "json5@npm:2.2.3" resolution: "json5@npm:2.2.3"
bin: bin:
@ -31777,7 +31860,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"lazy-val@npm:^1.0.4, lazy-val@npm:^1.0.5": "lazy-val@npm:^1.0.5":
version: 1.0.5 version: 1.0.5
resolution: "lazy-val@npm:1.0.5" resolution: "lazy-val@npm:1.0.5"
checksum: 31e12e0b118826dfae74f8f3ff8ebcddfe4200ff88d0d448db175c7265ee537e0ba55488d411728246337f3ed3c9ec68416f10889f632a2ce28fb7a970909fb5 checksum: 31e12e0b118826dfae74f8f3ff8ebcddfe4200ff88d0d448db175c7265ee537e0ba55488d411728246337f3ed3c9ec68416f10889f632a2ce28fb7a970909fb5
@ -32791,7 +32874,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"make-fetch-happen@npm:^10.0.3": "make-fetch-happen@npm:^10.0.3, make-fetch-happen@npm:^10.2.1":
version: 10.2.1 version: 10.2.1
resolution: "make-fetch-happen@npm:10.2.1" resolution: "make-fetch-happen@npm:10.2.1"
dependencies: dependencies:
@ -34287,6 +34370,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"minimatch@npm:^10.0.0":
version: 10.0.1
resolution: "minimatch@npm:10.0.1"
dependencies:
brace-expansion: ^2.0.1
checksum: f5b63c2f30606091a057c5f679b067f84a2cd0ffbd2dbc9143bda850afd353c7be81949ff11ae0c86988f07390eeca64efd7143ee05a0dab37f6c6b38a2ebb6c
languageName: node
linkType: hard
"minimatch@npm:^3.0.2, minimatch@npm:^3.0.4": "minimatch@npm:^3.0.2, minimatch@npm:^3.0.4":
version: 3.0.4 version: 3.0.4
resolution: "minimatch@npm:3.0.4" resolution: "minimatch@npm:3.0.4"
@ -34305,15 +34397,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"minimatch@npm:^5.1.1":
version: 5.1.6
resolution: "minimatch@npm:5.1.6"
dependencies:
brace-expansion: ^2.0.1
checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77
languageName: node
linkType: hard
"minimatch@npm:^7.2.0": "minimatch@npm:^7.2.0":
version: 7.4.2 version: 7.4.2
resolution: "minimatch@npm:7.4.2" resolution: "minimatch@npm:7.4.2"
@ -34332,6 +34415,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"minimatch@npm:^9.0.3":
version: 9.0.5
resolution: "minimatch@npm:9.0.5"
dependencies:
brace-expansion: ^2.0.1
checksum: 2c035575eda1e50623c731ec6c14f65a85296268f749b9337005210bb2b34e2705f8ef1a358b188f69892286ab99dc42c8fb98a57bde55c8d81b3023c19cea28
languageName: node
linkType: hard
"minimatch@npm:^9.0.4": "minimatch@npm:^9.0.4":
version: 9.0.4 version: 9.0.4
resolution: "minimatch@npm:9.0.4" resolution: "minimatch@npm:9.0.4"
@ -36552,7 +36644,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0": "p-limit@npm:^3.0.2, p-limit@npm:^3.1.0, p-limit@npm:^3.1.0 ":
version: 3.1.0 version: 3.1.0
resolution: "p-limit@npm:3.1.0" resolution: "p-limit@npm:3.1.0"
dependencies: dependencies:
@ -37386,6 +37478,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"pe-library@npm:^0.4.1":
version: 0.4.1
resolution: "pe-library@npm:0.4.1"
checksum: a31b532fd5e28c8d45d82fc5b774e220d2f6d8e9d1145d4711e0737a50e624eb4ff3e1b0f1faf44cc5be22abdf4aa9177ae4741d1cceb695188e5d1f1ccdede9
languageName: node
linkType: hard
"peek-readable@npm:^4.1.0": "peek-readable@npm:^4.1.0":
version: 4.1.0 version: 4.1.0
resolution: "peek-readable@npm:4.1.0" resolution: "peek-readable@npm:4.1.0"
@ -37726,7 +37825,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"plist@npm:^3.0.4, plist@npm:^3.0.5": "plist@npm:^3.0.4, plist@npm:^3.0.5, plist@npm:^3.1.0":
version: 3.1.0 version: 3.1.0
resolution: "plist@npm:3.1.0" resolution: "plist@npm:3.1.0"
dependencies: dependencies:
@ -38701,6 +38800,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"proc-log@npm:^2.0.1":
version: 2.0.1
resolution: "proc-log@npm:2.0.1"
checksum: f6f23564ff759097db37443e6e2765af84979a703d2c52c1b9df506ee9f87caa101ba49d8fdc115c1a313ec78e37e8134704e9069e6a870f3499d98bb24c436f
languageName: node
linkType: hard
"proc-log@npm:^3.0.0": "proc-log@npm:^3.0.0":
version: 3.0.0 version: 3.0.0
resolution: "proc-log@npm:3.0.0" resolution: "proc-log@npm:3.0.0"
@ -40288,20 +40394,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"read-config-file@npm:6.3.2":
version: 6.3.2
resolution: "read-config-file@npm:6.3.2"
dependencies:
config-file-ts: ^0.2.4
dotenv: ^9.0.2
dotenv-expand: ^5.1.0
js-yaml: ^4.1.0
json5: ^2.2.0
lazy-val: ^1.0.4
checksum: bb4862851b616f905219a474fe92e37f2a65e07cda896cd3a89b3b357d38f9bfc3fd3d443e2f9c5fdd85b5166d5d09d49088dd8933cd82fd606c017a20703007
languageName: node
linkType: hard
"read-installed-packages@npm:^2.0.1": "read-installed-packages@npm:^2.0.1":
version: 2.0.1 version: 2.0.1
resolution: "read-installed-packages@npm:2.0.1" resolution: "read-installed-packages@npm:2.0.1"
@ -41160,6 +41252,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"resedit@npm:^1.7.0":
version: 1.7.2
resolution: "resedit@npm:1.7.2"
dependencies:
pe-library: ^0.4.1
checksum: 53ee7ddd19c93005f4a71525088f64bee783a6e8ba3c3a84fc34fae334227bd498e5c8a2dc2356558435b848be972c0fd54bda1e5500baa36c9d2a045925ed50
languageName: node
linkType: hard
"reselect@npm:4.1.8": "reselect@npm:4.1.8":
version: 4.1.8 version: 4.1.8
resolution: "reselect@npm:4.1.8" resolution: "reselect@npm:4.1.8"
@ -44949,7 +45050,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"tar@npm:6.2.1": "tar@npm:6.2.1, tar@npm:^6.2.1":
version: 6.2.1 version: 6.2.1
resolution: "tar@npm:6.2.1" resolution: "tar@npm:6.2.1"
dependencies: dependencies:
@ -46557,16 +46658,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript@npm:^4.0.2":
version: 4.9.5
resolution: "typescript@npm:4.9.5"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db
languageName: node
linkType: hard
"typescript@npm:^5.0.4, typescript@npm:^5.4.4": "typescript@npm:^5.0.4, typescript@npm:^5.4.4":
version: 5.6.3 version: 5.6.3
resolution: "typescript@npm:5.6.3" resolution: "typescript@npm:5.6.3"
@ -46577,6 +46668,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript@npm:^5.4.3":
version: 5.7.2
resolution: "typescript@npm:5.7.2"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: b55300c4cefee8ee380d14fa9359ccb41ff8b54c719f6bc49b424899d662a5ce62ece390ce769568c7f4d14af844085255e63788740084444eb12ef423b13433
languageName: node
linkType: hard
"typescript@patch:typescript@4 - 5#~builtin<compat/typescript>": "typescript@patch:typescript@4 - 5#~builtin<compat/typescript>":
version: 5.0.4 version: 5.0.4
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=b5f058" resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=b5f058"
@ -46607,16 +46708,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript@patch:typescript@^4.0.2#~builtin<compat/typescript>":
version: 4.9.5
resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=289587"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 1f8f3b6aaea19f0f67cba79057674ba580438a7db55057eb89cc06950483c5d632115c14077f6663ea76fd09fce3c190e6414bb98582ec80aa5a4eaf345d5b68
languageName: node
linkType: hard
"typescript@patch:typescript@^5.0.4#~builtin<compat/typescript>, typescript@patch:typescript@^5.4.4#~builtin<compat/typescript>": "typescript@patch:typescript@^5.0.4#~builtin<compat/typescript>, typescript@patch:typescript@^5.4.4#~builtin<compat/typescript>":
version: 5.6.3 version: 5.6.3
resolution: "typescript@patch:typescript@npm%3A5.6.3#~builtin<compat/typescript>::version=5.6.3&hash=379a07" resolution: "typescript@patch:typescript@npm%3A5.6.3#~builtin<compat/typescript>::version=5.6.3&hash=379a07"
@ -46627,6 +46718,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript@patch:typescript@^5.4.3#~builtin<compat/typescript>":
version: 5.7.2
resolution: "typescript@patch:typescript@npm%3A5.7.2#~builtin<compat/typescript>::version=5.7.2&hash=379a07"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 803430c6da2ba73c25a21880d8d4f08a56d9d2444e6db2ea949ac4abceeece8e4a442b7b9b585db7d8a0b47ebda2060e45fe8ee8b8aca23e27ec1d4844987ee6
languageName: node
linkType: hard
"typical@npm:^2.6.1": "typical@npm:^2.6.1":
version: 2.6.1 version: 2.6.1
resolution: "typical@npm:2.6.1" resolution: "typical@npm:2.6.1"