1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00

Desktop: Fixes #8149: Application cannot be installed on Windows 10 in some cases

This commit is contained in:
Laurent Cozic 2023-05-09 11:13:23 +01:00
parent 4d0ffc5beb
commit 3adfa574c0
2 changed files with 211 additions and 84 deletions

View File

@ -116,7 +116,7 @@
"@types/react-redux": "7.1.25",
"@types/styled-components": "5.1.26",
"electron": "19.1.4",
"electron-builder": "23.6.0",
"electron-builder": "22.14.13",
"electron-notarize": "1.2.2",
"electron-rebuild": "3.2.9",
"glob": "8.1.0",

293
yarn.lock
View File

@ -3804,18 +3804,16 @@ __metadata:
languageName: node
linkType: hard
"@electron/universal@npm:1.2.1":
version: 1.2.1
resolution: "@electron/universal@npm:1.2.1"
"@electron/universal@npm:1.0.5":
version: 1.0.5
resolution: "@electron/universal@npm:1.0.5"
dependencies:
"@malept/cross-spawn-promise": ^1.1.0
asar: ^3.1.0
asar: ^3.0.3
debug: ^4.3.1
dir-compare: ^2.4.0
fs-extra: ^9.0.1
minimatch: ^3.0.4
plist: ^3.0.4
checksum: 9a7d98cf2b8414ff0274384fef1b72b5a545a0feb7ce03163d2e2ee1b13e4f7064dfe7147cdd652708a1314d1b5e68acdd907847a1747866ec8d2d3e757ec1f7
checksum: 64eae3bbbfa422f28dbc1e92d12d954059cec7dac9ecc3ecad2c7895bb6cd10d30e8b3848092bfba8815bc71b60393a42f792751e50b9b5f643d6f1d03826b86
languageName: node
linkType: hard
@ -4848,7 +4846,7 @@ __metadata:
countable: 3.0.1
debounce: 1.2.1
electron: 19.1.4
electron-builder: 23.6.0
electron-builder: 22.14.13
electron-notarize: 1.2.2
electron-rebuild: 3.2.9
electron-window-state: 5.0.3
@ -8988,7 +8986,7 @@ __metadata:
languageName: node
linkType: hard
"ansi-align@npm:^3.0.1":
"ansi-align@npm:^3.0.0, ansi-align@npm:^3.0.1":
version: 3.0.1
resolution: "ansi-align@npm:3.0.1"
dependencies:
@ -9189,44 +9187,43 @@ __metadata:
languageName: node
linkType: hard
"app-builder-bin@npm:4.0.0":
version: 4.0.0
resolution: "app-builder-bin@npm:4.0.0"
checksum: c3c8fd85c371b7a396c1bb1160ab2e3231ba4309abea5b36a5b366e42511e347c65a33ff50d56f4960b337833d539c263137b0ba131e2fa268c32edeb6c9f683
"app-builder-bin@npm:3.7.1":
version: 3.7.1
resolution: "app-builder-bin@npm:3.7.1"
checksum: aae6152d7e7e6eabe35e5430f8b4733cc713bd3f80fdb861c5b675ebc8951aa26b520821d27c5ee31f05e850cdfd9b923b58064307f1ae583fb4e7434d380209
languageName: node
linkType: hard
"app-builder-lib@npm:23.6.0":
version: 23.6.0
resolution: "app-builder-lib@npm:23.6.0"
"app-builder-lib@npm:22.14.13":
version: 22.14.13
resolution: "app-builder-lib@npm:22.14.13"
dependencies:
7zip-bin: ~5.1.1
"@develar/schema-utils": ~2.6.5
"@electron/universal": 1.2.1
"@electron/universal": 1.0.5
"@malept/flatpak-bundler": ^0.4.0
async-exit-hook: ^2.0.1
bluebird-lst: ^1.0.9
builder-util: 23.6.0
builder-util-runtime: 9.1.1
builder-util: 22.14.13
builder-util-runtime: 8.9.2
chromium-pickle-js: ^0.2.0
debug: ^4.3.4
ejs: ^3.1.7
electron-osx-sign: ^0.6.0
electron-publish: 23.6.0
debug: ^4.3.2
ejs: ^3.1.6
electron-osx-sign: ^0.5.0
electron-publish: 22.14.13
form-data: ^4.0.0
fs-extra: ^10.1.0
hosted-git-info: ^4.1.0
fs-extra: ^10.0.0
hosted-git-info: ^4.0.2
is-ci: ^3.0.0
isbinaryfile: ^4.0.10
isbinaryfile: ^4.0.8
js-yaml: ^4.1.0
lazy-val: ^1.0.5
minimatch: ^3.1.2
minimatch: ^3.0.4
read-config-file: 6.2.0
sanitize-filename: ^1.6.3
semver: ^7.3.7
tar: ^6.1.11
semver: ^7.3.5
temp-file: ^3.4.0
checksum: da3cc9f24e127add651197076c5fa2f68bc7979bcd6a441df7f69629e96bf3aca3118d61c63a85d382a824748f8056a7639464f07b1ded09db53ff1c4b3101be
checksum: a32a5ef25b3f70ddcd9b6ba0691221b9e66b0b0a4e1c28e9dc90854d7dcd0183445af55132587458963202afe40b1860b705558b990622d9e5953931b0de2572
languageName: node
linkType: hard
@ -9610,9 +9607,9 @@ __metadata:
languageName: node
linkType: hard
"asar@npm:^3.1.0":
version: 3.1.0
resolution: "asar@npm:3.1.0"
"asar@npm:^3.0.3":
version: 3.2.0
resolution: "asar@npm:3.2.0"
dependencies:
"@types/glob": ^7.1.1
chromium-pickle-js: ^0.2.0
@ -9624,7 +9621,7 @@ __metadata:
optional: true
bin:
asar: bin/asar.js
checksum: facc80845639fa4f9e1d1aa40b96adbd1e8b6fee0725d287e8c8e30a69b235cd5b7131b7b09ff700da06c919dd0595b373e372c55722808f983fdb71ef0d5399
checksum: f7d30b45970b053252ac124230bf319459d0728d7f6dedbe2f765cd2a83792d5a716d2c3f2861ceda69372b401f335e1f46460335169eadd0e91a0904a4f5a15
languageName: node
linkType: hard
@ -10356,6 +10353,22 @@ __metadata:
languageName: node
linkType: hard
"boxen@npm:^5.0.0":
version: 5.1.2
resolution: "boxen@npm:5.1.2"
dependencies:
ansi-align: ^3.0.0
camelcase: ^6.2.0
chalk: ^4.1.0
cli-boxes: ^2.2.1
string-width: ^4.2.2
type-fest: ^0.20.2
widest-line: ^3.1.0
wrap-ansi: ^7.0.0
checksum: 82d03e42a72576ff235123f17b7c505372fe05c83f75f61e7d4fa4bcb393897ec95ce766fecb8f26b915f0f7a7227d66e5ec7cef43f5b2bd9d3aeed47ec55877
languageName: node
linkType: hard
"boxen@npm:^7.0.0":
version: 7.0.0
resolution: "boxen@npm:7.0.0"
@ -10760,29 +10773,29 @@ __metadata:
languageName: node
linkType: hard
"builder-util-runtime@npm:9.1.1":
version: 9.1.1
resolution: "builder-util-runtime@npm:9.1.1"
"builder-util-runtime@npm:8.9.2":
version: 8.9.2
resolution: "builder-util-runtime@npm:8.9.2"
dependencies:
debug: ^4.3.4
debug: ^4.3.2
sax: ^1.2.4
checksum: 3458f9c8accad6e934c841cffa93f5d4b342c22b10b9c1a2eb3fd44ca96ea2c662b1048f9a075da9b8a4fada17206887b7e92ebdca331b1071520916e013e245
checksum: 35adcd6162e2ed16635ff7b7ecc353e400dcbbb3e7cd01823bfefc7256cefca8c820f62d15a0f7dbee1c7495a5f1fba4e0e238857a79b48d5f6bd35064f27208
languageName: node
linkType: hard
"builder-util@npm:23.6.0":
version: 23.6.0
resolution: "builder-util@npm:23.6.0"
"builder-util@npm:22.14.13":
version: 22.14.13
resolution: "builder-util@npm:22.14.13"
dependencies:
7zip-bin: ~5.1.1
"@types/debug": ^4.1.6
"@types/fs-extra": ^9.0.11
app-builder-bin: 4.0.0
app-builder-bin: 3.7.1
bluebird-lst: ^1.0.9
builder-util-runtime: 9.1.1
builder-util-runtime: 8.9.2
chalk: ^4.1.1
cross-spawn: ^7.0.3
debug: ^4.3.4
debug: ^4.3.2
fs-extra: ^10.0.0
http-proxy-agent: ^5.0.0
https-proxy-agent: ^5.0.0
@ -10791,7 +10804,7 @@ __metadata:
source-map-support: ^0.5.19
stat-mode: ^1.0.0
temp-file: ^3.4.0
checksum: 138fb9abed01ea2e5ac895e6a6ed75310ca6c89e0050483c81801b052f61b42ae5a042f457088b6e205ec8b4403b1ff3a325955f110255afb4da2310e3cf14ad
checksum: 6d72cc1f0bf7e72debe70049dede2a5eac302fb98b87eb7e60b7feed8631dc66877821367d5e7a87aea881f937a565c25e4e24042b421ef12c1d2afa8b7cc02d
languageName: node
linkType: hard
@ -11550,7 +11563,7 @@ __metadata:
languageName: node
linkType: hard
"cli-boxes@npm:^2.2.0":
"cli-boxes@npm:^2.2.0, cli-boxes@npm:^2.2.1":
version: 2.2.1
resolution: "cli-boxes@npm:2.2.1"
checksum: be79f8ec23a558b49e01311b39a1ea01243ecee30539c880cf14bf518a12e223ef40c57ead0cb44f509bffdffc5c129c746cd50d863ab879385370112af4f585
@ -14430,25 +14443,25 @@ __metadata:
languageName: node
linkType: hard
"dmg-builder@npm:23.6.0":
version: 23.6.0
resolution: "dmg-builder@npm:23.6.0"
"dmg-builder@npm:22.14.13":
version: 22.14.13
resolution: "dmg-builder@npm:22.14.13"
dependencies:
app-builder-lib: 23.6.0
builder-util: 23.6.0
builder-util-runtime: 9.1.1
dmg-license: ^1.0.11
app-builder-lib: 22.14.13
builder-util: 22.14.13
builder-util-runtime: 8.9.2
dmg-license: ^1.0.9
fs-extra: ^10.0.0
iconv-lite: ^0.6.2
js-yaml: ^4.1.0
dependenciesMeta:
dmg-license:
optional: true
checksum: 3e37a4b191cf40c9c7b97d07408c2bf58e7632d78de0dc49a142fb7c68670fd2a7123f31ee8803b3cd100f38feea7b785c28698dfaace508254659d81ecc0b80
checksum: 01be77f99b9309e356e3ae4fbccc294c4f1dcb65b9b21c434807cbaa9d0c22b2338a5b688bba1b277e0110ac33dd1eb126f4267d09382b1fa12d0878162ac648
languageName: node
linkType: hard
"dmg-license@npm:^1.0.11":
"dmg-license@npm:^1.0.9":
version: 1.0.11
resolution: "dmg-license@npm:1.0.11"
dependencies:
@ -14764,14 +14777,14 @@ __metadata:
languageName: node
linkType: hard
"ejs@npm:^3.1.7":
version: 3.1.7
resolution: "ejs@npm:3.1.7"
"ejs@npm:^3.1.6":
version: 3.1.9
resolution: "ejs@npm:3.1.9"
dependencies:
jake: ^10.8.5
bin:
ejs: bin/cli.js
checksum: fe40764af39955ce8f8b116716fc8b911959946698edb49ecab85df597746c07aa65d5b74ead28a1e2ffa75b0f92d9bedd752f1c29437da6137b3518271e988c
checksum: af6f10eb815885ff8a8cfacc42c6b6cf87daf97a4884f87a30e0c3271fedd85d76a3a297d9c33a70e735b97ee632887f85e32854b9cdd3a2d97edf931519a35f
languageName: node
linkType: hard
@ -14786,26 +14799,26 @@ __metadata:
languageName: node
linkType: hard
"electron-builder@npm:23.6.0":
version: 23.6.0
resolution: "electron-builder@npm:23.6.0"
"electron-builder@npm:22.14.13":
version: 22.14.13
resolution: "electron-builder@npm:22.14.13"
dependencies:
"@types/yargs": ^17.0.1
app-builder-lib: 23.6.0
builder-util: 23.6.0
builder-util-runtime: 9.1.1
app-builder-lib: 22.14.13
builder-util: 22.14.13
builder-util-runtime: 8.9.2
chalk: ^4.1.1
dmg-builder: 23.6.0
dmg-builder: 22.14.13
fs-extra: ^10.0.0
is-ci: ^3.0.0
lazy-val: ^1.0.5
read-config-file: 6.2.0
simple-update-notifier: ^1.0.7
yargs: ^17.5.1
update-notifier: ^5.1.0
yargs: ^17.0.1
bin:
electron-builder: cli.js
install-app-deps: install-app-deps.js
checksum: 227f8fb9c9bb11a11d999f2ade6a5cd1afb720d6ff5053c88b4be62d1265b6268c8f6b4b3b8ad6d0a7261d57ea5acd6619ef301b843865f260b616c474cf8cbd
checksum: 1c5179ca9c4db3886377f86b6aa00db703180358134fefbf4c32daa54ed2620c47bf5495d0e4ee12bd3694dd7d3553a6561f088d2e5ab571b9e9b2f07ff594f2
languageName: node
linkType: hard
@ -14819,9 +14832,9 @@ __metadata:
languageName: node
linkType: hard
"electron-osx-sign@npm:^0.6.0":
version: 0.6.0
resolution: "electron-osx-sign@npm:0.6.0"
"electron-osx-sign@npm:^0.5.0":
version: 0.5.0
resolution: "electron-osx-sign@npm:0.5.0"
dependencies:
bluebird: ^3.5.0
compare-version: ^0.1.2
@ -14832,22 +14845,22 @@ __metadata:
bin:
electron-osx-flat: bin/electron-osx-flat.js
electron-osx-sign: bin/electron-osx-sign.js
checksum: b688f9efb013670b4226cff7c38101e7b1384ea44e1ab203259995f1eefc019c63aa18e936217a76d33b5a5a452b987ab3d86a56a961294582ce42acbb950de6
checksum: ca1e55d8cb0987b78bfaf197860e73f7e6266cb219f3d6fd32f25665a8393efb284115db9e2246b42f75cdf6163c148060aff8a02960f4f810c6502d6f7d447c
languageName: node
linkType: hard
"electron-publish@npm:23.6.0":
version: 23.6.0
resolution: "electron-publish@npm:23.6.0"
"electron-publish@npm:22.14.13":
version: 22.14.13
resolution: "electron-publish@npm:22.14.13"
dependencies:
"@types/fs-extra": ^9.0.11
builder-util: 23.6.0
builder-util-runtime: 9.1.1
builder-util: 22.14.13
builder-util-runtime: 8.9.2
chalk: ^4.1.1
fs-extra: ^10.0.0
lazy-val: ^1.0.5
mime: ^2.5.2
checksum: 70473d800f0607b5ffc32473e87004079fe3e5f133242bb498dcff0be89bfaa4ce967860809e12b97ce216b1e907649a8a916b7483daf7a00ea28db3d665878e
checksum: 66cf15ad52c9dea67d744eb9080c20d43792a734f4e524b8ffc676e8ce9541a2fe4b11a25e4bd3f48e670160e72edfc7eeb77767e843232f4454075ee91d2475
languageName: node
linkType: hard
@ -15340,6 +15353,13 @@ __metadata:
languageName: node
linkType: hard
"escape-goat@npm:^2.0.0":
version: 2.1.1
resolution: "escape-goat@npm:2.1.1"
checksum: ce05c70c20dd7007b60d2d644b625da5412325fdb57acf671ba06cb2ab3cd6789e2087026921a05b665b0a03fadee2955e7fc0b9a67da15a6551a980b260eba7
languageName: node
linkType: hard
"escape-html@npm:^1.0.3, escape-html@npm:~1.0.3":
version: 1.0.3
resolution: "escape-html@npm:1.0.3"
@ -18117,6 +18137,13 @@ __metadata:
languageName: node
linkType: hard
"has-yarn@npm:^2.1.0":
version: 2.1.0
resolution: "has-yarn@npm:2.1.0"
checksum: 5eb1d0bb8518103d7da24532bdbc7124ffc6d367b5d3c10840b508116f2f1bcbcf10fd3ba843ff6e2e991bdf9969fd862d42b2ed58aade88343326c950b7e7f7
languageName: node
linkType: hard
"has@npm:^1.0.0, has@npm:^1.0.3, has@npm:~1.0.3":
version: 1.0.3
resolution: "has@npm:1.0.3"
@ -18274,7 +18301,7 @@ __metadata:
languageName: node
linkType: hard
"hosted-git-info@npm:^4.1.0":
"hosted-git-info@npm:^4.0.2":
version: 4.1.0
resolution: "hosted-git-info@npm:4.1.0"
dependencies:
@ -18771,6 +18798,13 @@ __metadata:
languageName: node
linkType: hard
"import-lazy@npm:^2.1.0":
version: 2.1.0
resolution: "import-lazy@npm:2.1.0"
checksum: 05294f3b9dd4971d3a996f0d2f176410fb6745d491d6e73376429189f5c1c3d290548116b2960a7cf3e89c20cdf11431739d1d2d8c54b84061980795010e803a
languageName: node
linkType: hard
"import-local@npm:^2.0.0":
version: 2.0.0
resolution: "import-local@npm:2.0.0"
@ -19542,6 +19576,13 @@ __metadata:
languageName: node
linkType: hard
"is-npm@npm:^5.0.0":
version: 5.0.0
resolution: "is-npm@npm:5.0.0"
checksum: 9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc
languageName: node
linkType: hard
"is-number-object@npm:^1.0.4":
version: 1.0.6
resolution: "is-number-object@npm:1.0.6"
@ -19857,6 +19898,13 @@ __metadata:
languageName: node
linkType: hard
"is-yarn-global@npm:^0.3.0":
version: 0.3.0
resolution: "is-yarn-global@npm:0.3.0"
checksum: bca013d65fee2862024c9fbb3ba13720ffca2fe750095174c1c80922fdda16402b5c233f5ac9e265bc12ecb5446e7b7f519a32d9541788f01d4d44e24d2bf481
languageName: node
linkType: hard
"is2@npm:^2.0.6":
version: 2.0.7
resolution: "is2@npm:2.0.7"
@ -19884,7 +19932,7 @@ __metadata:
languageName: node
linkType: hard
"isbinaryfile@npm:^4.0.10":
"isbinaryfile@npm:^4.0.8":
version: 4.0.10
resolution: "isbinaryfile@npm:4.0.10"
checksum: a6b28db7e23ac7a77d3707567cac81356ea18bd602a4f21f424f862a31d0e7ab4f250759c98a559ece35ffe4d99f0d339f1ab884ffa9795172f632ab8f88e686
@ -21874,6 +21922,15 @@ __metadata:
languageName: node
linkType: hard
"latest-version@npm:^5.1.0":
version: 5.1.0
resolution: "latest-version@npm:5.1.0"
dependencies:
package-json: ^6.3.0
checksum: fbc72b071eb66c40f652441fd783a9cca62f08bf42433651937f078cd9ef94bf728ec7743992777826e4e89305aef24f234b515e6030503a2cbee7fc9bdc2c0f
languageName: node
linkType: hard
"lazy-val@npm:^1.0.4, lazy-val@npm:^1.0.5":
version: 1.0.5
resolution: "lazy-val@npm:1.0.5"
@ -25629,6 +25686,18 @@ __metadata:
languageName: node
linkType: hard
"package-json@npm:^6.3.0":
version: 6.5.0
resolution: "package-json@npm:6.5.0"
dependencies:
got: ^9.6.0
registry-auth-token: ^4.0.0
registry-url: ^5.0.0
semver: ^6.2.0
checksum: cc9f890d3667d7610e6184decf543278b87f657d1ace0deb4a9c9155feca738ef88f660c82200763d3348010f4e42e9c7adc91e96ab0f86a770955995b5351e2
languageName: node
linkType: hard
"packet-reader@npm:1.0.0":
version: 1.0.0
resolution: "packet-reader@npm:1.0.0"
@ -26956,6 +27025,15 @@ __metadata:
languageName: node
linkType: hard
"pupa@npm:^2.1.1":
version: 2.1.1
resolution: "pupa@npm:2.1.1"
dependencies:
escape-goat: ^2.0.0
checksum: 49529e50372ffdb0cccf0efa0f3b3cb0a2c77805d0d9cc2725bd2a0f6bb414631e61c93a38561b26be1259550b7bb6c2cb92315aa09c8bf93f3bdcb49f2b2fb7
languageName: node
linkType: hard
"pure-rand@npm:^6.0.0":
version: 6.0.1
resolution: "pure-rand@npm:6.0.1"
@ -27145,7 +27223,7 @@ __metadata:
languageName: node
linkType: hard
"rc@npm:^1.2.7":
"rc@npm:1.2.8, rc@npm:^1.2.7, rc@npm:^1.2.8":
version: 1.2.8
resolution: "rc@npm:1.2.8"
dependencies:
@ -28240,6 +28318,24 @@ __metadata:
languageName: node
linkType: hard
"registry-auth-token@npm:^4.0.0":
version: 4.2.2
resolution: "registry-auth-token@npm:4.2.2"
dependencies:
rc: 1.2.8
checksum: c5030198546ecfdcbcb0722cbc3e260c4f5f174d8d07bdfedd4620e79bfdf17a2db735aa230d600bd388fce6edd26c0a9ed2eb7e9b4641ec15213a28a806688b
languageName: node
linkType: hard
"registry-url@npm:^5.0.0":
version: 5.1.0
resolution: "registry-url@npm:5.1.0"
dependencies:
rc: ^1.2.8
checksum: bcea86c84a0dbb66467b53187fadebfea79017cddfb4a45cf27530d7275e49082fe9f44301976eb0164c438e395684bcf3dae4819b36ff9d1640d8cc60c73df9
languageName: node
linkType: hard
"regjsgen@npm:^0.7.1":
version: 0.7.1
resolution: "regjsgen@npm:0.7.1"
@ -29162,6 +29258,15 @@ __metadata:
languageName: node
linkType: hard
"semver-diff@npm:^3.1.1":
version: 3.1.1
resolution: "semver-diff@npm:3.1.1"
dependencies:
semver: ^6.3.0
checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe
languageName: node
linkType: hard
"semver-greatest-satisfied-range@npm:^1.1.0":
version: 1.1.0
resolution: "semver-greatest-satisfied-range@npm:1.1.0"
@ -32703,6 +32808,28 @@ __metadata:
languageName: node
linkType: hard
"update-notifier@npm:^5.1.0":
version: 5.1.0
resolution: "update-notifier@npm:5.1.0"
dependencies:
boxen: ^5.0.0
chalk: ^4.1.0
configstore: ^5.0.1
has-yarn: ^2.1.0
import-lazy: ^2.1.0
is-ci: ^2.0.0
is-installed-globally: ^0.4.0
is-npm: ^5.0.0
is-yarn-global: ^0.3.0
latest-version: ^5.1.0
pupa: ^2.1.1
semver: ^7.3.4
semver-diff: ^3.1.1
xdg-basedir: ^4.0.0
checksum: 461e5e5b002419296d3868ee2abe0f9ab3e1846d9db642936d0c46f838872ec56069eddfe662c45ce1af0a8d6d5026353728de2e0a95ab2e3546a22ea077caf1
languageName: node
linkType: hard
"upper-case-first@npm:^2.0.2":
version: 2.0.2
resolution: "upper-case-first@npm:2.0.2"