From eeb5404c242bce4f740249f8c60ff1623c960e35 Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Thu, 27 Sep 2018 23:32:01 -0400 Subject: [PATCH] fix: artifact name on windows --- package.json | 7 +- server/package.json | 2 +- yarn.lock | 233 +++++++++++++++++++++----------------------- 3 files changed, 117 insertions(+), 125 deletions(-) diff --git a/package.json b/package.json index 138ef42bdb..016e328b29 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ }, "nsis": { "createDesktopShortcut": "always", - "installerIcon": "icon.ico" + "installerIcon": "icon.ico", + "artifactName": "AngularConsole-Setup-${version}.${ext}" }, "afterPack": "./tools/scripts/after-pack.js", "publish": [ @@ -99,11 +100,11 @@ "cypress": "3.0.3", "drivelist": "6.3.0", "electron": "2.0.8", - "electron-builder": "20.19.2", + "electron-builder": "20.28.4", "electron-installer-dmg": "^1.0.0", "electron-packager": "12.1.0", "electron-store": "2.0.0", - "electron-updater": "^2.21.4", + "electron-updater": "^3.0.3", "express": "^4.16.3", "express-graphql": "^0.6.12", "fix-path": "2.1.0", diff --git a/server/package.json b/server/package.json index be860ee90d..b41f3678c1 100644 --- a/server/package.json +++ b/server/package.json @@ -13,7 +13,7 @@ "@ngrx/schematics": "6.1.0", "@nrwl/schematics": "6.2.1", "drivelist": "6.3.0", - "electron-updater": "^2.21.4", + "electron-updater": "^3.0.3", "express": "^4.16.3", "express-graphql": "^0.6.12", "fix-path": "2.1.0", diff --git a/yarn.lock b/yarn.lock index 09c3ca01fd..896c0020a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -805,7 +805,7 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.1.0, ajv@^6.5.1: +ajv@^6.1.0: version "6.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360" dependencies: @@ -814,6 +814,15 @@ ajv@^6.1.0, ajv@^6.5.1: json-schema-traverse "^0.4.1" uri-js "^4.2.1" +ajv@^6.5.2: + version "6.5.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59" + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + ajv@~6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6" @@ -1082,13 +1091,38 @@ apollo-utilities@^1.0.1: dependencies: fast-json-stable-stringify "^2.0.0" -app-builder-bin@1.10.3: - version "1.10.3" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.10.3.tgz#ab4d7b1a3bf4005dea16bf0b184077b3136f8ae9" +app-builder-bin@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.1.2.tgz#528ce8e543aa595210c9595f91bdf5638cecd79b" -app-builder-bin@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.0.0.tgz#bda985bee14370b254841a9982753b8f383415c5" +app-builder-lib@20.28.4, app-builder-lib@~20.28.3: + version "20.28.4" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.28.4.tgz#0bee3366364c65d17a2aaab75b30bb10df76ece5" + dependencies: + "7zip-bin" "~4.0.2" + app-builder-bin "2.1.2" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.5" + builder-util "6.1.3" + builder-util-runtime "4.4.1" + chromium-pickle-js "^0.2.0" + debug "^3.1.0" + ejs "^2.6.1" + electron-osx-sign "0.4.10" + electron-publish "20.28.3" + fs-extra-p "^4.6.1" + hosted-git-info "^2.7.1" + is-ci "^1.2.0" + isbinaryfile "^3.0.3" + js-yaml "^3.12.0" + lazy-val "^1.0.3" + minimatch "^3.0.4" + normalize-package-data "^2.4.0" + plist "^3.0.1" + read-config-file "3.1.2" + sanitize-filename "^1.6.1" + semver "^5.5.1" + temp-file "^3.1.3" app-root-path@^2.0.1, app-root-path@^2.1.0: version "2.1.0" @@ -1889,16 +1923,7 @@ buffers@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" -builder-util-runtime@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.4.0.tgz#1f486819df12a04abfa128fe082e7c54edda0ef7" - dependencies: - bluebird-lst "^1.0.5" - debug "^3.1.0" - fs-extra-p "^4.6.1" - sax "^1.2.4" - -builder-util-runtime@^4.4.0, builder-util-runtime@^4.4.1, builder-util-runtime@~4.4.0: +builder-util-runtime@4.4.1, builder-util-runtime@^4.4.1, builder-util-runtime@~4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.4.1.tgz#2770d03241e51fde46acacc7ed3ed8a9f45f02cb" dependencies: @@ -1907,41 +1932,22 @@ builder-util-runtime@^4.4.0, builder-util-runtime@^4.4.1, builder-util-runtime@~ fs-extra-p "^4.6.1" sax "^1.2.4" -builder-util@5.13.2: - version "5.13.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.13.2.tgz#58b43b5b2c4acdeb9d4994b47152acdb111683ea" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.10.3" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.4.0" - chalk "^2.4.1" - debug "^3.1.0" - fs-extra-p "^4.6.1" - is-ci "^1.1.0" - js-yaml "^3.12.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.6" - stat-mode "^0.2.2" - temp-file "^3.1.3" - -builder-util@^5.13.1, builder-util@^5.13.2: - version "5.20.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.20.1.tgz#64544def24a9fbbdc77ac0c027661bb3dbb520a2" +builder-util@6.1.3, builder-util@~6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-6.1.3.tgz#6bd3a5253c99afa31e3574e6fc3b796e218f8cfd" dependencies: "7zip-bin" "~4.0.2" - app-builder-bin "2.0.0" + app-builder-bin "2.1.2" bluebird-lst "^1.0.5" builder-util-runtime "^4.4.1" chalk "^2.4.1" debug "^3.1.0" fs-extra-p "^4.6.1" - is-ci "^1.1.0" + is-ci "^1.2.0" js-yaml "^3.12.0" lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.6" + semver "^5.5.1" + source-map-support "^0.5.9" stat-mode "^0.2.2" temp-file "^3.1.3" @@ -2190,6 +2196,10 @@ ci-info@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2" +ci-info@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -3129,15 +3139,15 @@ dir-glob@^2.0.0: arrify "^1.0.1" path-type "^3.0.0" -dmg-builder@4.11.6: - version "4.11.6" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.11.6.tgz#ea686a487376b9288ffb306e0db6b6c8a9b7ed86" +dmg-builder@5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-5.3.1.tgz#b4d66d1dd010e1c9e7a5787bf1369e8157cac3cf" dependencies: + app-builder-lib "~20.28.3" bluebird-lst "^1.0.5" - builder-util "^5.13.2" - electron-builder-lib "~20.19.1" + builder-util "~6.1.3" fs-extra-p "^4.6.1" - iconv-lite "^0.4.23" + iconv-lite "^0.4.24" js-yaml "^3.12.0" parse-color "^1.0.0" sanitize-filename "^1.6.1" @@ -3292,52 +3302,20 @@ ejs@^2.5.7, ejs@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" -electron-builder-lib@20.19.2, electron-builder-lib@~20.19.1: - version "20.19.2" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.19.2.tgz#1ad1053f8e02c87a5f949fec575fe55a8dff4b8b" +electron-builder@20.28.4: + version "20.28.4" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.28.4.tgz#c9355b92b0971d51aaed0c945d2944bac41e9fbf" dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.10.3" - async-exit-hook "^2.0.1" + app-builder-lib "20.28.4" bluebird-lst "^1.0.5" - builder-util "5.13.2" - builder-util-runtime "4.4.0" - chromium-pickle-js "^0.2.0" - debug "^3.1.0" - ejs "^2.6.1" - electron-osx-sign "0.4.10" - electron-publish "20.19.0" - env-paths "^1.0.0" - fs-extra-p "^4.6.1" - hosted-git-info "^2.6.1" - is-ci "^1.1.0" - isbinaryfile "^3.0.2" - js-yaml "^3.12.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.2" - sanitize-filename "^1.6.1" - semver "^5.5.0" - stream-json "^1.1.0" - sumchecker "^2.0.2" - temp-file "^3.1.3" - -electron-builder@20.19.2: - version "20.19.2" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.19.2.tgz#0c782ddbefa17192278963ab58c461b3a13dc99c" - dependencies: - bluebird-lst "^1.0.5" - builder-util "5.13.2" - builder-util-runtime "4.4.0" + builder-util "6.1.3" + builder-util-runtime "4.4.1" chalk "^2.4.1" - dmg-builder "4.11.6" - electron-builder-lib "20.19.2" + dmg-builder "5.3.1" fs-extra-p "^4.6.1" - is-ci "^1.1.0" + is-ci "^1.2.0" lazy-val "^1.0.3" - read-config-file "3.0.2" + read-config-file "3.1.2" sanitize-filename "^1.6.1" update-notifier "^2.5.0" yargs "^12.0.1" @@ -3416,13 +3394,13 @@ electron-packager@12.1.0: semver "^5.3.0" yargs-parser "^10.0.0" -electron-publish@20.19.0: - version "20.19.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.19.0.tgz#5d272ba4d4a8b54da8770505da4bcbf460662394" +electron-publish@20.28.3: + version "20.28.3" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.28.3.tgz#0cc360ecaffd16e22780ee1630e0bd88fe6395e2" dependencies: bluebird-lst "^1.0.5" - builder-util "^5.13.1" - builder-util-runtime "^4.4.0" + builder-util "~6.1.3" + builder-util-runtime "^4.4.1" chalk "^2.4.1" fs-extra-p "^4.6.1" lazy-val "^1.0.3" @@ -3438,19 +3416,19 @@ electron-to-chromium@^1.3.47: version "1.3.55" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz#f150e10b20b77d9d41afcca312efe0c3b1a7fdce" -electron-updater@^2.21.4: - version "2.23.3" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.23.3.tgz#7bf054075f0cef2cd832cb533cf21adcdd5780b8" +electron-updater@^3.0.3: + version "3.1.2" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-3.1.2.tgz#30d9790d5b16048e4afc74a31748790348b153bf" dependencies: bluebird-lst "^1.0.5" - builder-util-runtime "~4.4.0" + builder-util-runtime "~4.4.1" electron-is-dev "^0.3.0" fs-extra-p "^4.6.1" js-yaml "^3.12.0" lazy-val "^1.0.3" lodash.isequal "^4.5.0" - semver "^5.5.0" - source-map-support "^0.5.6" + semver "^5.5.1" + source-map-support "^0.5.9" electron@2.0.8: version "2.0.8" @@ -4952,7 +4930,7 @@ home-path@^1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.6.tgz#d549dc2465388a7f8667242c5b31588d29af29fc" -hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.6.1: +hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" @@ -5114,12 +5092,18 @@ iconv-lite@0.4.19: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" -iconv-lite@0.4.23, iconv-lite@^0.4.23, iconv-lite@^0.4.4: +iconv-lite@0.4.23, iconv-lite@^0.4.4: version "0.4.23" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + dependencies: + safer-buffer ">= 2.1.2 < 3" + ieee754@^1.1.4: version "1.1.12" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b" @@ -5300,12 +5284,18 @@ is-ci@1.0.10: dependencies: ci-info "^1.0.0" -is-ci@^1.0.10, is-ci@^1.1.0: +is-ci@^1.0.10: version "1.1.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5" dependencies: ci-info "^1.0.0" +is-ci@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + dependencies: + ci-info "^1.5.0" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -5581,7 +5571,7 @@ isarray@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" -isbinaryfile@^3.0.0, isbinaryfile@^3.0.2: +isbinaryfile@^3.0.0, isbinaryfile@^3.0.2, isbinaryfile@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" dependencies: @@ -8456,11 +8446,11 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" -read-config-file@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.0.2.tgz#3866666a8772d350cfbfe9a4b26187df34883c56" +read-config-file@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.1.2.tgz#9b299cb7a2bcec1511a4c22e71620df0a2e3b896" dependencies: - ajv "^6.5.1" + ajv "^6.5.2" ajv-keywords "^3.2.0" bluebird-lst "^1.0.5" dotenv "^6.0.0" @@ -9155,6 +9145,10 @@ semver@5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" +semver@^5.5.1: + version "5.5.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477" + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -9550,6 +9544,13 @@ source-map-support@^0.5.0, source-map-support@^0.5.5, source-map-support@^0.5.6: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@^0.5.9: + version "0.5.9" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -9743,10 +9744,6 @@ stream-buffers@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4" -stream-chain@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/stream-chain/-/stream-chain-2.0.3.tgz#9155237a719c8bb2de883c2d1af66d1546f910c9" - stream-combiner@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" @@ -9770,12 +9767,6 @@ stream-http@^2.7.2: to-arraybuffer "^1.0.0" xtend "^4.0.0" -stream-json@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-1.1.1.tgz#9f3536daa894521cd65967c6c6b087c2be75cc43" - dependencies: - stream-chain "^2.0.3" - stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" @@ -9920,7 +9911,7 @@ sumchecker@^1.2.0: debug "^2.2.0" es6-promise "^4.0.5" -sumchecker@^2.0.1, sumchecker@^2.0.2: +sumchecker@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e" dependencies: @@ -10517,7 +10508,7 @@ uri-js@^3.0.2: dependencies: punycode "^2.1.0" -uri-js@^4.2.1: +uri-js@^4.2.1, uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" dependencies: