From 206cf974c05d4d1c1fc99c7a78c80f2e24ff897f Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sun, 19 May 2019 20:30:40 +0200 Subject: [PATCH] use nsis installer and electron-updater (fixes #813, fixes #627) --- app/dev-app-update.yml | 4 + app/lib/index.ts | 1 - app/package.json | 2 +- app/webpack.main.config.js | 1 - app/yarn.lock | 144 ++++++- appveyor.yml | 2 - build/installer.nsh | 3 + package.json | 31 +- scripts/build-windows.js | 2 +- terminus-core/src/services/updater.service.ts | 30 +- yarn.lock | 371 ++++++++++++------ 11 files changed, 427 insertions(+), 164 deletions(-) create mode 100644 app/dev-app-update.yml create mode 100644 build/installer.nsh diff --git a/app/dev-app-update.yml b/app/dev-app-update.yml new file mode 100644 index 00000000..e95e81c4 --- /dev/null +++ b/app/dev-app-update.yml @@ -0,0 +1,4 @@ +owner: eugeny +repo: terminus +provider: github +updaterCacheDirName: terminus-updater diff --git a/app/lib/index.ts b/app/lib/index.ts index 579e77aa..2d0786ec 100644 --- a/app/lib/index.ts +++ b/app/lib/index.ts @@ -2,7 +2,6 @@ import './lru' import { app, ipcMain, Menu } from 'electron' import { parseArgs } from './cli' import { Application } from './app' -if (process.platform === 'win32' && require('electron-squirrel-startup')) process.exit(0) if (!process.env.TERMINUS_PLUGINS) { process.env.TERMINUS_PLUGINS = '' diff --git a/app/package.json b/app/package.json index 304318aa..a6209d57 100644 --- a/app/package.json +++ b/app/package.json @@ -25,7 +25,7 @@ "electron-config": "0.2.1", "electron-debug": "^2.0.0", "electron-is-dev": "0.1.2", - "electron-squirrel-startup": "^1.0.0", + "electron-updater": "^4.0.6", "js-yaml": "3.8.2", "mz": "^2.6.0", "ngx-toastr": "^9.1.1", diff --git a/app/webpack.main.config.js b/app/webpack.main.config.js index 73a4a891..f2aa9be6 100644 --- a/app/webpack.main.config.js +++ b/app/webpack.main.config.js @@ -36,7 +36,6 @@ module.exports = { electron: 'commonjs electron', 'electron-config': 'commonjs electron-config', 'electron-vibrancy': 'commonjs electron-vibrancy', - 'electron-squirrel-startup': 'commonjs electron-squirrel-startup', fs: 'commonjs fs', mz: 'commonjs mz', path: 'commonjs path', diff --git a/app/yarn.lock b/app/yarn.lock index 815411ca..809ce7d1 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -102,6 +102,33 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +bluebird-lst@^1.0.6, bluebird-lst@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.8.tgz#61b572e8b3eb57e0fff676a0e54566d93597e6a4" + integrity sha512-InUDOaBaIjIobOa3O4YRAbFgff907uTJZXW0m0rhk3zhVZ4GvsmdCLEAKC1CTWTtUWCM8iWTTfFX9N/xQR/etw== + dependencies: + bluebird "^3.5.4" + +bluebird@^3.5.4: + version "3.5.4" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714" + integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw== + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +builder-util-runtime@~8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz#f2f6fc43e33d26892bd491667fc746ad69bccc50" + integrity sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig== + dependencies: + bluebird-lst "^1.0.6" + debug "^4.1.1" + fs-extra-p "^7.0.0" + sax "^1.2.4" + camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" @@ -140,13 +167,20 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -debug@^2.2.0, debug@^2.6.8: +debug@^2.6.8: version "2.6.8" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc" integrity sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw= dependencies: ms "2.0.0" +debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + decamelize@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7" @@ -210,12 +244,20 @@ electron-localshortcut@^3.0.0: keyboardevent-from-electron-accelerator "^1.1.0" keyboardevents-areequal "^0.2.1" -electron-squirrel-startup@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/electron-squirrel-startup/-/electron-squirrel-startup-1.0.0.tgz#19b4e55933fa0ef8f556784b9c660f772546a0b8" - integrity sha1-GbTlWTP6Dvj1VnhLnGYPdyVGoLg= +electron-updater@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.0.6.tgz#9c4f495ae0e80bf4425e3e1b801c5ed2ab933c2d" + integrity sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg== dependencies: - debug "^2.2.0" + bluebird-lst "^1.0.6" + builder-util-runtime "~8.1.0" + fs-extra-p "^7.0.0" + js-yaml "^3.12.0" + lazy-val "^1.0.3" + lodash.isequal "^4.5.0" + pako "^1.0.7" + semver "^5.6.0" + source-map-support "^0.5.9" env-paths@^0.3.0: version "0.3.1" @@ -227,6 +269,11 @@ esprima@^3.1.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM= +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" @@ -255,6 +302,23 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +fs-extra-p@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3" + integrity sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw== + dependencies: + bluebird-lst "^1.0.7" + fs-extra "^7.0.1" + +fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -265,6 +329,11 @@ get-stream@^3.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= +graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.1.15" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" + integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== + highlight.js@^9.3.0: version "9.12.0" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" @@ -320,6 +389,21 @@ js-yaml@3.8.2: argparse "^1.0.7" esprima "^3.1.1" +js-yaml@^3.12.0: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + keyboardevent-from-electron-accelerator@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-1.1.0.tgz#324614f6e33490c37ffc5be5876b3e85fe223c84" @@ -330,6 +414,11 @@ keyboardevents-areequal@^0.2.1: resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== +lazy-val@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" + integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== + lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -345,6 +434,11 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lru-cache@^4.0.1: version "4.1.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" @@ -382,6 +476,11 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +ms@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + mz@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce" @@ -448,6 +547,11 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== +pako@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" + integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== + path-exists@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" @@ -519,6 +623,16 @@ rxjs@^6.3.3: dependencies: tslib "^1.9.0" +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +semver@^5.6.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" + integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== + set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -541,6 +655,19 @@ signal-exit@^3.0.0: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +source-map-support@^0.5.9: + version "0.5.12" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" + integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -601,6 +728,11 @@ tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.1.tgz#a5d1f0532a49221c87755cfcc89ca37197242ba7" integrity sha512-avfPS28HmGLLc2o4elcc2EIq2FcH++Yo5YxpBZi9Yw93BCTGFthI4HPE4Rpep6vSYQaK8e69PelM44tPj+RaQg== +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + util@^0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" diff --git a/appveyor.yml b/appveyor.yml index 492f8db3..9747549c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,6 +23,4 @@ build_script: - node scripts/build-windows.js artifacts: - - path: 'dist\win\*.exe' - - path: 'dist\squirrel-windows\*.exe' - path: 'dist\*.exe' diff --git a/build/installer.nsh b/build/installer.nsh new file mode 100644 index 00000000..45fcaf8a --- /dev/null +++ b/build/installer.nsh @@ -0,0 +1,3 @@ +!macro customInit + nsExec::Exec '"$LOCALAPPDATA\terminus\Update.exe" --uninstall -s' +!macroend diff --git a/package.json b/package.json index c30aa4ad..5914903a 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "cross-env": "4.0.0", "css-loader": "0.28.0", "electron": "^5.0.1", - "electron-builder": "^20.38.4", - "electron-builder-squirrel-windows": "^20.28.3", + "electron-builder": "^20.40.2", "electron-installer-snap": "^3.0.0", "electron-rebuild": "^1.8.4", "file-loader": "^1.1.11", @@ -71,16 +70,22 @@ ], "win": { "icon": "./build/windows/icon.ico", - "publish": [ - "github" - ], "artifactName": "terminus-${version}-setup.exe" }, - "squirrelWindows": { - "iconUrl": "https://github.com/Eugeny/terminus/raw/master/build/windows/icon.ico", - "loadingGif": "./build/windows/squirrel.gif", - "artifactName": "terminus-${version}-setup.exe" + "nsis": { + "oneClick": false, + "artifactName": "terminus-${version}-setup.${ext}", + "installerIcon": "./build/windows/icon.ico" }, + "publish": [ + { + "provider": "bintray", + "token": "d993c4faa708a4cba84fa3a8e822457e7298d75c" + }, + { + "provider": "github", + } + ], "portable": { "artifactName": "terminus-${version}-portable.exe" }, @@ -88,9 +93,6 @@ "category": "public.app-category.video", "icon": "./build/mac/icon.icns", "artifactName": "terminus-${version}-macos.${ext}", - "publish": [ - "github" - ], "extendInfo": { "NSRequiresAquaSystemAppearance": false } @@ -101,10 +103,7 @@ "linux": { "category": "Utilities", "icon": "./build/icons", - "artifactName": "terminus-${version}-linux.${ext}", - "publish": [ - "github" - ] + "artifactName": "terminus-${version}-linux.${ext}" }, "deb": { "depends": [ diff --git a/scripts/build-windows.js b/scripts/build-windows.js index 5e741626..f55a0c08 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -4,7 +4,7 @@ const vars = require('./vars') builder({ dir: true, - win: ['squirrel', 'portable'], + win: ['nsis', 'portable'], config: { extraMetadata: { version: vars.version, diff --git a/terminus-core/src/services/updater.service.ts b/terminus-core/src/services/updater.service.ts index 97db3db3..51ee0803 100644 --- a/terminus-core/src/services/updater.service.ts +++ b/terminus-core/src/services/updater.service.ts @@ -1,5 +1,6 @@ import axios from 'axios' import * as os from 'os' + import { Injectable } from '@angular/core' import { Logger, LogService } from './log.service' import { ElectronService } from './electron.service' @@ -11,7 +12,7 @@ const UPDATES_URL = 'https://api.github.com/repos/eugeny/terminus/releases/lates export class UpdaterService { private logger: Logger private downloaded: Promise - private isSquirrel = true + private electronUpdaterAvailable = true private updateURL: string constructor ( @@ -20,38 +21,33 @@ export class UpdaterService { ) { this.logger = log.create('updater') - try { - electron.autoUpdater.setFeedURL(`https://terminus-updates.herokuapp.com/update/${os.platform()}/${electron.app.getVersion()}`) - } catch (e) { - this.isSquirrel = false - this.logger.info('Squirrel updater unavailable, falling back') - } + const autoUpdater = electron.remote.require('electron-updater').autoUpdater - this.electron.autoUpdater.on('update-available', () => { + autoUpdater.on('update-available', () => { this.logger.info('Update available') }) - this.electron.autoUpdater.once('update-not-available', () => { + autoUpdater.once('update-not-available', () => { this.logger.info('No updates') }) this.downloaded = new Promise(resolve => { - this.electron.autoUpdater.once('update-downloaded', () => resolve(true)) + autoUpdater.once('update-downloaded', () => resolve(true)) }) this.logger.debug('Checking for updates') - if (this.isSquirrel) { + if (this.electronUpdaterAvailable) { try { - this.electron.autoUpdater.checkForUpdates() + autoUpdater.checkForUpdates() } catch (e) { - this.isSquirrel = false - this.logger.info('Squirrel updater unavailable, falling back') + this.electronUpdaterAvailable = false + this.logger.info('Electron updater unavailable, falling back', e) } } } async check (): Promise { - if (!this.isSquirrel) { + if (!this.electronUpdaterAvailable) { this.logger.debug('Checking for updates') let response = await axios.get(UPDATES_URL) let data = response.data @@ -68,11 +64,11 @@ export class UpdaterService { } async update () { - if (!this.isSquirrel) { + if (!this.electronUpdaterAvailable) { this.electron.shell.openExternal(this.updateURL) } else { await this.downloaded - this.electron.autoUpdater.quitAndInstall() + autoUpdater.quitAndInstall() } } } diff --git a/yarn.lock b/yarn.lock index 5aeea15c..cb055f87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -297,6 +297,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" +ajv-keywords@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d" + ajv@^4.9.1: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -322,6 +326,15 @@ ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.9.2: + version "6.10.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" + 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" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -360,7 +373,7 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.2.1: +ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -385,41 +398,37 @@ 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.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.0.tgz#b4e5d5ee5bcf264818ab9830b95338f9f419de5d" +app-builder-bin@2.6.6: + version "2.6.6" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.6.tgz#904b0576a510047d03f63c8a02c38eef47871180" -app-builder-bin@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.1.tgz#aa97f82d341dfa6f1269d78955482d619cc613ed" - -app-builder-lib@20.38.4, app-builder-lib@~20.38.3: - version "20.38.4" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.38.4.tgz#71a515d01f4f2bd48a67495804f659a46c35303c" +app-builder-lib@20.40.2, app-builder-lib@~20.40.0: + version "20.40.2" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.40.2.tgz#b0f0c82ed6a59bf660d861531b063a99d3e2b442" dependencies: "7zip-bin" "~4.1.0" - app-builder-bin "2.6.1" + app-builder-bin "2.6.6" async-exit-hook "^2.0.1" - bluebird-lst "^1.0.6" - builder-util "9.6.1" - builder-util-runtime "8.1.0" + bluebird-lst "^1.0.7" + builder-util "9.7.1" + builder-util-runtime "8.2.1" chromium-pickle-js "^0.2.0" - debug "^4.1.0" + debug "^4.1.1" ejs "^2.6.1" electron-osx-sign "0.4.11" - electron-publish "20.38.3" - fs-extra-p "^7.0.0" + electron-publish "20.40.0" + fs-extra-p "^7.0.1" hosted-git-info "^2.7.1" is-ci "^2.0.0" - isbinaryfile "^3.0.3" - js-yaml "^3.12.0" - lazy-val "^1.0.3" + isbinaryfile "^4.0.0" + js-yaml "^3.13.0" + lazy-val "^1.0.4" minimatch "^3.0.4" - normalize-package-data "^2.4.0" + normalize-package-data "^2.5.0" plist "^3.0.1" - read-config-file "3.2.0" + read-config-file "3.2.2" sanitize-filename "^1.6.1" - semver "^5.6.0" + semver "^6.0.0" temp-file "^3.3.2" app-builder-lib@^20.28.4: @@ -754,6 +763,12 @@ bluebird-lst@^1.0.6: dependencies: bluebird "^3.5.2" +bluebird-lst@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.8.tgz#61b572e8b3eb57e0fff676a0e54566d93597e6a4" + dependencies: + bluebird "^3.5.4" + bluebird@^3.5.0, bluebird@^3.5.1, bluebird@~3.5.0: version "3.5.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a" @@ -762,6 +777,10 @@ bluebird@^3.5.2: version "3.5.3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" +bluebird@^3.5.4: + version "3.5.4" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714" + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -925,22 +944,22 @@ builder-util-runtime@4.4.1, builder-util-runtime@^4.4.1: fs-extra-p "^4.6.1" sax "^1.2.4" -builder-util-runtime@8.1.0, builder-util-runtime@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz#dd7fca995d48ceee7580b4851ca057566c94601e" +builder-util-runtime@8.2.1: + version "8.2.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz#2d16be6cb040b3654d84b76487256158e60b6e3b" dependencies: - bluebird-lst "^1.0.6" - debug "^4.1.0" - fs-extra-p "^7.0.0" + bluebird-lst "^1.0.7" + debug "^4.1.1" + fs-extra-p "^7.0.1" sax "^1.2.4" -builder-util-runtime@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.0.2.tgz#9d638a266ca3aa25ced1cff4df74c8fd97dd78cf" +builder-util-runtime@^8.2.1: + version "8.2.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.2.tgz#2b4b5c86cfb8b55b5a19ab90f1a39bdd6ac6f33e" dependencies: - bluebird-lst "^1.0.6" - debug "^4.1.0" - fs-extra-p "^7.0.0" + bluebird-lst "^1.0.7" + debug "^4.1.1" + fs-extra-p "^7.0.1" sax "^1.2.4" builder-util@6.1.3, builder-util@~6.1.3: @@ -962,38 +981,21 @@ builder-util@6.1.3, builder-util@~6.1.3: stat-mode "^0.2.2" temp-file "^3.1.3" -builder-util@9.6.1: - version "9.6.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.1.tgz#4625620b1535fe40dcacb178d24fe56d0d7c8957" +builder-util@9.7.1, builder-util@~9.7.1: + version "9.7.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.7.1.tgz#31234b48ac574eb1cd4b4eaa982c0480571eae7a" dependencies: "7zip-bin" "~4.1.0" - app-builder-bin "2.6.1" - bluebird-lst "^1.0.6" - builder-util-runtime "^8.1.0" - chalk "^2.4.1" - debug "^4.1.0" - fs-extra-p "^7.0.0" + app-builder-bin "2.6.6" + bluebird-lst "^1.0.7" + builder-util-runtime "^8.2.1" + chalk "^2.4.2" + debug "^4.1.1" + fs-extra-p "^7.0.1" is-ci "^2.0.0" - js-yaml "^3.12.0" - source-map-support "^0.5.9" - stat-mode "^0.2.2" - temp-file "^3.3.2" - -builder-util@~9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.0.tgz#ffcc0f713d0f4dfa6bcda2aee83b8fcb1f16f5b6" - dependencies: - "7zip-bin" "~4.1.0" - app-builder-bin "2.6.0" - bluebird-lst "^1.0.6" - builder-util-runtime "^8.0.2" - chalk "^2.4.1" - debug "^4.1.0" - fs-extra-p "^7.0.0" - is-ci "^1.2.1" - js-yaml "^3.12.0" - source-map-support "^0.5.9" - stat-mode "^0.2.2" + js-yaml "^3.13.0" + source-map-support "^0.5.11" + stat-mode "^0.3.0" temp-file "^3.3.2" builtin-modules@^1.0.0, builtin-modules@^1.1.1: @@ -1306,6 +1308,14 @@ cliui@^4.0.0: strip-ansi "^4.0.0" wrap-ansi "^2.0.0" +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + clone-deep@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713" @@ -1760,12 +1770,6 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87" - dependencies: - ms "^2.1.1" - debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" @@ -1881,16 +1885,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dmg-builder@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.5.3.tgz#95afe3deab33fd874f68d299bc71b481e94f5312" +dmg-builder@6.6.1: + version "6.6.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.6.1.tgz#d1761e36e624ebe3f6c57a8c4d728b95b51fb255" dependencies: - app-builder-lib "~20.38.3" - bluebird-lst "^1.0.6" - builder-util "~9.6.0" - fs-extra-p "^7.0.0" + app-builder-lib "~20.40.0" + bluebird-lst "^1.0.7" + builder-util "~9.7.1" + fs-extra-p "^7.0.1" iconv-lite "^0.4.24" - js-yaml "^3.12.0" + js-yaml "^3.13.0" parse-color "^1.0.0" sanitize-filename "^1.6.1" @@ -1927,7 +1931,7 @@ dotenv@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935" -dotenv@^6.1.0: +dotenv@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" @@ -1971,23 +1975,23 @@ electron-builder-squirrel-windows@^20.28.3: optionalDependencies: "7zip-bin" "~4.0.2" -electron-builder@^20.38.4: - version "20.38.4" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.38.4.tgz#67727529ffb87e7fdd78b3a84ea0d6c22bf04ec2" +electron-builder@^20.40.2: + version "20.40.2" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.40.2.tgz#434751bbb57be17513eb501848a52d2573a307bb" dependencies: - app-builder-lib "20.38.4" - bluebird-lst "^1.0.6" - builder-util "9.6.1" - builder-util-runtime "8.1.0" - chalk "^2.4.1" - dmg-builder "6.5.3" - fs-extra-p "^7.0.0" + app-builder-lib "20.40.2" + bluebird-lst "^1.0.7" + builder-util "9.7.1" + builder-util-runtime "8.2.1" + chalk "^2.4.2" + dmg-builder "6.6.1" + fs-extra-p "^7.0.1" is-ci "^2.0.0" - lazy-val "^1.0.3" - read-config-file "3.2.0" + lazy-val "^1.0.4" + read-config-file "3.2.2" sanitize-filename "^1.6.1" update-notifier "^2.5.0" - yargs "^12.0.5" + yargs "^13.2.2" electron-download@^4.1.0: version "4.1.1" @@ -2057,17 +2061,17 @@ electron-publish@20.28.3: lazy-val "^1.0.3" mime "^2.3.1" -electron-publish@20.38.3: - version "20.38.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.38.3.tgz#7c162904f728ba2bbf2640bc3620b65ce1061ce3" +electron-publish@20.40.0: + version "20.40.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.40.0.tgz#156eacd9b8bab563a3f8723e9b45214915a9681d" dependencies: - bluebird-lst "^1.0.6" - builder-util "~9.6.0" - builder-util-runtime "^8.1.0" - chalk "^2.4.1" - fs-extra-p "^7.0.0" - lazy-val "^1.0.3" - mime "^2.4.0" + bluebird-lst "^1.0.7" + builder-util "~9.7.1" + builder-util-runtime "^8.2.1" + chalk "^2.4.2" + fs-extra-p "^7.0.1" + lazy-val "^1.0.4" + mime "^2.4.1" electron-rebuild@^1.8.4: version "1.8.4" @@ -2107,6 +2111,10 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" @@ -2267,6 +2275,18 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" @@ -2493,6 +2513,13 @@ fs-extra-p@^7.0.0: bluebird-lst "^1.0.6" fs-extra "^7.0.0" +fs-extra-p@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.1.tgz#4eec0b6dfa150fa90f6ddd773b4fb1d55cad54e3" + dependencies: + bluebird-lst "^1.0.7" + fs-extra "^7.0.1" + fs-extra@0.26.7: version "0.26.7" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9" @@ -2624,6 +2651,10 @@ get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -2632,6 +2663,12 @@ get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" +get-stream@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + dependencies: + pump "^3.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -3085,7 +3122,7 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-ci@^1.0.10, is-ci@^1.2.0, is-ci@^1.2.1: +is-ci@^1.0.10, is-ci@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" dependencies: @@ -3269,6 +3306,10 @@ isbinaryfile@^3.0.2, isbinaryfile@^3.0.3: dependencies: buffer-alloc "^1.2.0" +isbinaryfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.0.tgz#07d1061c21598b41292b0f5c68add5eab601ad8e" + isemail@2.x.x: version "2.2.1" resolved "https://registry.yarnpkg.com/isemail/-/isemail-2.2.1.tgz#0353d3d9a62951080c262c2aa0a42b8ea8e9e2a6" @@ -3319,6 +3360,13 @@ js-yaml@^3.10.0, js-yaml@^3.12.0, js-yaml@^3.5.2, js-yaml@^3.7.0: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.12.1, js-yaml@^3.13.0: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@~3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" @@ -3456,6 +3504,10 @@ lazy-val@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc" +lazy-val@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" + lazystream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" @@ -3834,9 +3886,9 @@ mime@^2.0.3, mime@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" -mime@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6" +mime@^2.4.1: + version "2.4.3" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe" mimic-fn@^1.0.0: version "1.2.0" @@ -4184,6 +4236,15 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package- semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^2.0.0, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -4529,6 +4590,14 @@ os-locale@^3.0.0: lcid "^2.0.0" mem "^4.0.0" +os-locale@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" + dependencies: + execa "^1.0.0" + lcid "^2.0.0" + mem "^4.0.0" + os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -5374,19 +5443,19 @@ read-config-file@3.1.2: json5 "^1.0.1" lazy-val "^1.0.3" -read-config-file@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.0.tgz#50a2756a9a128ab9dcbe087e2724c512e3d0ccd1" +read-config-file@3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.2.tgz#57bbff7dd97caf237d0d625bd541c6d0efb4d067" dependencies: - ajv "^6.5.5" - ajv-keywords "^3.2.0" - bluebird-lst "^1.0.6" - dotenv "^6.1.0" + ajv "^6.9.2" + ajv-keywords "^3.4.0" + bluebird-lst "^1.0.7" + dotenv "^6.2.0" dotenv-expand "^4.2.0" - fs-extra-p "^7.0.0" - js-yaml "^3.12.0" + fs-extra-p "^7.0.1" + js-yaml "^3.12.1" json5 "^2.1.0" - lazy-val "^1.0.3" + lazy-val "^1.0.4" read-installed@~4.0.3: version "4.0.3" @@ -5645,6 +5714,10 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -5672,6 +5745,12 @@ resolve@^1.1.6, resolve@^1.1.7: dependencies: path-parse "^1.0.5" +resolve@^1.10.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" + dependencies: + path-parse "^1.0.6" + resolve@^1.3.2: version "1.9.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" @@ -5800,10 +5879,14 @@ semver-diff@^2.0.0: version "5.5.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" +semver@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65" + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -5998,6 +6081,13 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" +source-map-support@^0.5.11: + version "0.5.12" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-support@^0.5.3, source-map-support@^0.5.9, source-map-support@~0.5.6: version "0.5.9" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" @@ -6107,6 +6197,10 @@ stat-mode@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502" +stat-mode@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.3.0.tgz#69283b081f851582b328d2a4ace5f591ce52f54b" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -6174,6 +6268,14 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + string_decoder@^1.0.0, string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -6200,7 +6302,7 @@ strip-ansi@^4.0.0, strip-ansi@~4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.2.0: +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" dependencies: @@ -6992,6 +7094,14 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + wrappy@1, wrappy@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -7059,6 +7169,13 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f" + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" @@ -7105,6 +7222,22 @@ yargs@^12.0.5: y18n "^3.2.1 || ^4.0.0" yargs-parser "^11.1.1" +yargs@^13.2.2: + version "13.2.4" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + os-locale "^3.1.0" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.0" + yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"