From de2cbe5f77355a838588b9e52fce610bf67788fa Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Thu, 22 Mar 2018 11:07:39 -0400 Subject: [PATCH] fix: app shortcut not created on install/reinstall (#1164) This fixes https://github.com/electron-userland/electron-builder/issues/2725 --- electron-builder.json | 3 +- package.json | 2 +- yarn.lock | 144 +++++++++++++++++------------------------- 3 files changed, 61 insertions(+), 88 deletions(-) diff --git a/electron-builder.json b/electron-builder.json index 0f63137e9..54d148d12 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -62,7 +62,8 @@ ] }, "nsis": { - "perMachine": true + "perMachine": true, + "createDesktopShortcut": "always" }, "artifactName": "${productName}_${version}.${ext}", "beforeBuild": "./build/checkDaemonPlatform.js" diff --git a/package.json b/package.json index fc12681ac..08c7c5c4a 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "del": "^3.0.0", "devtron": "^1.4.0", "electron": "1.7.12", - "electron-builder": "^20.5.1", + "electron-builder": "^20.7.1", "electron-devtools-installer": "^2.2.3", "electron-webpack": "^1.13.0", "eslint": "^4.19.0", diff --git a/yarn.lock b/yarn.lock index cc7b2e0c0..7106dad4a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1221,7 +1221,7 @@ base64-js@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" -base64-js@^1.0.2: +base64-js@^1.0.2, base64-js@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801" @@ -1517,15 +1517,6 @@ buffers@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" -builder-util-runtime@4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62" - dependencies: - bluebird-lst "^1.0.5" - debug "^3.1.0" - fs-extra-p "^4.5.0" - sax "^1.2.4" - builder-util-runtime@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.1.0.tgz#7dcd042d555d2f161a5538d7a0ea8c292daa0683" @@ -1535,7 +1526,7 @@ builder-util-runtime@4.1.0: fs-extra-p "^4.5.2" sax "^1.2.4" -builder-util-runtime@^4.0.5, builder-util-runtime@^4.1.0, builder-util-runtime@^4.2.0, builder-util-runtime@~4.2.0: +builder-util-runtime@4.2.0, builder-util-runtime@^4.1.0, builder-util-runtime@^4.2.0, builder-util-runtime@~4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.2.0.tgz#c56aa18d34390143da031c418c9d3a055fbd3522" dependencies: @@ -1544,25 +1535,6 @@ builder-util-runtime@^4.0.5, builder-util-runtime@^4.1.0, builder-util-runtime@^ fs-extra-p "^4.5.2" sax "^1.2.4" -builder-util@5.6.5: - version "5.6.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.5.tgz#f2d156541b8df9599456848e057566443dc04c82" - dependencies: - "7zip-bin" "~3.1.0" - app-builder-bin "1.7.2" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.0.5" - chalk "^2.3.2" - debug "^3.1.0" - fs-extra-p "^4.5.2" - is-ci "^1.1.0" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.3" - stat-mode "^0.2.2" - temp-file "^3.1.1" - builder-util@5.6.7: version "5.6.7" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.7.tgz#662ff2ba4f70416ee0c085126f16af48fbf97900" @@ -1582,7 +1554,7 @@ builder-util@5.6.7: stat-mode "^0.2.2" temp-file "^3.1.1" -builder-util@^5.6.5, builder-util@^5.6.7, builder-util@^5.7.1: +builder-util@5.7.2, builder-util@^5.6.7, builder-util@^5.7.0, builder-util@^5.7.1: version "5.7.2" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.2.tgz#049b4365993f34519c9d56589494cda2257b24d3" dependencies: @@ -2625,13 +2597,13 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dmg-builder@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.2.tgz#b4d7245dc2e91812395b4268b12f888443ba5f30" +dmg-builder@4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.3.tgz#d336cf398fd331b2dedd7efae4b51b9bfe00aa1c" dependencies: bluebird-lst "^1.0.5" - builder-util "^5.6.5" - electron-builder-lib "~20.5.0" + builder-util "^5.7.0" + electron-builder-lib "~20.6.2" fs-extra-p "^4.5.2" iconv-lite "^0.4.19" js-yaml "^3.11.0" @@ -2769,7 +2741,36 @@ ejs@^2.5.7: version "2.5.7" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" -electron-builder-lib@20.6.2: +electron-builder-lib@20.7.1: + version "20.7.1" + resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.7.1.tgz#c1d5abe0ed42606dcf92e46d4fdedc09f6d21ee3" + dependencies: + "7zip-bin" "~3.1.0" + app-builder-bin "1.8.1" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.5" + builder-util "5.7.2" + builder-util-runtime "4.2.0" + chromium-pickle-js "^0.2.0" + debug "^3.1.0" + ejs "^2.5.7" + electron-osx-sign "0.4.10" + electron-publish "20.7.0" + fs-extra-p "^4.5.2" + hosted-git-info "^2.6.0" + is-ci "^1.1.0" + isbinaryfile "^3.0.2" + js-yaml "^3.11.0" + lazy-val "^1.0.3" + minimatch "^3.0.4" + normalize-package-data "^2.4.0" + plist "^3.0.1" + read-config-file "3.0.0" + sanitize-filename "^1.6.1" + semver "^5.5.0" + temp-file "^3.1.1" + +electron-builder-lib@~20.6.2: version "20.6.2" resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.6.2.tgz#34f38b6172c05f90d34b6b5ed2f2b6922e731a39" dependencies: @@ -2798,45 +2799,16 @@ electron-builder-lib@20.6.2: semver "^5.5.0" temp-file "^3.1.1" -electron-builder-lib@~20.5.0: - version "20.5.1" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.5.1.tgz#c155345c58d25580d316f6437c251a57e8e92d62" - dependencies: - "7zip-bin" "~3.1.0" - app-builder-bin "1.7.2" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.5" - builder-util "5.6.5" - builder-util-runtime "4.0.5" - chromium-pickle-js "^0.2.0" - debug "^3.1.0" - ejs "^2.5.7" - electron-osx-sign "0.4.10" - electron-publish "20.5.0" - fs-extra-p "^4.5.2" - hosted-git-info "^2.6.0" - is-ci "^1.1.0" - isbinaryfile "^3.0.2" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - minimatch "^3.0.4" - normalize-package-data "^2.4.0" - plist "^2.1.0" - read-config-file "3.0.0" - sanitize-filename "^1.6.1" - semver "^5.5.0" - temp-file "^3.1.1" - -electron-builder@^20.5.1: - version "20.6.2" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.6.2.tgz#40e1d44910ce99c4c0e9200f0b4a18d15d0d00a4" +electron-builder@^20.7.1: + version "20.7.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.7.1.tgz#209eac9892a8f97e9e0ec312e9c50c4e7c0b4758" dependencies: bluebird-lst "^1.0.5" - builder-util "5.6.7" - builder-util-runtime "4.1.0" + builder-util "5.7.2" + builder-util-runtime "4.2.0" chalk "^2.3.2" - dmg-builder "4.1.2" - electron-builder-lib "20.6.2" + dmg-builder "4.1.3" + electron-builder-lib "20.7.1" electron-download-tf "4.3.4" fs-extra-p "^4.5.2" is-ci "^1.1.0" @@ -2910,18 +2882,6 @@ electron-osx-sign@0.4.10: minimist "^1.2.0" plist "^2.1.0" -electron-publish@20.5.0: - version "20.5.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.5.0.tgz#bcef9949c63899d34680e89110e8d38d1016f1f6" - dependencies: - bluebird-lst "^1.0.5" - builder-util "^5.6.5" - builder-util-runtime "^4.0.5" - chalk "^2.3.2" - fs-extra-p "^4.5.2" - lazy-val "^1.0.3" - mime "^2.2.0" - electron-publish@20.6.1: version "20.6.1" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.6.1.tgz#1bc8497fc9370f8e39c9212ce0b5857ef1d666fd" @@ -2934,7 +2894,7 @@ electron-publish@20.6.1: lazy-val "^1.0.3" mime "^2.2.0" -electron-publish@~20.7.0: +electron-publish@20.7.0, electron-publish@~20.7.0: version "20.7.0" resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.7.0.tgz#1bdc02365b199cd817e635bcd251670a39e014ce" dependencies: @@ -6748,6 +6708,14 @@ plist@^2.1.0: xmlbuilder "8.2.2" xmldom "0.1.x" +plist@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" + dependencies: + base64-js "^1.2.3" + xmlbuilder "^9.0.7" + xmldom "0.1.x" + pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" @@ -9395,6 +9363,10 @@ xmlbuilder@8.2.2: version "8.2.2" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773" +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + xmldom@0.1.x: version "0.1.27" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"