diff --git a/.travis.yml b/.travis.yml index 3875add5..ab955e1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: node_js node_js: 11 +osx_image: xcode11 stages: - Build @@ -9,6 +10,7 @@ stages: jobs: include: - stage: 'Build' + if: branch = xxx os: linux before_install: - set -e @@ -16,6 +18,7 @@ jobs: - yarn script: - set -e + - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" # https://github.com/travis-ci/travis-ci/issues/8920 - scripts/build-native.js - yarn run build:typings - yarn run build diff --git a/README.md b/README.md index 8ad43baa..fefc0137 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

GitHub Travis (.org) - AppVeyor + AppVeyorAzure Pipelines

diff --git a/app/lib/window.ts b/app/lib/window.ts index d3fdb179..8966e931 100644 --- a/app/lib/window.ts +++ b/app/lib/window.ts @@ -51,16 +51,18 @@ export class Window { show: false, backgroundColor: '#00000000' } - Object.assign(bwOptions, this.windowBounds) - const closestDisplay = screen.getDisplayNearestPoint( {x: this.windowBounds.x, y: this.windowBounds.y} ) + if (this.windowBounds) { + Object.assign(bwOptions, this.windowBounds) + const closestDisplay = screen.getDisplayNearestPoint( {x: this.windowBounds.x, y: this.windowBounds.y} ) - const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height]; - const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height]; + const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height]; + const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height]; - if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) { - bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2; - bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2; + if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) { + bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2; + bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2; + } } if ((configData.appearance || {}).frame === 'native') { diff --git a/app/package.json b/app/package.json index b1a9c0db..e49ac8ca 100644 --- a/app/package.json +++ b/app/package.json @@ -22,22 +22,28 @@ "@angular/platform-browser-dynamic": "7.2.8", "@ng-bootstrap/ng-bootstrap": "^4.2.0", "devtron": "1.4.0", + "fontmanager-redux": "0.3.2", "electron-config": "2.0.0", - "electron-debug": "^3.0.0", + "electron-debug": "^3.0.1", "electron-is-dev": "1.1.0", "electron-updater": "^4.0.6", "js-yaml": "3.13.1", + "keytar": "^4.7.0", "mz": "^2.7.0", "ngx-toastr": "^10.0.4", + "node-pty": "^0.9.0-beta19", "npm": "~6.9.0", "path": "0.12.7", "rxjs": "^6.5.2", "rxjs-compat": "^6.5.2", - "yargs": "^13.2.4", + "yargs": "^13.3.0", "zone.js": "^0.8.29" }, "optionalDependencies": { + "@terminus-term/windows-process-tree": "^0.2.4", + "macos-native-processlist": "^1.0.1", "windows-blurbehind": "^1.0.1", + "windows-native-registry": "^1.0.14", "windows-swca": "^2.0.2" }, "devDependencies": { diff --git a/app/src/plugins.ts b/app/src/plugins.ts index 029d9f41..04905fd4 100644 --- a/app/src/plugins.ts +++ b/app/src/plugins.ts @@ -87,6 +87,14 @@ const originalRequire = (global as any).require return originalRequire.apply(this, arguments) } +const originalModuleRequire = nodeModule.prototype.require +nodeModule.prototype.require = function (query: string) { + if (cachedBuiltinModules[query]) { + return cachedBuiltinModules[query] + } + return originalModuleRequire.call(this, query) +} + export async function findPlugins (): Promise { const paths = nodeModule.globalPaths let foundPlugins: PluginInfo[] = [] @@ -168,6 +176,7 @@ export async function loadPlugins (foundPlugins: PluginInfo[], progress: Progres pluginModule['bootstrap'] = packageModule.bootstrap plugins.push(pluginModule) console.timeEnd(label) + await (new Promise(x => setTimeout(x, 50))) } catch (error) { console.error(`Could not load ${foundPlugin.name}:`, error) } diff --git a/app/yarn.lock b/app/yarn.lock index f38e8878..69a38fae 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -58,6 +58,13 @@ dependencies: tslib "^1.9.0" +"@terminus-term/windows-process-tree@^0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d" + integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg== + dependencies: + nan "^2.13.2" + "@types/mz@0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.32.tgz#e8248b4e41424c052edc1725dd33650c313a3659" @@ -248,6 +255,14 @@ bin-links@^1.1.2: graceful-fs "^4.1.11" write-file-atomic "^2.3.0" +bl@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" + integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA== + dependencies: + readable-stream "^2.3.5" + safe-buffer "^5.1.1" + block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" @@ -293,6 +308,24 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -377,7 +410,7 @@ chalk@^2.0.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chownr@^1.1.1: +chownr@^1.0.1, chownr@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== @@ -574,17 +607,6 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" @@ -645,6 +667,13 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -672,6 +701,11 @@ detect-indent@~5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -741,10 +775,10 @@ electron-config@2.0.0: dependencies: conf "^1.0.0" -electron-debug@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.0.0.tgz#55b7895df7f371558d0595d14dc2f8a738a41c81" - integrity sha512-rLrnn7L2soeIqwB6FIzn4+pj6RwT66XhUxadcrS3okjB3ezAv8LsolqrFrO2UrTrvchZgTCcEapV4J0UxlYWIw== +electron-debug@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-3.0.1.tgz#95b43b968ec7dbe96300034143e58b803a1e82dc" + integrity sha512-fo3mtDM4Bxxm3DW1I+XcJKfQlUlns4QGWyWGs8OrXK1bBZ2X9HeqYMntYBx78MYRcGY5S/ualuG4GhCnPlaZEA== dependencies: electron-is-dev "^1.1.0" electron-localshortcut "^3.1.0" @@ -855,18 +889,10 @@ 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" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - 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-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== extend@~3.0.2: version "3.0.2" @@ -925,6 +951,11 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" +fontmanager-redux@0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.2.tgz#e5c8d8dc8fda98629eaef4201a27df9e56a122f4" + integrity sha512-NWmTbYfDijrx8qLJ2+O2VgYKhdfsMy/ec+Qf2DGxoLJDZHaRhBKd2Eufh4fFmfJUAwhzrkIgbKJsNT/IYJDbaA== + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -955,6 +986,11 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + 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" @@ -1075,6 +1111,11 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + glob@^7.0.3, glob@^7.1.1, glob@^7.1.3: version "7.1.4" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" @@ -1267,11 +1308,6 @@ invert-kv@^1.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== - ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -1438,6 +1474,14 @@ 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== +keytar@^4.7.0: + version "4.11.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.11.0.tgz#891569045b287a0dabe69320e2381e059b02363f" + integrity sha512-cGn2xd4NY0yCBrU5zQ/lwIagP1UBOhUEemi6iSJU2gshN1RHkxHekSdLUji9IWNo5B1Va/iwXXWzGD2p8ziqfQ== + dependencies: + nan "2.14.0" + prebuild-install "5.3.0" + latest-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" @@ -1462,13 +1506,6 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== - dependencies: - invert-kv "^2.0.0" - libcipm@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-3.0.3.tgz#2e764effe0b90d458790dab3165794c804075ed3" @@ -1697,6 +1734,13 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +macos-native-processlist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/macos-native-processlist/-/macos-native-processlist-1.0.1.tgz#df48bbd114554bd69e7c2c76f976836ef8270ca8" + integrity sha512-Kn8EUW8xOM+06GFMp8I2fxIK8iSaR/fraAU5ddfnKVRn6/+dmQ5VGBSG4k6ce3u/EOQxd/7paBCAz17nXqH0cg== + dependencies: + nan "^2.13.2" + make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -1721,13 +1765,6 @@ make-fetch-happen@^4.0.1: socks-proxy-agent "^4.0.0" ssri "^6.0.0" -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - meant@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz#66044fea2f23230ec806fb515efea29c44d2115d" @@ -1740,15 +1777,6 @@ mem@^1.1.0: dependencies: mimic-fn "^1.0.0" -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - mime-db@1.40.0: version "1.40.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" @@ -1766,10 +1794,10 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -mimic-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-response@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== minimatch@^3.0.4: version "3.0.4" @@ -1867,6 +1895,16 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" +nan@2.14.0, nan@^2.13.2: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + +napi-build-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508" + integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA== + ngx-toastr@^10.0.4: version "10.0.4" resolved "https://registry.yarnpkg.com/ngx-toastr/-/ngx-toastr-10.0.4.tgz#cbc61b8d67d748194ea7a28542b01e39bf1fc6c2" @@ -1874,10 +1912,12 @@ ngx-toastr@^10.0.4: dependencies: tslib "^1.9.0" -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abi@^2.7.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.9.0.tgz#ae4075b298dab2d92dd1e22c48ccc7ffd7f06200" + integrity sha512-jmEOvv0eanWjhX8dX1pmjb7oJl1U1oR4FOh0b2GnvALwSYoOdU7sj+kLDSAyjo4pfC9aj/IxkloxdLJQhSSQBA== + dependencies: + semver "^5.4.1" node-fetch-npm@^2.0.2: version "2.0.2" @@ -1923,6 +1963,18 @@ node-gyp@^4.0.0: tar "^4.4.8" which "1" +node-pty@^0.9.0-beta19: + version "0.9.0-beta19" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta19.tgz#0fd381b2006f4665c4c2ee0509219e591842371a" + integrity sha512-MkKEvBnauGnzgXNr/oaoWQLVXm1gheIKZs4YQp8883ZiETmbEnpSvD0FU3bELcPXG5VFPRqIGsQJ4KUMBLzkPA== + dependencies: + nan "^2.13.2" + +noop-logger@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= + "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -2166,7 +2218,7 @@ npm@~6.9.0: worker-farm "^1.6.0" write-file-atomic "^2.4.2" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.1.2, npmlog@~4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.1, npmlog@^4.1.2, npmlog@~4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -2203,7 +2255,7 @@ opener@^1.5.1: resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed" integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA== -os-homedir@^1.0.0: +os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= @@ -2217,15 +2269,6 @@ os-locale@^2.0.0: lcid "^1.0.0" mem "^1.1.0" -os-locale@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== - dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" - os-tmpdir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -2239,21 +2282,11 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -2364,7 +2397,7 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2, path-is-inside@~1.0.2: resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= -path-key@^2.0.0, path-key@^2.0.1: +path-key@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= @@ -2399,6 +2432,28 @@ pkg-up@^2.0.0: dependencies: find-up "^2.1.0" +prebuild-install@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.0.tgz#58b4d8344e03590990931ee088dd5401b03004c8" + integrity sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.0" + mkdirp "^0.5.1" + napi-build-utils "^1.0.1" + node-abi "^2.7.0" + noop-logger "^0.1.1" + npmlog "^4.0.1" + os-homedir "^1.0.1" + pump "^2.0.1" + rc "^1.2.7" + simple-get "^2.7.0" + tar-fs "^1.13.0" + tunnel-agent "^0.6.0" + which-pm-runs "^1.0.0" + prepend-http@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" @@ -2461,7 +2516,15 @@ psl@^1.1.24: resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db" integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g== -pump@^2.0.0: +pump@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" + integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pump@^2.0.0, pump@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== @@ -2520,7 +2583,7 @@ qw@~1.0.1: resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4" integrity sha1-77/cdA+a0FQwRCassYNBLMi5ltQ= -rc@^1.0.1, rc@^1.1.6: +rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -2581,7 +2644,7 @@ read@1, read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== @@ -2789,6 +2852,20 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +simple-concat@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" + integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= + +simple-get@^2.7.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d" + integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw== + dependencies: + decompress-response "^3.3.0" + once "^1.3.1" + simple-concat "^1.0.0" + slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" @@ -3018,6 +3095,29 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +tar-fs@^1.13.0: + version "1.16.3" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509" + integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw== + dependencies: + chownr "^1.0.1" + mkdirp "^0.5.1" + pump "^1.0.0" + tar-stream "^1.1.2" + +tar-stream@^1.1.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" + integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== + dependencies: + bl "^1.0.0" + buffer-alloc "^1.2.0" + end-of-stream "^1.0.0" + fs-constants "^1.0.0" + readable-stream "^2.3.0" + to-buffer "^1.1.1" + xtend "^4.0.0" + tar@^2.0.0: version "2.2.2" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" @@ -3089,6 +3189,11 @@ tiny-relative-date@^1.3.0: resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A== +to-buffer@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" + integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" @@ -3253,6 +3358,11 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= + which@1, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -3279,6 +3389,13 @@ windows-blurbehind@^1.0.1: resolved "https://registry.yarnpkg.com/windows-blurbehind/-/windows-blurbehind-1.0.1.tgz#ff098713873304e38330b2c54cc41bb369b587b9" integrity sha512-1HzHfCiM1ayrbACJu5qE9zELV24uX/tINT6kxaZwLY3rtQAoeav6x9z7LFHWoLaGDN/sYbnK+9Vk0cz7fsk5HQ== +windows-native-registry@^1.0.14: + version "1.0.14" + resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.14.tgz#35c742b1278473127cbfb3b76e0db3d1ef626872" + integrity sha512-C2UgyZYJYcPFjkhfNuy09CUa6wXAti4x/tLPgzudDDrqpTyczcgnBEpiablmE6j7E7ownouWTqgVcHW8HJyqhw== + dependencies: + nan "^2.13.2" + windows-swca@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/windows-swca/-/windows-swca-2.0.2.tgz#66807012f73f5d3c0f0cb49bfa61be297aaabb50" @@ -3329,7 +3446,7 @@ xdg-basedir@^3.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= -xtend@~4.0.1: +xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= @@ -3354,10 +3471,10 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yargs-parser@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f" - integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA== +yargs-parser@^13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" + integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -3387,22 +3504,21 @@ yargs@^11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^13.2.4: - version "13.2.4" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" - integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== +yargs@^13.3.0: + version "13.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" + integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== 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-parser "^13.1.1" zone.js@^0.8.29: version "0.8.29" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33bbd268..bf9e910b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,66 +1,71 @@ trigger: -- master + tags: + include: + - v* + branches: + include: + - master variables: - group: Vars jobs: -- job: Windows - pool: - vmImage: 'vs2017-win2016' +# - job: Windows +# pool: +# vmImage: 'vs2017-win2016' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' +# steps: +# - task: NodeTool@0 +# inputs: +# versionSpec: '10.x' +# displayName: 'Install Node.js' - - script: yarn --network-timeout 100000 - displayName: 'Install dependencies' +# - script: yarn --network-timeout 100000 +# displayName: 'Install dependencies' - - script: node scripts/build-native.js - displayName: 'Rebuild native dependencies' +# - script: node scripts/build-native.js +# displayName: 'Rebuild native dependencies' - - script: yarn run build - displayName: 'Build' +# - script: yarn run build +# displayName: 'Build' - - script: node scripts/prepackage-plugins.js - displayName: 'Prepackage plugins' +# - script: node scripts/prepackage-plugins.js +# displayName: 'Prepackage plugins' - - script: node scripts/build-windows.js - displayName: 'Package' - env: - WIN_CSC_LINK: $(WIN_CSC_LINK) - WIN_CSC_KEY_PASSWORD: $(WIN_CSC_KEY_PASSWORD) - BT_TOKEN: $(BT_TOKEN) - GH_TOKEN: $(GH_TOKEN) - DEBUG: electron-builder +# - script: node scripts/build-windows.js +# displayName: 'Package' +# env: +# WIN_CSC_LINK: $(WIN_CSC_LINK) +# WIN_CSC_KEY_PASSWORD: $(WIN_CSC_KEY_PASSWORD) +# BT_TOKEN: $(BT_TOKEN) +# GH_TOKEN: $(GH_TOKEN) +# DEBUG: electron-builder - - task: CopyFiles@2 - inputs: - contents: 'dist\\*-setup.exe' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true +# - task: CopyFiles@2 +# inputs: +# contents: 'dist\\*-setup.exe' +# targetFolder: $(Build.ArtifactStagingDirectory) +# flattenFolders: true +# cleanTargetFolder: true - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: Windows - Installer - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') +# - task: PublishBuildArtifacts@1 +# inputs: +# pathtoPublish: $(Build.ArtifactStagingDirectory) +# artifactName: Windows - Installer +# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - - task: CopyFiles@2 - inputs: - contents: 'dist\\*-portable.exe' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true +# - task: CopyFiles@2 +# inputs: +# contents: 'dist\\*-portable.exe' +# targetFolder: $(Build.ArtifactStagingDirectory) +# flattenFolders: true +# cleanTargetFolder: true - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: Windows - Portable build - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') +# - task: PublishBuildArtifacts@1 +# inputs: +# pathtoPublish: $(Build.ArtifactStagingDirectory) +# artifactName: Windows - Portable build +# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - job: Linux pool: @@ -142,61 +147,61 @@ jobs: artifactName: Linux - tar.gz condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') -- job: macOS - pool: - vmImage: 'macOS-10.14' +# - job: macOS +# pool: +# vmImage: 'macOS-10.14' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' +# steps: +# - task: NodeTool@0 +# inputs: +# versionSpec: '10.x' +# displayName: 'Install Node.js' - - script: yarn - displayName: 'Install dependencies' +# - script: yarn +# displayName: 'Install dependencies' - - script: node scripts/build-native.js - displayName: 'Rebuild native dependencies' +# - script: node scripts/build-native.js +# displayName: 'Rebuild native dependencies' - - script: yarn run build - displayName: 'Build' +# - script: yarn run build +# displayName: 'Build' - - script: node scripts/prepackage-plugins.js - displayName: 'Prepackage plugins' +# - script: node scripts/prepackage-plugins.js +# displayName: 'Prepackage plugins' - - script: node scripts/build-macos.js - displayName: 'Package' - env: - CSC_LINK: $(CSC_LINK) - CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD) - BT_TOKEN: $(BT_TOKEN) - GH_TOKEN: $(GH_TOKEN) - APPSTORE_USERNAME: $(APPSTORE_USERNAME) - APPSTORE_PASSWORD: $(APPSTORE_PASSWORD) - DEBUG: electron-builder +# - script: node scripts/build-macos.js +# displayName: 'Package' +# env: +# CSC_LINK: $(CSC_LINK) +# CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD) +# BT_TOKEN: $(BT_TOKEN) +# GH_TOKEN: $(GH_TOKEN) +# APPSTORE_USERNAME: $(APPSTORE_USERNAME) +# APPSTORE_PASSWORD: $(APPSTORE_PASSWORD) +# DEBUG: electron-builder - - task: CopyFiles@2 - inputs: - contents: 'dist/*.dmg' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true +# - task: CopyFiles@2 +# inputs: +# contents: 'dist/*.dmg' +# targetFolder: $(Build.ArtifactStagingDirectory) +# flattenFolders: true +# cleanTargetFolder: true - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: macOS - DMG - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') +# - task: PublishBuildArtifacts@1 +# inputs: +# pathtoPublish: $(Build.ArtifactStagingDirectory) +# artifactName: macOS - DMG +# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') - - task: CopyFiles@2 - inputs: - contents: 'dist/*.zip' - targetFolder: $(Build.ArtifactStagingDirectory) - flattenFolders: true - cleanTargetFolder: true +# - task: CopyFiles@2 +# inputs: +# contents: 'dist/*.zip' +# targetFolder: $(Build.ArtifactStagingDirectory) +# flattenFolders: true +# cleanTargetFolder: true - - task: PublishBuildArtifacts@1 - inputs: - pathtoPublish: $(Build.ArtifactStagingDirectory) - artifactName: macOS - app.zip - condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') +# - task: PublishBuildArtifacts@1 +# inputs: +# pathtoPublish: $(Build.ArtifactStagingDirectory) +# artifactName: macOS - app.zip +# condition: eq(variables['Build.SourceBranch'], 'refs/heads/master') diff --git a/build/mac/afterSignHook.js b/build/mac/afterSignHook.js index 85189ff6..6cba2baa 100644 --- a/build/mac/afterSignHook.js +++ b/build/mac/afterSignHook.js @@ -7,7 +7,7 @@ const notarizer = require('electron-notarize') module.exports = async function (params) { console.log('env: ', process.env) // notarize the app on Mac OS only. - if (process.platform !== 'darwin' || process.env.BUILD_SOURCEBRANCH !== 'refs/heads/master') { + if (process.platform !== 'darwin' || process.env.BUILD_SOURCEBRANCH !== 'refs/heads/master' || process.env.TRAVIS_BRANCH && !process.env.TRAVIS_PULL_REQUEST_BRANCH) { return } console.log('afterSign hook triggered', params) diff --git a/package.json b/package.json index 910f6333..ddd90edf 100644 --- a/package.json +++ b/package.json @@ -5,18 +5,18 @@ "@types/electron-debug": "^2.1.0", "@types/fs-promise": "1.0.3", "@types/js-yaml": "^3.12.1", - "@types/node": "^12.0.10", + "@types/node": "^12.6.2", "@types/webpack-env": "1.13.9", - "@typescript-eslint/eslint-plugin": "^1.11.0", - "@typescript-eslint/parser": "^1.11.0", - "app-builder-lib": "^21.0.3", + "@typescript-eslint/eslint-plugin": "^1.12.0", + "@typescript-eslint/parser": "^1.12.0", + "app-builder-lib": "^21.0.8", "apply-loader": "2.0.0", "awesome-typescript-loader": "^5.0.0", "core-js": "^3.1.4", "cross-env": "5.2.0", "css-loader": "3.0.0", "electron": "^5.0.5", - "electron-builder": "^20.44.4", + "electron-builder": "^21.0.8", "electron-installer-snap": "^4.0.0", "electron-notarize": "^0.1.1", "electron-rebuild": "^1.8.5", @@ -26,7 +26,7 @@ "html-loader": "0.5.5", "json-loader": "0.5.7", "node-abi": "^2.9.0", - "node-gyp": "^5.0.0", + "node-gyp": "^5.0.2", "node-sass": "^4.12.0", "npmlog": "4.1.2", "npx": "^10.2.0", @@ -44,12 +44,13 @@ "style-loader": "^0.23.1", "svg-inline-loader": "^0.8.0", "to-string-loader": "1.1.5", + "tslib": "^1.10.0", "typedoc": "^0.14.2", - "typescript": "^3.5.2", + "typescript": "^3.5.3", "url-loader": "^2.0.0", "val-loader": "1.1.1", - "webpack": "^4.35.0", - "webpack-cli": "^3.3.5", + "webpack": "^4.35.2", + "webpack-cli": "^3.3.6", "yaml-loader": "0.5.0" }, "resolutions": { @@ -101,8 +102,8 @@ "NSRequiresAquaSystemAppearance": false } }, - "dmg": { - "artifactName": "terminus-${version}-macos.dmg" + "pkg": { + "artifactName": "terminus-${version}-macos.pkg" }, "linux": { "category": "Utilities", diff --git a/scripts/build-linux.js b/scripts/build-linux.js index 4ad7ff20..6b87f915 100755 --- a/scripts/build-linux.js +++ b/scripts/build-linux.js @@ -2,13 +2,15 @@ const builder = require('electron-builder').build const vars = require('./vars') +const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') + builder({ - dir: true, - linux: ['snap', 'deb', 'rpm', 'tar.gz'], - config: { - extraMetadata: { - version: vars.version, + dir: true, + linux: ['snap', 'deb', 'rpm', 'tar.gz'], + config: { + extraMetadata: { + version: vars.version, + }, }, - }, - publish: 'onTag', + publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/scripts/build-macos.js b/scripts/build-macos.js index 7e3aea09..d14c2975 100755 --- a/scripts/build-macos.js +++ b/scripts/build-macos.js @@ -2,13 +2,15 @@ const builder = require('electron-builder').build const vars = require('./vars') +const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') + builder({ - dir: true, - mac: ['dmg', 'zip'], - config: { - extraMetadata: { - version: vars.version, + dir: true, + mac: ['pkg', 'zip'], + config: { + extraMetadata: { + version: vars.version, + }, }, - }, - publish: 'onTag', + publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/scripts/build-windows.js b/scripts/build-windows.js index 4b0e6bc3..df741477 100755 --- a/scripts/build-windows.js +++ b/scripts/build-windows.js @@ -2,13 +2,15 @@ const builder = require('electron-builder').build const vars = require('./vars') +const isTag = (process.env.BUILD_SOURCEBRANCH || '').startsWith('refs/tags/') + builder({ - dir: true, - win: ['nsis', 'portable'], - config: { - extraMetadata: { - version: vars.version, + dir: true, + win: ['nsis', 'portable'], + config: { + extraMetadata: { + version: vars.version, + }, }, - }, - publish: 'onTag', + publish: isTag ? 'always' : 'onTag', }).catch(() => process.exit(1)) diff --git a/terminus-community-color-schemes/package.json b/terminus-community-color-schemes/package.json index ca31c987..29ad5fd4 100644 --- a/terminus-community-color-schemes/package.json +++ b/terminus-community-color-schemes/package.json @@ -1,6 +1,6 @@ { "name": "terminus-community-color-schemes", - "version": "1.0.73-c4-ga7d62b0", + "version": "1.0.83-nightly.0", "description": "Community color schemes for Terminus", "keywords": [ "terminus-builtin-plugin" @@ -17,12 +17,8 @@ "author": "Eugene Pankov", "license": "MIT", "peerDependencies": { - "@angular/core": "4.0.1", + "@angular/core": "^7", "terminus-core": "*", "terminus-terminal": "*" - }, - "devDependencies": { - "@types/node": "12.0.10", - "@types/webpack-env": "^1.13.0" } } diff --git a/terminus-community-color-schemes/webpack.config.js b/terminus-community-color-schemes/webpack.config.js index b407a9fb..4539a246 100644 --- a/terminus-community-color-schemes/webpack.config.js +++ b/terminus-community-color-schemes/webpack.config.js @@ -2,51 +2,57 @@ const path = require('path') const webpack = require('webpack') module.exports = { - target: 'node', - entry: 'src/index.ts', - devtool: 'source-map', - context: __dirname, - output: { - path: path.resolve(__dirname, 'dist'), - filename: 'index.js', - pathinfo: true, - libraryTarget: 'umd', - devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]', - }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', - optimization:{ - minimize: false, - }, - resolve: { - modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), - extensions: ['.ts', '.js'], - }, - module: { - rules: [ - { - test: /\.ts$/, - use: { - loader: 'awesome-typescript-loader', - options: { - configFileName: path.resolve(__dirname, 'tsconfig.json'), - typeRoots: [path.resolve(__dirname, 'node_modules/@types')], - paths: { - "terminus-*": [path.resolve(__dirname, '../terminus-*')], - "*": [path.resolve(__dirname, '../app/node_modules/*')], - } - } - } - }, - { test: /[\\\/]schemes[\\\/]/, use: "raw-loader" }, - ] - }, - externals: [ - /^rxjs/, - /^@angular/, - /^@ng-bootstrap/, - /^terminus-/, - ], - plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), - ], + target: 'node', + entry: 'src/index.ts', + context: __dirname, + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'index.js', + pathinfo: true, + libraryTarget: 'umd', + devtoolModuleFilenameTemplate: 'webpack-terminus-community-color-schemes:///[resource-path]', + }, + mode: process.env.TERMINUS_DEV ? 'development' : 'production', + optimization:{ + minimize: false, + }, + resolve: { + modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), + extensions: ['.ts', '.js'], + }, + module: { + rules: [ + { + test: /\.ts$/, + use: { + loader: 'awesome-typescript-loader', + options: { + configFileName: path.resolve(__dirname, 'tsconfig.json'), + typeRoots: [ + path.resolve(__dirname, 'node_modules/@types'), + path.resolve(__dirname, '../node_modules/@types'), + ], + paths: { + "terminus-*": [path.resolve(__dirname, '../terminus-*')], + "*": [path.resolve(__dirname, '../app/node_modules/*')], + }, + }, + }, + }, + { test: /[\\\/]schemes[\\\/]/, use: "raw-loader" }, + ], + }, + externals: [ + /^rxjs/, + /^@angular/, + /^@ng-bootstrap/, + /^terminus-/, + ], + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.SourceMapDevToolPlugin({ + exclude: [/node_modules/, /vendor/], + filename: '[file].map', + }), + ], } diff --git a/terminus-community-color-schemes/yarn.lock b/terminus-community-color-schemes/yarn.lock index e3c01f71..fb57ccd1 100644 --- a/terminus-community-color-schemes/yarn.lock +++ b/terminus-community-color-schemes/yarn.lock @@ -2,12 +2,3 @@ # yarn lockfile v1 -"@types/node@12.0.10": - version "12.0.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031" - integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ== - -"@types/webpack-env@^1.13.0": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" - integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== diff --git a/terminus-core/README.md b/terminus-core/README.md index 0bf5ef39..3c138e4b 100644 --- a/terminus-core/README.md +++ b/terminus-core/README.md @@ -1,7 +1,7 @@ Terminus Core Plugin -------------------- -See also: [Settings plugin API](./settings/), [Terminal plugin API](./settings/) +See also: [Settings plugin API](./settings/), [Terminal plugin API](./terminal/) * tabbed interface services * toolbar UI diff --git a/terminus-core/package.json b/terminus-core/package.json index 47aa624a..87b897fa 100644 --- a/terminus-core/package.json +++ b/terminus-core/package.json @@ -1,6 +1,6 @@ { "name": "terminus-core", - "version": "1.0.73-c4-ga7d62b0", + "version": "1.0.83-nightly.4", "description": "Terminus core", "keywords": [ "terminus-builtin-plugin" @@ -12,15 +12,13 @@ "watch": "webpack --progress --color --watch" }, "files": [ - "dist" + "typings" ], "author": "Eugene Pankov", "license": "MIT", "devDependencies": { "@types/js-yaml": "^3.9.0", - "@types/node": "^12.0.2", "@types/shell-escape": "^0.2.0", - "@types/webpack-env": "^1.13.0", "@types/winston": "^2.3.6", "axios": "^0.19.0", "bootstrap": "^4.1.3", @@ -35,17 +33,13 @@ "uuid": "^3.3.2", "winston": "^3.2.1" }, - "optionalDependencies": { - "windows-native-registry": "^1.0.14" - }, "peerDependencies": { - "@angular/animations": "4.0.1", - "@angular/common": "4.0.1", - "@angular/core": "4.0.1", - "@angular/forms": "4.0.1", - "@angular/platform-browser": "4.0.1", - "@angular/platform-browser-dynamic": "4.0.1", - "rxjs": "5.3.0", - "zone.js": "0.8.4" + "@angular/animations": "^7", + "@angular/common": "^7", + "@angular/core": "^7", + "@angular/forms": "^7", + "@angular/platform-browser": "^7", + "@angular/platform-browser-dynamic": "^7", + "rxjs": "^5" } } diff --git a/terminus-core/src/api/toolbarButtonProvider.ts b/terminus-core/src/api/toolbarButtonProvider.ts index c801ec1f..b2fa9f85 100644 --- a/terminus-core/src/api/toolbarButtonProvider.ts +++ b/terminus-core/src/api/toolbarButtonProvider.ts @@ -1,5 +1,3 @@ -import { SafeHtml } from '@angular/platform-browser' - /** * See [[ToolbarButtonProvider]] */ @@ -7,7 +5,7 @@ export interface ToolbarButton { /** * Raw SVG icon code */ - icon: SafeHtml + icon: string title: string diff --git a/terminus-core/src/components/appRoot.component.pug b/terminus-core/src/components/appRoot.component.pug index e9ac6404..d7d0c4e8 100644 --- a/terminus-core/src/components/appRoot.component.pug +++ b/terminus-core/src/components/appRoot.component.pug @@ -33,53 +33,53 @@ title-bar( .btn-group.background .d-flex( - *ngFor='let button of leftToolbarButtons', + *ngFor='let button of leftToolbarButtons', ngbDropdown, (openChange)='generateButtonSubmenu(button)', ) button.btn.btn-secondary.btn-tab-bar( [title]='button.title', (click)='button.click && button.click()', - [innerHTML]='button.icon', + [innerHTML]='sanitizeIcon(button.icon)', ngbDropdownToggle, ) div(*ngIf='button.submenu', ngbDropdownMenu) button.dropdown-item.d-flex.align-items-center( - *ngFor='let item of button.submenuItems', + *ngFor='let item of button.submenuItems', (click)='item.click()', ngbDropdownItem, - ) - .icon-wrapper([innerHTML]='item.icon') + ) + .icon-wrapper([innerHTML]='sanitizeIcon(item.icon)') .ml-3 {{item.title}} .drag-space.background([class.persistent]='config.store.appearance.frame == "thin" && hostApp.platform != Platform.macOS') .btn-group.background .d-flex( - *ngFor='let button of rightToolbarButtons', + *ngFor='let button of rightToolbarButtons', ngbDropdown, (openChange)='generateButtonSubmenu(button)', ) button.btn.btn-secondary.btn-tab-bar( [title]='button.title', (click)='button.click && button.click()', - [innerHTML]='button.icon', + [innerHTML]='sanitizeIcon(button.icon)', ngbDropdownToggle, ) div(*ngIf='button.submenu', ngbDropdownMenu) button.dropdown-item.d-flex.align-items-center( - *ngFor='let item of button.submenuItems', + *ngFor='let item of button.submenuItems', (click)='item.click()', ngbDropdownItem, - ) - .icon-wrapper([innerHTML]='item.icon') + ) + .icon-wrapper([innerHTML]='sanitizeIcon(item.icon)') .ml-3 {{item.title}} button.btn.btn-secondary.btn-tab-bar.btn-update( *ngIf='updatesAvailable', title='Update available', (click)='updateApp()', - [innerHTML]='updateIcon' + [innerHTML]='sanitizeIcon(updateIcon)' ) window-controls.background( diff --git a/terminus-core/src/components/appRoot.component.ts b/terminus-core/src/components/appRoot.component.ts index 47601368..4c25ec7c 100644 --- a/terminus-core/src/components/appRoot.component.ts +++ b/terminus-core/src/components/appRoot.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, Input, HostListener, HostBinding } from '@angular/core' import { trigger, style, animate, transition, state } from '@angular/animations' -import { DomSanitizer, SafeHtml } from '@angular/platform-browser' +import { DomSanitizer } from '@angular/platform-browser' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { ElectronService } from '../services/electron.service' @@ -62,11 +62,11 @@ export class AppRootComponent { @HostBinding('class.no-tabs') noTabs = true tabsDragging = false unsortedTabs: BaseTabComponent[] = [] - updateIcon: SafeHtml + updateIcon: string updatesAvailable = false private logger: Logger - constructor ( + private constructor ( private docking: DockingService, private electron: ElectronService, private hotkeys: HotkeysService, @@ -75,10 +75,10 @@ export class AppRootComponent { public hostApp: HostAppService, public config: ConfigService, public app: AppService, + private domSanitizer: DomSanitizer, @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[], log: LogService, ngbModal: NgbModal, - domSanitizer: DomSanitizer, _themes: ThemesService, ) { this.logger = log.create('main') @@ -87,7 +87,7 @@ export class AppRootComponent { this.leftToolbarButtons = this.getToolbarButtons(false) this.rightToolbarButtons = this.getToolbarButtons(true) - this.updateIcon = domSanitizer.bypassSecurityTrustHtml(require('../icons/gift.svg')), + this.updateIcon = require('../icons/gift.svg') this.hotkeys.matchedHotkey.subscribe((hotkey: string) => { if (hotkey.startsWith('tab-')) { @@ -239,6 +239,10 @@ export class AppRootComponent { } } + sanitizeIcon (icon: string): any { + return this.domSanitizer.bypassSecurityTrustHtml(icon || '') + } + private getToolbarButtons (aboveZero: boolean): ToolbarButton[] { let buttons: ToolbarButton[] = [] this.config.enabledServices(this.toolbarButtonProviders).forEach(provider => { diff --git a/terminus-core/src/components/splitTab.component.ts b/terminus-core/src/components/splitTab.component.ts index a13aaa3b..71582de2 100644 --- a/terminus-core/src/components/splitTab.component.ts +++ b/terminus-core/src/components/splitTab.component.ts @@ -189,7 +189,11 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes this.focused$.subscribe(() => { this.getAllTabs().forEach(x => x.emitFocused()) - this.focus(this.focusedTab) + if (this.focusedTab) { + this.focus(this.focusedTab) + } else { + this.focusAnyIn(this.root) + } }) this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred())) @@ -235,8 +239,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes await this.recoverContainer(this.root, this._recoveredState) this.layout() setImmediate(() => { - this.getAllTabs().forEach(x => x.emitFocused()) - this.focusAnyIn(this.root) + if (this.hasFocus) { + this.getAllTabs().forEach(x => x.emitFocused()) + this.focusAnyIn(this.root) + } }) } } diff --git a/terminus-core/src/components/startPage.component.pug b/terminus-core/src/components/startPage.component.pug index 256b9096..12368ae4 100644 --- a/terminus-core/src/components/startPage.component.pug +++ b/terminus-core/src/components/startPage.component.pug @@ -1,14 +1,14 @@ div .terminus-logo h1.terminus-title Terminus - sup α + sup α .list-group a.list-group-item.list-group-item-action.d-flex( *ngFor='let button of getButtons()', (click)='button.click()', ) - .d-flex.align-self-center([innerHTML]='button.icon') + .d-flex.align-self-center([innerHTML]='sanitizeIcon(button.icon)') span {{button.title}} footer.d-flex.align-items-center diff --git a/terminus-core/src/components/startPage.component.ts b/terminus-core/src/components/startPage.component.ts index 51e90dab..4a437433 100644 --- a/terminus-core/src/components/startPage.component.ts +++ b/terminus-core/src/components/startPage.component.ts @@ -1,4 +1,5 @@ import { Component, Inject } from '@angular/core' +import { DomSanitizer } from '@angular/platform-browser' import { ConfigService } from '../services/config.service' import { HomeBaseService } from '../services/homeBase.service' import { ToolbarButton, ToolbarButtonProvider } from '../api' @@ -14,6 +15,7 @@ export class StartPageComponent { constructor ( private config: ConfigService, + private domSanitizer: DomSanitizer, public homeBase: HomeBaseService, @Inject(ToolbarButtonProvider) private toolbarButtonProviders: ToolbarButtonProvider[], ) { @@ -26,4 +28,8 @@ export class StartPageComponent { .filter(x => !!x.click) .sort((a: ToolbarButton, b: ToolbarButton) => (a.weight || 0) - (b.weight || 0)) } + + sanitizeIcon (icon: string): any { + return this.domSanitizer.bypassSecurityTrustHtml(icon || '') + } } diff --git a/terminus-core/src/components/tabHeader.component.ts b/terminus-core/src/components/tabHeader.component.ts index 0aabb01b..4abe4c0c 100644 --- a/terminus-core/src/components/tabHeader.component.ts +++ b/terminus-core/src/components/tabHeader.component.ts @@ -9,6 +9,11 @@ import { ElectronService } from '../services/electron.service' import { AppService } from '../services/app.service' import { HostAppService, Platform } from '../services/hostApp.service' +/** @hidden */ +export interface ISortableComponent { + setDragHandle (_: HTMLElement) +} + /** @hidden */ @Component({ selector: 'tab-header', @@ -23,13 +28,13 @@ export class TabHeaderComponent { @Input() progress: number @ViewChild('handle') handle: ElementRef - constructor ( + private constructor ( public app: AppService, private electron: ElectronService, private hostApp: HostAppService, private ngbModal: NgbModal, private hotkeys: HotkeysService, - private parentDraggable: SortableComponent, + @Inject(SortableComponent) private parentDraggable: ISortableComponent, @Optional() @Inject(TabContextMenuItemProvider) protected contextMenuProviders: TabContextMenuItemProvider[], ) { this.hotkeys.matchedHotkey.subscribe((hotkey) => { diff --git a/terminus-core/src/configDefaults.yaml b/terminus-core/src/configDefaults.yaml index 332eee95..71fb6b58 100644 --- a/terminus-core/src/configDefaults.yaml +++ b/terminus-core/src/configDefaults.yaml @@ -1,7 +1,7 @@ appearance: dock: off dockScreen: current - dockFill: 50 + dockFill: 0.5 tabsLocation: top cycleTabs: true theme: Standard diff --git a/terminus-core/src/index.ts b/terminus-core/src/index.ts index 4fb42fd0..fddb64c9 100644 --- a/terminus-core/src/index.ts +++ b/terminus-core/src/index.ts @@ -69,7 +69,7 @@ const PROVIDERS = [ DndModule.forRoot(), ], declarations: [ - AppRootComponent, + AppRootComponent as any, CheckboxComponent, StartPageComponent, TabBodyComponent, diff --git a/terminus-core/src/services/docking.service.ts b/terminus-core/src/services/docking.service.ts index 20f368db..a4a0289f 100644 --- a/terminus-core/src/services/docking.service.ts +++ b/terminus-core/src/services/docking.service.ts @@ -30,7 +30,8 @@ export class DockingService { } const newBounds: Bounds = { x: 0, y: 0, width: 0, height: 0 } - const fill = this.config.store.appearance.dockFill + + const fill = this.config.store.appearance.dockFill <= 1 ? this.config.store.appearance.dockFill : 1; const [minWidth, minHeight] = this.hostApp.getWindow().getMinimumSize() if (dockSide === 'left' || dockSide === 'right') { @@ -63,15 +64,15 @@ export class DockingService { } getScreens () { - return this.electron.screen.getAllDisplays().map((display, index) => { + const primaryDisplayID = this.electron.screen.getPrimaryDisplay().id; + return this.electron.screen.getAllDisplays().sort((a,b) => ( + a.bounds.x === b.bounds.x ? a.bounds.y - b.bounds.y : a.bounds.x - b.bounds.x + )).map((display,index) => { return { id: display.id, - name: [ - 'Primary display', - 'Secondary display', - ][index] || `Display ${index + 1}`, + name: display.id === primaryDisplayID ? 'Primary Display' : `Display ${index +1}`, } - }) + }); } private repositionWindow () { diff --git a/terminus-core/src/services/hostApp.service.ts b/terminus-core/src/services/hostApp.service.ts index b50da1e9..05bf11c6 100644 --- a/terminus-core/src/services/hostApp.service.ts +++ b/terminus-core/src/services/hostApp.service.ts @@ -87,8 +87,7 @@ export class HostAppService { get displayMetricsChanged$ (): Observable { return this.displayMetricsChanged } - /** @hidden */ - constructor ( + private constructor ( private zone: NgZone, private electron: ElectronService, log: LogService, diff --git a/terminus-core/src/services/hotkeys.service.ts b/terminus-core/src/services/hotkeys.service.ts index 16b01417..b2e7120c 100644 --- a/terminus-core/src/services/hotkeys.service.ts +++ b/terminus-core/src/services/hotkeys.service.ts @@ -21,13 +21,12 @@ interface EventBufferEntry { export class HotkeysService { key = new EventEmitter() matchedHotkey = new EventEmitter() - globalHotkey = new EventEmitter() + globalHotkey = new EventEmitter() private currentKeystrokes: EventBufferEntry[] = [] private disabledLevel = 0 private hotkeyDescriptions: HotkeyDescription[] = [] - /** @hidden */ - constructor ( + private constructor ( private zone: NgZone, private electron: ElectronService, private config: ConfigService, diff --git a/terminus-core/webpack.config.js b/terminus-core/webpack.config.js index 294ac4e1..bb256113 100644 --- a/terminus-core/webpack.config.js +++ b/terminus-core/webpack.config.js @@ -2,61 +2,67 @@ const path = require('path') const webpack = require('webpack') module.exports = { - target: 'node', - entry: 'src/index.ts', - devtool: 'source-map', - context: __dirname, - mode: 'development', - output: { - path: path.resolve(__dirname, 'dist'), - filename: 'index.js', - pathinfo: true, - libraryTarget: 'umd', - devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]', - }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', - optimization:{ - minimize: false, - }, - resolve: { - modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), - extensions: ['.ts', '.js'], - }, - module: { - rules: [ - { - test: /\.ts$/, - use: { - loader: 'awesome-typescript-loader', - options: { - configFileName: path.resolve(__dirname, 'tsconfig.json'), - typeRoots: [path.resolve(__dirname, 'node_modules/@types')], - paths: { - "terminus-*": [path.resolve(__dirname, '../terminus-*')], - "*": [path.resolve(__dirname, '../app/node_modules/*')], - } - } - } - }, - { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, - { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, - { test: /\.css$/, use: ['to-string-loader', 'css-loader'], include: /component\.css/ }, - { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ }, - { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] }, - { test: /\.svg/, use: ['svg-inline-loader'] }, - ] - }, - externals: [ - 'electron', - 'fs', - 'os', - 'path', - 'windows-native-registry', - /^rxjs/, - /^@angular/, - /^@ng-bootstrap/, - ], - plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), - ], + target: 'node', + entry: 'src/index.ts', + context: __dirname, + mode: 'development', + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'index.js', + pathinfo: true, + libraryTarget: 'umd', + devtoolModuleFilenameTemplate: 'webpack-terminus-core:///[resource-path]', + }, + mode: process.env.TERMINUS_DEV ? 'development' : 'production', + optimization:{ + minimize: false, + }, + resolve: { + modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), + extensions: ['.ts', '.js'], + }, + module: { + rules: [ + { + test: /\.ts$/, + use: { + loader: 'awesome-typescript-loader', + options: { + configFileName: path.resolve(__dirname, 'tsconfig.json'), + typeRoots: [ + path.resolve(__dirname, 'node_modules/@types'), + path.resolve(__dirname, '../node_modules/@types'), + ], + paths: { + "terminus-*": [path.resolve(__dirname, '../terminus-*')], + "*": [path.resolve(__dirname, '../app/node_modules/*')], + }, + }, + }, + }, + { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, + { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, + { test: /\.css$/, use: ['to-string-loader', 'css-loader'], include: /component\.css/ }, + { test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: /component\.css/ }, + { test: /\.yaml$/, use: ['json-loader', 'yaml-loader'] }, + { test: /\.svg/, use: ['svg-inline-loader'] }, + ], + }, + externals: [ + 'electron', + 'fs', + 'os', + 'path', + 'windows-native-registry', + /^rxjs/, + /^@angular/, + /^@ng-bootstrap/, + ], + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.SourceMapDevToolPlugin({ + exclude: [/node_modules/, /vendor/], + filename: '[file].map', + }), + ], } diff --git a/terminus-core/yarn.lock b/terminus-core/yarn.lock index 04b1567c..9ece1cb7 100644 --- a/terminus-core/yarn.lock +++ b/terminus-core/yarn.lock @@ -7,21 +7,11 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.1.tgz#5c6f4a1eabca84792fbd916f0cb40847f123c656" integrity sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA== -"@types/node@^12.0.2": - version "12.0.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031" - integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ== - "@types/shell-escape@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@types/shell-escape/-/shell-escape-0.2.0.tgz#cd2f0df814388599dd07196dcc510de2669d1ed2" integrity sha512-7kUdtJtUylvyISJbe9FMcvMTjRdP0EvNDO1WbT0lT22k/IPBiPRTpmWaKu5HTWLCGLQRWVHrzVHZktTDvvR23g== -"@types/webpack-env@^1.13.0": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" - integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== - "@types/winston@^2.3.6": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/winston/-/winston-2.4.4.tgz#48cc744b7b42fad74b9a2e8490e0112bd9a3d08d" @@ -335,9 +325,9 @@ lodash.isequal@^4.5.0: integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= lodash@^4.17.11: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" - integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== + version "4.17.14" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" + integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== logform@^2.1.1: version "2.1.2" @@ -367,11 +357,6 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -nan@^2.13.2: - version "2.14.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" - integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== - ng2-dnd@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/ng2-dnd/-/ng2-dnd-5.0.2.tgz#862278ac7dedfa14f5783bbf34014d5d73dfefb4" @@ -521,13 +506,6 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -windows-native-registry@^1.0.14: - version "1.0.14" - resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.14.tgz#35c742b1278473127cbfb3b76e0db3d1ef626872" - integrity sha512-C2UgyZYJYcPFjkhfNuy09CUa6wXAti4x/tLPgzudDDrqpTyczcgnBEpiablmE6j7E7ownouWTqgVcHW8HJyqhw== - dependencies: - nan "^2.13.2" - winston-transport@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66" diff --git a/terminus-plugin-manager/package.json b/terminus-plugin-manager/package.json index 40aeba54..c80eb74e 100644 --- a/terminus-plugin-manager/package.json +++ b/terminus-plugin-manager/package.json @@ -1,6 +1,6 @@ { "name": "terminus-plugin-manager", - "version": "1.0.73-c4-ga7d62b0", + "version": "1.0.83-nightly.0", "description": "Terminus' plugin manager", "keywords": [ "terminus-builtin-plugin" @@ -18,22 +18,19 @@ "license": "MIT", "devDependencies": { "@types/mz": "0.0.32", - "@types/node": "12.0.10", "@types/semver": "^6.0.0", - "@types/webpack-env": "1.13.9", "axios": "^0.19.0", - "css-loader": "^0.28.0", "mz": "^2.6.0", "ngx-pipes": "^1.6.1", "semver": "^6.1.0" }, "peerDependencies": { - "@angular/common": "4.0.1", - "@angular/core": "4.0.1", - "@angular/forms": "4.0.1", - "@angular/platform-browser": "4.0.1", - "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22", - "rxjs": "5.3.0", + "@angular/common": "^7", + "@angular/core": "^7", + "@angular/forms": "^7", + "@angular/platform-browser": "^7", + "@ng-bootstrap/ng-bootstrap": "^1", + "rxjs": "^5", "terminus-core": "*", "terminus-settings": "*" } diff --git a/terminus-plugin-manager/webpack.config.js b/terminus-plugin-manager/webpack.config.js index a15b8010..faa7a140 100644 --- a/terminus-plugin-manager/webpack.config.js +++ b/terminus-plugin-manager/webpack.config.js @@ -2,56 +2,62 @@ const path = require('path') const webpack = require('webpack') module.exports = { - target: 'node', - entry: 'src/index.ts', - devtool: 'source-map', - context: __dirname, - output: { - path: path.resolve(__dirname, 'dist'), - filename: 'index.js', - pathinfo: true, - libraryTarget: 'umd', - devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]', - }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', - optimization:{ - minimize: false, - }, - resolve: { - modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), - extensions: ['.ts', '.js'], - }, - module: { - rules: [ - { - test: /\.ts$/, - use: { - loader: 'awesome-typescript-loader', - query: { - configFileName: path.resolve(__dirname, 'tsconfig.json'), - typeRoots: [path.resolve(__dirname, 'node_modules/@types')], - paths: { - "terminus-*": [path.resolve(__dirname, '../terminus-*')], - "*": [path.resolve(__dirname, '../app/node_modules/*')], - } - } - } - }, - { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, - { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, - ] - }, - externals: [ - 'fs', - 'net', - 'npm', - 'path', - /^rxjs/, - /^@angular/, - /^@ng-bootstrap/, - /^terminus-/, - ], - plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), - ], + target: 'node', + entry: 'src/index.ts', + context: __dirname, + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'index.js', + pathinfo: true, + libraryTarget: 'umd', + devtoolModuleFilenameTemplate: 'webpack-terminus-plugin-manager:///[resource-path]', + }, + mode: process.env.TERMINUS_DEV ? 'development' : 'production', + optimization:{ + minimize: false, + }, + resolve: { + modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), + extensions: ['.ts', '.js'], + }, + module: { + rules: [ + { + test: /\.ts$/, + use: { + loader: 'awesome-typescript-loader', + query: { + configFileName: path.resolve(__dirname, 'tsconfig.json'), + typeRoots: [ + path.resolve(__dirname, 'node_modules/@types'), + path.resolve(__dirname, '../node_modules/@types'), + ], + paths: { + "terminus-*": [path.resolve(__dirname, '../terminus-*')], + "*": [path.resolve(__dirname, '../app/node_modules/*')], + }, + }, + }, + }, + { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, + { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, + ], + }, + externals: [ + 'fs', + 'net', + 'npm', + 'path', + /^rxjs/, + /^@angular/, + /^@ng-bootstrap/, + /^terminus-/, + ], + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.SourceMapDevToolPlugin({ + exclude: [/node_modules/, /vendor/], + filename: '[file].map', + }), + ], } diff --git a/terminus-plugin-manager/yarn.lock b/terminus-plugin-manager/yarn.lock index 04a3f498..c813ab8e 100644 --- a/terminus-plugin-manager/yarn.lock +++ b/terminus-plugin-manager/yarn.lock @@ -9,7 +9,7 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@12.0.10": +"@types/node@*": version "12.0.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031" integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ== @@ -19,57 +19,11 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.1.tgz#a984b405c702fa5a7ec6abc56b37f2ba35ef5af6" integrity sha512-ffCdcrEE5h8DqVxinQjo+2d1q+FV5z7iNtPofw3JsrltSoSVlOGaW0rY8XxtO9XukdTn8TaCGWmk2VFGhI70mg== -"@types/webpack-env@1.13.9": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" - integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== - -alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - -ansi-styles@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" - integrity sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== - dependencies: - color-convert "^1.9.0" - any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= -argparse@^1.0.7: - version "1.0.9" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" - integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= - dependencies: - sprintf-js "~1.0.2" - -autoprefixer@^6.3.1: - version "6.7.7" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" - integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ= - dependencies: - browserslist "^1.7.6" - caniuse-db "^1.0.30000634" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^5.2.16" - postcss-value-parser "^3.2.3" - axios@^0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8" @@ -78,214 +32,6 @@ axios@^0.19.0: follow-redirects "1.5.10" is-buffer "^2.0.2" -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -balanced-match@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" - integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg= - -big.js@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978" - integrity sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg= - -browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: - version "1.7.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" - integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk= - dependencies: - caniuse-db "^1.0.30000639" - electron-to-chromium "^1.2.7" - -caniuse-api@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c" - integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw= - dependencies: - browserslist "^1.3.6" - caniuse-db "^1.0.30000529" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000726" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000726.tgz#9bb742f8d026a62df873bc03c06843d2255b60d7" - integrity sha1-m7dC+NAmpi34c7wDwGhD0iVbYNc= - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" - integrity sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ== - dependencies: - ansi-styles "^3.1.0" - escape-string-regexp "^1.0.5" - supports-color "^4.0.0" - -clap@^1.0.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857" - integrity sha1-WckP4+E3EEdG/xlGmiemNP9oyFc= - dependencies: - chalk "^1.1.3" - -clone@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" - integrity sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk= - -coa@~1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd" - integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0= - dependencies: - q "^1.1.2" - -color-convert@^1.3.0, color-convert@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a" - integrity sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o= - dependencies: - color-name "^1.1.1" - -color-name@^1.0.0, color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-string@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" - integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE= - dependencies: - color-name "^1.0.0" - -color@^0.11.0: - version "0.11.4" - resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" - integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q= - dependencies: - clone "^1.0.2" - color-convert "^1.3.0" - color-string "^0.3.0" - -colormin@^1.0.5: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133" - integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM= - dependencies: - color "^0.11.0" - css-color-names "0.0.4" - has "^1.0.1" - -colors@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= - -css-color-names@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" - integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= - -css-loader@^0.28.0: - version "0.28.11" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.11.tgz#c3f9864a700be2711bb5a2462b2389b1a392dab7" - integrity sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg== - dependencies: - babel-code-frame "^6.26.0" - css-selector-tokenizer "^0.7.0" - cssnano "^3.10.0" - icss-utils "^2.1.0" - loader-utils "^1.0.2" - lodash.camelcase "^4.3.0" - object-assign "^4.1.1" - postcss "^5.0.6" - postcss-modules-extract-imports "^1.2.0" - postcss-modules-local-by-default "^1.2.0" - postcss-modules-scope "^1.1.0" - postcss-modules-values "^1.3.0" - postcss-value-parser "^3.3.0" - source-list-map "^2.0.0" - -css-selector-tokenizer@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" - integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY= - dependencies: - cssesc "^0.1.0" - fastparse "^1.1.1" - regexpu-core "^1.0.0" - -cssesc@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" - integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q= - -cssnano@^3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" - integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg= - dependencies: - autoprefixer "^6.3.1" - decamelize "^1.1.2" - defined "^1.0.0" - has "^1.0.1" - object-assign "^4.0.1" - postcss "^5.0.14" - postcss-calc "^5.2.0" - postcss-colormin "^2.1.8" - postcss-convert-values "^2.3.4" - postcss-discard-comments "^2.0.4" - postcss-discard-duplicates "^2.0.1" - postcss-discard-empty "^2.0.1" - postcss-discard-overridden "^0.1.1" - postcss-discard-unused "^2.2.1" - postcss-filter-plugins "^2.0.0" - postcss-merge-idents "^2.1.5" - postcss-merge-longhand "^2.0.1" - postcss-merge-rules "^2.0.3" - postcss-minify-font-values "^1.0.2" - postcss-minify-gradients "^1.0.1" - postcss-minify-params "^1.0.4" - postcss-minify-selectors "^2.0.4" - postcss-normalize-charset "^1.1.0" - postcss-normalize-url "^3.0.7" - postcss-ordered-values "^2.1.0" - postcss-reduce-idents "^2.2.2" - postcss-reduce-initial "^1.0.0" - postcss-reduce-transforms "^1.0.3" - postcss-svgo "^2.1.1" - postcss-unique-selectors "^2.0.2" - postcss-value-parser "^3.2.3" - postcss-zindex "^2.0.1" - -csso@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85" - integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U= - dependencies: - clap "^1.0.9" - source-map "^0.5.3" - debug@=3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" @@ -293,51 +39,6 @@ debug@=3.1.0: dependencies: ms "2.0.0" -decamelize@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -defined@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - -electron-to-chromium@^1.2.7: - version "1.3.21" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2" - integrity sha1-qWfr3P6O0Ag/wkTRiUAiqOgRPqI= - -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -esprima@^2.6.0: - version "2.7.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" - integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= - -fastparse@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" - integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg= - -flatten@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" - integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I= - follow-redirects@1.5.10: version "1.5.10" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" @@ -345,153 +46,11 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" -function-bind@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - -has-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" - integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= - -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= - -has@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" - integrity sha1-hGFzP1OLCDfJNh45qauelwTcLyg= - dependencies: - function-bind "^1.0.2" - -html-comment-regex@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" - integrity sha1-ZouTd26q5V696POtRkswekljYl4= - -icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" - integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= - -icss-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962" - integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI= - dependencies: - postcss "^6.0.1" - -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - -is-absolute-url@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" - integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= - is-buffer@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== -is-plain-obj@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= - -is-svg@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" - integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk= - dependencies: - html-comment-regex "^1.1.0" - -js-base64@^2.1.9: - version "2.1.9" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" - integrity sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4= - -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= - -js-yaml@~3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" - integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A= - dependencies: - argparse "^1.0.7" - esprima "^2.6.0" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -loader-utils@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" - integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0= - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= - -macaddress@^0.2.8: - version "0.2.9" - resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.9.tgz#3579b8b9acd5b96b4553abf0f394185a86813cb3" - integrity sha512-k4F1JUof6cQXxNFzx3thLby4oJzXTXQueAOOts944Vqizn+Rjc2QNFenT9FJSLU1CH3PmrHRSyZs2E+Cqw+P2w== - -math-expression-evaluator@^1.2.14: - version "1.2.17" - resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" - integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw= - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -mkdirp@~0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -511,447 +70,16 @@ ngx-pipes@^1.6.1: resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b" integrity sha512-mRV0xOZDd6/Jlvti4W0pDepZRIHLHd3kZ6ZzdqyGCU0dxbKVWWLTR1jlNlxN1ruMk8eO0Y8lNh6a1bEW7dJP1w== -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= - -normalize-url@^1.4.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" - integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= - dependencies: - object-assign "^4.0.1" - prepend-http "^1.0.0" - query-string "^4.1.0" - sort-keys "^1.0.0" - -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -postcss-calc@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e" - integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14= - dependencies: - postcss "^5.0.2" - postcss-message-helpers "^2.0.0" - reduce-css-calc "^1.2.6" - -postcss-colormin@^2.1.8: - version "2.2.2" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b" - integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks= - dependencies: - colormin "^1.0.5" - postcss "^5.0.13" - postcss-value-parser "^3.2.3" - -postcss-convert-values@^2.3.4: - version "2.6.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d" - integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0= - dependencies: - postcss "^5.0.11" - postcss-value-parser "^3.1.2" - -postcss-discard-comments@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d" - integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0= - dependencies: - postcss "^5.0.14" - -postcss-discard-duplicates@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932" - integrity sha1-uavye4isGIFYpesSq8riAmO5GTI= - dependencies: - postcss "^5.0.4" - -postcss-discard-empty@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5" - integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU= - dependencies: - postcss "^5.0.14" - -postcss-discard-overridden@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58" - integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg= - dependencies: - postcss "^5.0.16" - -postcss-discard-unused@^2.2.1: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433" - integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM= - dependencies: - postcss "^5.0.14" - uniqs "^2.0.0" - -postcss-filter-plugins@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c" - integrity sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew= - dependencies: - postcss "^5.0.4" - uniqid "^4.0.0" - -postcss-merge-idents@^2.1.5: - version "2.1.7" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" - integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA= - dependencies: - has "^1.0.1" - postcss "^5.0.10" - postcss-value-parser "^3.1.1" - -postcss-merge-longhand@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658" - integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg= - dependencies: - postcss "^5.0.4" - -postcss-merge-rules@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721" - integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE= - dependencies: - browserslist "^1.5.2" - caniuse-api "^1.5.2" - postcss "^5.0.4" - postcss-selector-parser "^2.2.2" - vendors "^1.0.0" - -postcss-message-helpers@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e" - integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4= - -postcss-minify-font-values@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69" - integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k= - dependencies: - object-assign "^4.0.1" - postcss "^5.0.4" - postcss-value-parser "^3.0.2" - -postcss-minify-gradients@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1" - integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE= - dependencies: - postcss "^5.0.12" - postcss-value-parser "^3.3.0" - -postcss-minify-params@^1.0.4: - version "1.2.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3" - integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM= - dependencies: - alphanum-sort "^1.0.1" - postcss "^5.0.2" - postcss-value-parser "^3.0.2" - uniqs "^2.0.0" - -postcss-minify-selectors@^2.0.4: - version "2.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf" - integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8= - dependencies: - alphanum-sort "^1.0.2" - has "^1.0.1" - postcss "^5.0.14" - postcss-selector-parser "^2.0.0" - -postcss-modules-extract-imports@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a" - integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw== - dependencies: - postcss "^6.0.1" - -postcss-modules-local-by-default@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" - integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk= - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-scope@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" - integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A= - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-values@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" - integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA= - dependencies: - icss-replace-symbols "^1.1.0" - postcss "^6.0.1" - -postcss-normalize-charset@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1" - integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E= - dependencies: - postcss "^5.0.5" - -postcss-normalize-url@^3.0.7: - version "3.0.8" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222" - integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI= - dependencies: - is-absolute-url "^2.0.0" - normalize-url "^1.4.0" - postcss "^5.0.14" - postcss-value-parser "^3.2.3" - -postcss-ordered-values@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d" - integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0= - dependencies: - postcss "^5.0.4" - postcss-value-parser "^3.0.1" - -postcss-reduce-idents@^2.2.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3" - integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM= - dependencies: - postcss "^5.0.4" - postcss-value-parser "^3.0.2" - -postcss-reduce-initial@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea" - integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo= - dependencies: - postcss "^5.0.4" - -postcss-reduce-transforms@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1" - integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE= - dependencies: - has "^1.0.1" - postcss "^5.0.8" - postcss-value-parser "^3.0.1" - -postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90" - integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A= - dependencies: - flatten "^1.0.2" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-svgo@^2.1.1: - version "2.1.6" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" - integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0= - dependencies: - is-svg "^2.0.0" - postcss "^5.0.14" - postcss-value-parser "^3.2.3" - svgo "^0.7.0" - -postcss-unique-selectors@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d" - integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0= - dependencies: - alphanum-sort "^1.0.1" - postcss "^5.0.4" - uniqs "^2.0.0" - -postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" - integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU= - -postcss-zindex@^2.0.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22" - integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI= - dependencies: - has "^1.0.1" - postcss "^5.0.4" - uniqs "^2.0.0" - -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: - version "5.2.17" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b" - integrity sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs= - dependencies: - chalk "^1.1.3" - js-base64 "^2.1.9" - source-map "^0.5.6" - supports-color "^3.2.3" - -postcss@^6.0.1: - version "6.0.11" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.11.tgz#f48db210b1d37a7f7ab6499b7a54982997ab6f72" - integrity sha512-DsnIzznNRQprsGTALpkC0xjDygo+QcOd+qVjP9+RjyzrPiyYOXBGOwoJ4rAiiE4lu6JggQ/jW4niY24WLxuncg== - dependencies: - chalk "^2.1.0" - source-map "^0.5.7" - supports-color "^4.4.0" - -prepend-http@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= - -q@^1.1.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" - integrity sha1-3QG6ydBtMObyGa7LglPunr3DCPE= - -query-string@^4.1.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" - integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= - dependencies: - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - -reduce-css-calc@^1.2.6: - version "1.3.0" - resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" - integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY= - dependencies: - balanced-match "^0.4.2" - math-expression-evaluator "^1.2.14" - reduce-function-call "^1.0.1" - -reduce-function-call@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99" - integrity sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk= - dependencies: - balanced-match "^0.4.2" - -regenerate@^1.2.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260" - integrity sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA= - -regexpu-core@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" - integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs= - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= - dependencies: - jsesc "~0.5.0" - -sax@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - semver@^6.1.0: version "6.1.2" resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318" integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ== -sort-keys@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" - integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= - dependencies: - is-plain-obj "^1.0.0" - -source-list-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" - integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A== - -source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -strict-uri-encode@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" - integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -supports-color@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= - dependencies: - has-flag "^1.0.0" - -supports-color@^4.0.0, supports-color@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" - integrity sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ== - dependencies: - has-flag "^2.0.0" - -svgo@^0.7.0: - version "0.7.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" - integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U= - dependencies: - coa "~1.0.1" - colors "~1.1.2" - csso "~2.3.1" - js-yaml "~3.7.0" - mkdirp "~0.5.1" - sax "~1.2.1" - whet.extend "~0.9.9" - thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" @@ -965,30 +93,3 @@ thenify-all@^1.0.0: integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= dependencies: any-promise "^1.0.0" - -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - -uniqid@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1" - integrity sha1-iSIN32t1GuUrX3JISGNShZa7hME= - dependencies: - macaddress "^0.2.8" - -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - -vendors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22" - integrity sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI= - -whet.extend@~0.9.9: - version "0.9.9" - resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" - integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE= diff --git a/terminus-settings/package.json b/terminus-settings/package.json index 42d61e6c..10a3c72c 100644 --- a/terminus-settings/package.json +++ b/terminus-settings/package.json @@ -1,6 +1,6 @@ { "name": "terminus-settings", - "version": "1.0.73-c4-ga7d62b0", + "version": "1.0.83-nightly.4", "description": "Terminus terminal settings page", "keywords": [ "terminus-builtin-plugin" @@ -12,23 +12,21 @@ "watch": "webpack --progress --color --watch" }, "files": [ - "dist" + "typings" ], "author": "Eugene Pankov", "license": "MIT", "devDependencies": { "@types/deep-equal": "1.0.1", - "@types/node": "12.0.10", - "@types/webpack-env": "1.13.9", "ngx-pipes": "^1.6.1" }, "peerDependencies": { - "@angular/common": "4.0.1", - "@angular/core": "4.0.1", - "@angular/forms": "4.0.1", - "@angular/platform-browser": "4.0.1", - "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22", + "@angular/common": "^7", + "@angular/core": "^7", + "@angular/forms": "^7", + "@angular/platform-browser": "^7", + "@ng-bootstrap/ng-bootstrap": "^1", "terminus-core": "*", - "rxjs": "5.3.0" + "rxjs": "^5" } } diff --git a/terminus-settings/src/buttonProvider.ts b/terminus-settings/src/buttonProvider.ts index 545aa360..b034214c 100644 --- a/terminus-settings/src/buttonProvider.ts +++ b/terminus-settings/src/buttonProvider.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { ToolbarButtonProvider, ToolbarButton, AppService, HostAppService, HotkeysService } from 'terminus-core' import { SettingsTabComponent } from './components/settingsTab.component' @@ -11,7 +10,6 @@ export class ButtonProvider extends ToolbarButtonProvider { hostApp: HostAppService, hotkeys: HotkeysService, private app: AppService, - private domSanitizer: DomSanitizer, ) { super() hostApp.preferencesMenu$.subscribe(() => this.open()) @@ -25,7 +23,7 @@ export class ButtonProvider extends ToolbarButtonProvider { provide (): ToolbarButton[] { return [{ - icon: this.domSanitizer.bypassSecurityTrustHtml(require('./icons/cog.svg')), + icon: require('./icons/cog.svg'), title: 'Settings', touchBarNSImage: 'NSTouchBarComposeTemplate', weight: 10, diff --git a/terminus-settings/src/components/settingsTab.component.ts b/terminus-settings/src/components/settingsTab.component.ts index 23ebff1c..454f11b4 100644 --- a/terminus-settings/src/components/settingsTab.component.ts +++ b/terminus-settings/src/components/settingsTab.component.ts @@ -1,7 +1,7 @@ import * as yaml from 'js-yaml' import * as os from 'os' import { Subscription } from 'rxjs' -import { Component, Inject, Input, HostBinding } from '@angular/core' +import { Component, Inject, Input, HostBinding, NgZone } from '@angular/core' import { ElectronService, DockingService, @@ -47,6 +47,7 @@ export class SettingsTabComponent extends BaseTabComponent { public hostApp: HostAppService, public homeBase: HomeBaseService, public shellIntegration: ShellIntegrationService, + public zone: NgZone, hotkeys: HotkeysService, @Inject(SettingsTabProvider) public settingsProviders: SettingsTabProvider[], @Inject(Theme) public themes: Theme[], @@ -68,6 +69,14 @@ export class SettingsTabComponent extends BaseTabComponent { this.configSubscription = config.changed$.subscribe(onConfigChange) onConfigChange() + const onScreenChange = () => { + this.zone.run(() => this.screens = this.docking.getScreens()); + } + + electron.screen.on('display-added', onScreenChange); + electron.screen.on('display-removed', onScreenChange); + electron.screen.on('display-metrics-changed', onScreenChange); + hotkeys.getHotkeyDescriptions().then(descriptions => { this.hotkeyDescriptions = descriptions }) diff --git a/terminus-settings/webpack.config.js b/terminus-settings/webpack.config.js index e53cda9b..d613b8fb 100644 --- a/terminus-settings/webpack.config.js +++ b/terminus-settings/webpack.config.js @@ -2,58 +2,64 @@ const path = require('path') const webpack = require('webpack') module.exports = { - target: 'node', - entry: 'src/index.ts', - devtool: 'source-map', - context: __dirname, - mode: 'development', - output: { - path: path.resolve(__dirname, 'dist'), - filename: 'index.js', - pathinfo: true, - libraryTarget: 'umd', - devtoolModuleFilenameTemplate: 'webpack-terminus-settings:///[resource-path]', - }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', - optimization:{ - minimize: false, - }, - resolve: { - modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), - extensions: ['.ts', '.js'], - }, - module: { - rules: [ - { - test: /\.ts$/, - use: { - loader: 'awesome-typescript-loader', - options: { - configFileName: path.resolve(__dirname, 'tsconfig.json'), - typeRoots: [path.resolve(__dirname, 'node_modules/@types')], - paths: { - "terminus-*": [path.resolve(__dirname, '../terminus-*')], - "*": [path.resolve(__dirname, '../app/node_modules/*')], - } - } - } - }, - { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, - { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, - { test: /\.css$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, - { test: /\.svg/, use: ['svg-inline-loader'] }, - ] - }, - externals: [ - 'fs', - 'path', - 'os', - /^rxjs/, - /^@angular/, - /^@ng-bootstrap/, - /^terminus-/, - ], - plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), - ], + target: 'node', + entry: 'src/index.ts', + context: __dirname, + mode: 'development', + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'index.js', + pathinfo: true, + libraryTarget: 'umd', + devtoolModuleFilenameTemplate: 'webpack-terminus-settings:///[resource-path]', + }, + mode: process.env.TERMINUS_DEV ? 'development' : 'production', + optimization:{ + minimize: false, + }, + resolve: { + modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), + extensions: ['.ts', '.js'], + }, + module: { + rules: [ + { + test: /\.ts$/, + use: { + loader: 'awesome-typescript-loader', + options: { + configFileName: path.resolve(__dirname, 'tsconfig.json'), + typeRoots: [ + path.resolve(__dirname, 'node_modules/@types'), + path.resolve(__dirname, '../node_modules/@types'), + ], + paths: { + "terminus-*": [path.resolve(__dirname, '../terminus-*')], + "*": [path.resolve(__dirname, '../app/node_modules/*')], + }, + }, + }, + }, + { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, + { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, + { test: /\.css$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, + { test: /\.svg/, use: ['svg-inline-loader'] }, + ], + }, + externals: [ + 'fs', + 'path', + 'os', + /^rxjs/, + /^@angular/, + /^@ng-bootstrap/, + /^terminus-/, + ], + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.SourceMapDevToolPlugin({ + exclude: [/node_modules/, /vendor/], + filename: '[file].map', + }), + ], } diff --git a/terminus-settings/yarn.lock b/terminus-settings/yarn.lock index 97824fd1..5e4f03cb 100644 --- a/terminus-settings/yarn.lock +++ b/terminus-settings/yarn.lock @@ -7,16 +7,6 @@ resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03" integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg== -"@types/node@12.0.10": - version "12.0.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031" - integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ== - -"@types/webpack-env@1.13.9": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" - integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== - ngx-pipes@^1.6.1: version "1.6.6" resolved "https://registry.yarnpkg.com/ngx-pipes/-/ngx-pipes-1.6.6.tgz#32bb80906c220f1e84d5cce7d6dae002cffead4b" diff --git a/terminus-ssh/package.json b/terminus-ssh/package.json index b7e29a59..09096eca 100644 --- a/terminus-ssh/package.json +++ b/terminus-ssh/package.json @@ -1,6 +1,6 @@ { "name": "terminus-ssh", - "version": "1.0.73-c4-ga7d62b0", + "version": "1.0.83-nightly.0", "description": "SSH connection manager for Terminus", "keywords": [ "terminus-builtin-plugin" @@ -18,24 +18,20 @@ "license": "MIT", "devDependencies": { "@types/ssh2": "^0.5.35", - "@types/webpack-env": "^1.13.0", "ssh2": "^0.8.2", "ssh2-streams": "^0.4.2" }, "peerDependencies": { - "@angular/common": "^4.1.3", - "@angular/core": "^4.1.3", - "@angular/forms": "^4.1.3", - "@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.29", - "rxjs": "^5.4.0", + "@angular/common": "^7", + "@angular/core": "^7", + "@angular/forms": "^7", + "@ng-bootstrap/ng-bootstrap": "^1", + "rxjs": "^5", "terminus-core": "*", "terminus-settings": "*", "terminus-terminal": "*" }, "optionalDependencies": { - "windows-process-tree": "^0.2.3" - }, - "dependencies": { - "keytar": "^4.7.0" + "@terminus-term/windows-process-tree": "^0.2.4" } } diff --git a/terminus-ssh/src/buttonProvider.ts b/terminus-ssh/src/buttonProvider.ts index 3cbc9c1e..46d451f5 100644 --- a/terminus-ssh/src/buttonProvider.ts +++ b/terminus-ssh/src/buttonProvider.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { HotkeysService, ToolbarButtonProvider, ToolbarButton } from 'terminus-core' import { SSHModalComponent } from './components/sshModal.component' @@ -9,7 +8,6 @@ import { SSHModalComponent } from './components/sshModal.component' export class ButtonProvider extends ToolbarButtonProvider { constructor ( private ngbModal: NgbModal, - private domSanitizer: DomSanitizer, hotkeys: HotkeysService, ) { super() @@ -26,7 +24,7 @@ export class ButtonProvider extends ToolbarButtonProvider { provide (): ToolbarButton[] { return [{ - icon: this.domSanitizer.bypassSecurityTrustHtml(require('./icons/globe.svg')), + icon: require('./icons/globe.svg'), weight: 5, title: 'SSH connections', touchBarNSImage: 'NSTouchBarOpenInBrowserTemplate', diff --git a/terminus-ssh/src/services/ssh.service.ts b/terminus-ssh/src/services/ssh.service.ts index 7b35712a..e1adac5b 100644 --- a/terminus-ssh/src/services/ssh.service.ts +++ b/terminus-ssh/src/services/ssh.service.ts @@ -11,16 +11,15 @@ import { SSHTabComponent } from '../components/sshTab.component' import { PasswordStorageService } from './passwordStorage.service' import { SSH2Stream } from 'ssh2-streams' -/* eslint-disable block-scoped-var */ try { - var windowsProcessTree = require('windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires -} catch (_) { } + var windowsProcessTreeNative = require('@terminus-term/windows-process-tree/build/Release/windows_process_tree.node') // eslint-disable-line @typescript-eslint/no-var-requires +} catch { } @Injectable({ providedIn: 'root' }) export class SSHService { private logger: Logger - constructor ( + private constructor ( log: LogService, private app: AppService, private zone: NgZone, @@ -139,7 +138,7 @@ export class SSHService { let agent: string = null if (this.hostApp.platform === Platform.Windows) { const pageantRunning = new Promise(resolve => { - windowsProcessTree.getProcessList(list => { + windowsProcessTreeNative.getProcessList(list => { resolve(list.some(x => x.name === 'pageant.exe')) }, 0) }) diff --git a/terminus-ssh/webpack.config.js b/terminus-ssh/webpack.config.js index bf5efa9a..9279e401 100644 --- a/terminus-ssh/webpack.config.js +++ b/terminus-ssh/webpack.config.js @@ -1,55 +1,65 @@ const path = require('path') +const webpack = require('webpack') module.exports = { - target: 'node', - entry: 'src/index.ts', - devtool: 'source-map', - context: __dirname, - output: { - path: path.resolve(__dirname, 'dist'), - filename: 'index.js', - pathinfo: true, - libraryTarget: 'umd', - devtoolModuleFilenameTemplate: 'webpack-terminus-ssh:///[resource-path]', - }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', - optimization:{ - minimize: false, - }, - resolve: { - modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), - extensions: ['.ts', '.js'] - }, - module: { - rules: [ - { - test: /\.ts$/, - use: { - loader: 'awesome-typescript-loader', - options: { - configFileName: path.resolve(__dirname, 'tsconfig.json'), - typeRoots: [path.resolve(__dirname, 'node_modules/@types')], - paths: { - "terminus-*": [path.resolve(__dirname, '../terminus-*')], - "*": [path.resolve(__dirname, '../app/node_modules/*')], - } - } - } - }, - { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, - { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, - { test: /\.svg/, use: ['svg-inline-loader'] }, - ] - }, - externals: [ - 'fs', - 'keytar', - 'path', - 'ngx-toastr', - 'windows-process-tree/build/Release/windows_process_tree.node', - /^rxjs/, - /^@angular/, - /^@ng-bootstrap/, - /^terminus-/, - ] + target: 'node', + entry: 'src/index.ts', + context: __dirname, + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'index.js', + pathinfo: true, + libraryTarget: 'umd', + devtoolModuleFilenameTemplate: 'webpack-terminus-ssh:///[resource-path]', + }, + mode: process.env.TERMINUS_DEV ? 'development' : 'production', + optimization:{ + minimize: false, + }, + resolve: { + modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)), + extensions: ['.ts', '.js'], + }, + module: { + rules: [ + { + test: /\.ts$/, + use: { + loader: 'awesome-typescript-loader', + options: { + configFileName: path.resolve(__dirname, 'tsconfig.json'), + typeRoots: [ + path.resolve(__dirname, 'node_modules/@types'), + path.resolve(__dirname, '../node_modules/@types'), + ], + paths: { + "terminus-*": [path.resolve(__dirname, '../terminus-*')], + "*": [path.resolve(__dirname, '../app/node_modules/*')], + }, + }, + }, + }, + { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, + { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, + { test: /\.svg/, use: ['svg-inline-loader'] }, + ], + }, + externals: [ + 'fs', + 'keytar', + 'path', + 'ngx-toastr', + '@terminus-term/windows-process-tree/build/Release/windows_process_tree.node', + /^rxjs/, + /^@angular/, + /^@ng-bootstrap/, + /^terminus-/, + ], + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.SourceMapDevToolPlugin({ + exclude: [/node_modules/, /vendor/], + filename: '[file].map', + }), + ], } diff --git a/terminus-ssh/yarn.lock b/terminus-ssh/yarn.lock index 86553794..b7620315 100644 --- a/terminus-ssh/yarn.lock +++ b/terminus-ssh/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@terminus-term/windows-process-tree@^0.2.4": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d" + integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg== + dependencies: + nan "^2.13.2" + "@types/node@*": version "9.3.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5" @@ -22,29 +29,6 @@ "@types/node" "*" "@types/ssh2-streams" "*" -"@types/webpack-env@^1.13.0": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" - integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - asn1@~0.2.0: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" @@ -59,344 +43,16 @@ bcrypt-pbkdf@^1.0.2: dependencies: tweetnacl "^0.14.3" -bl@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" - integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA== - dependencies: - readable-stream "^2.3.5" - safe-buffer "^5.1.1" - -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== - dependencies: - buffer-alloc-unsafe "^1.1.0" - buffer-fill "^1.0.0" - -buffer-fill@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= - -chownr@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" - integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= - dependencies: - mimic-response "^1.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== - dependencies: - once "^1.4.0" - -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -keytar@^4.7.0: - version "4.11.0" - resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.11.0.tgz#891569045b287a0dabe69320e2381e059b02363f" - integrity sha512-cGn2xd4NY0yCBrU5zQ/lwIagP1UBOhUEemi6iSJU2gshN1RHkxHekSdLUji9IWNo5B1Va/iwXXWzGD2p8ziqfQ== - dependencies: - nan "2.14.0" - prebuild-install "5.3.0" - -mimic-response@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - -mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -nan@2.14.0, nan@^2.10.0: +nan@^2.13.2: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== -napi-build-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508" - integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA== - -node-abi@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.8.0.tgz#bd2e88dbe6a6871e6dd08553e0605779325737ec" - integrity sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ== - dependencies: - semver "^5.4.1" - -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -npmlog@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -os-homedir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -prebuild-install@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.0.tgz#58b4d8344e03590990931ee088dd5401b03004c8" - integrity sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.0" - mkdirp "^0.5.1" - napi-build-utils "^1.0.1" - node-abi "^2.7.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - os-homedir "^1.0.1" - pump "^2.0.1" - rc "^1.2.7" - simple-get "^2.7.0" - tar-fs "^1.13.0" - tunnel-agent "^0.6.0" - which-pm-runs "^1.0.0" - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== - -pump@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" - integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pump@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -readable-stream@^2.0.6: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - integrity sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readable-stream@^2.3.0, readable-stream@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== - safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -semver@^5.4.1: - 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" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - -simple-concat@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" - integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= - -simple-get@^2.7.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d" - integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw== - dependencies: - decompress-response "^3.3.0" - once "^1.3.1" - simple-concat "^1.0.0" - ssh2-streams@^0.4.2, ssh2-streams@~0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.4.4.tgz#7f07464c4b19ee93324995ec7164f110c5a13658" @@ -407,9 +63,9 @@ ssh2-streams@^0.4.2, ssh2-streams@~0.4.4: streamsearch "~0.1.2" ssh2@^0.8.2: - version "0.8.4" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.4.tgz#0a657d9371c1fe9f9e349bcff6144febee256aa6" - integrity sha512-qztb9t4b34wJSiWVpeTMVVN/5KCuBoyctBc2BcSe/Uq4NRnF0gB16Iu5p72ILhdYATcMNwB5WppzPIEs/3wB8Q== + version "0.8.5" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.8.5.tgz#9144cdd6c104aa81b2b16ce647c109f4bd138b57" + integrity sha512-TkvzxSYYUSQ8jb//HbHnJVui4fVEW7yu/zwBxwro/QaK2EGYtwB+8gdEChwHHuj142c5+250poMC74aJiwApPw== dependencies: ssh2-streams "~0.4.4" @@ -418,111 +74,7 @@ streamsearch@~0.1.2: resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - integrity sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== - dependencies: - safe-buffer "~5.1.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -tar-fs@^1.13.0: - version "1.16.3" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509" - integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw== - dependencies: - chownr "^1.0.1" - mkdirp "^0.5.1" - pump "^1.0.0" - tar-stream "^1.1.2" - -tar-stream@^1.1.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" - integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== - dependencies: - bl "^1.0.0" - buffer-alloc "^1.2.0" - end-of-stream "^1.0.0" - fs-constants "^1.0.0" - readable-stream "^2.3.0" - to-buffer "^1.1.1" - xtend "^4.0.0" - -to-buffer@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" - integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - tweetnacl@^0.14.3: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -which-pm-runs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" - integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - integrity sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w== - dependencies: - string-width "^1.0.2" - -windows-process-tree@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/windows-process-tree/-/windows-process-tree-0.2.3.tgz#6b781f0a320e8a0d6434c9399add4389c709cf6e" - integrity sha512-SzPJSubVVsToz1g5lr2P+4mQT70gvJ9u/nlnpfkOeQcAhOuhKz5DiO1TARgR0OnVsv21LPzxbA2m/4JQkGh1wA== - dependencies: - nan "^2.10.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= diff --git a/terminus-terminal/package.json b/terminus-terminal/package.json index 1b771e33..b92c2ee1 100644 --- a/terminus-terminal/package.json +++ b/terminus-terminal/package.json @@ -1,6 +1,6 @@ { "name": "terminus-terminal", - "version": "1.0.73-c4-ga7d62b0", + "version": "1.0.83-nightly.4", "description": "Terminus' terminal emulation core", "keywords": [ "terminus-builtin-plugin" @@ -12,48 +12,37 @@ "watch": "webpack --progress --color --watch" }, "files": [ - "dist" + "typings" ], "author": "Eugene Pankov", "license": "MIT", "devDependencies": { "@types/deep-equal": "^1.0.0", "@types/mz": "0.0.32", - "@types/node": "12.0.10", "@types/slug": "^0.9.1", - "@types/webpack-env": "1.13.9", "dataurl": "0.1.0", "deep-equal": "1.0.1", - "file-loader": "^0.11.2", "hterm-umdjs": "1.4.1", "mz": "^2.6.0", "ps-node": "^0.1.6", "runes": "^0.4.2", "slug": "^1.1.0", "uuid": "^3.3.2", - "xterm": "3.15.0-beta61", + "xterm": "3.15.0-beta80", "xterm-addon-fit": "^0.1.0-beta3", "xterm-addon-ligatures": "^0.1.0-beta-2", - "xterm-addon-search": "^0.1.0-beta6", + "xterm-addon-search": "^0.2.0-beta1", "xterm-addon-webgl": "^0.2.0-beta1" }, "peerDependencies": { - "@angular/common": "4.0.1", - "@angular/core": "4.0.1", - "@angular/forms": "4.0.1", - "@angular/platform-browser": "4.0.1", - "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22", - "rxjs": "5.3.0", + "@angular/animations": "^7", + "@angular/common": "^7", + "@angular/core": "^7", + "@angular/forms": "^7", + "@angular/platform-browser": "^7", + "@ng-bootstrap/ng-bootstrap": "^1", + "rxjs": "^5", "terminus-core": "*", "terminus-settings": "*" - }, - "dependencies": { - "fontmanager-redux": "0.3.2", - "node-pty": "^0.9.0-beta9" - }, - "optionalDependencies": { - "@terminus-term/windows-process-tree": "^0.2.4", - "macos-native-processlist": "^1.0.1", - "windows-native-registry": "^1.0.14" } } diff --git a/terminus-terminal/src/api/baseTerminalTab.component.ts b/terminus-terminal/src/api/baseTerminalTab.component.ts index 73cced17..ef5739d2 100644 --- a/terminus-terminal/src/api/baseTerminalTab.component.ts +++ b/terminus-terminal/src/api/baseTerminalTab.component.ts @@ -13,6 +13,11 @@ import { ResizeEvent } from './interfaces' import { TerminalDecorator } from './decorator' import { TerminalContextMenuItemProvider } from './contextMenuProvider' + +/** @hidden */ +export interface IToastrService { + info (_: string) +} /** * A class to base your custom terminal tabs on */ @@ -75,7 +80,7 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit protected sessions: SessionsService, protected electron: ElectronService, protected terminalContainersService: TerminalFrontendService, - protected toastr: ToastrService, + @Inject(ToastrService) protected toastr: IToastrService, protected log: LogService, @Optional() @Inject(TerminalDecorator) protected decorators: TerminalDecorator[], @Optional() @Inject(TerminalContextMenuItemProvider) protected contextMenuProviders: TerminalContextMenuItemProvider[], @@ -169,15 +174,17 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit this.session.releaseInitialDataBuffer() }) - this.frontend.configure() - - if (this.hasFocus) { - this.frontend.attach(this.content.nativeElement) - } else { - this.focused$.pipe(first()).subscribe(() => { + setImmediate(() => { + if (this.hasFocus) { this.frontend.attach(this.content.nativeElement) - }) - } + this.frontend.configure() + } else { + this.focused$.pipe(first()).subscribe(() => { + this.frontend.attach(this.content.nativeElement) + this.frontend.configure() + }) + } + }) this.attachTermContainerHandlers() @@ -367,14 +374,8 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit } else { wheelDeltaY = (event as MouseWheelEvent)['deltaY'] } - if (event.ctrlKey || event.metaKey) { - if (wheelDeltaY > 0) { - this.zoomIn() - } else { - this.zoomOut() - } - } else if (event.altKey) { + if (event.altKey) { event.preventDefault() const delta = Math.round(wheelDeltaY / 50) this.sendInput((delta > 0 ? '\u001bOA' : '\u001bOB').repeat(Math.abs(delta))) diff --git a/terminus-terminal/src/api/interfaces.ts b/terminus-terminal/src/api/interfaces.ts index 7477bc1c..2160c23f 100644 --- a/terminus-terminal/src/api/interfaces.ts +++ b/terminus-terminal/src/api/interfaces.ts @@ -1,5 +1,3 @@ -import { SafeHtml } from '@angular/platform-browser' - export interface ResizeEvent { columns: number rows: number @@ -21,7 +19,7 @@ export interface Profile { name: string, sessionOptions: SessionOptions, isBuiltin?: boolean - icon?: SafeHtml + icon?: string } export interface TerminalColorScheme { @@ -48,7 +46,7 @@ export interface Shell { /** * SVG icon */ - icon?: SafeHtml + icon?: string hidden?: boolean } diff --git a/terminus-terminal/src/buttonProvider.ts b/terminus-terminal/src/buttonProvider.ts index fd1ba078..f9733e4e 100644 --- a/terminus-terminal/src/buttonProvider.ts +++ b/terminus-terminal/src/buttonProvider.ts @@ -1,6 +1,5 @@ import * as fs from 'mz/fs' import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { ToolbarButtonProvider, ToolbarButton, ElectronService } from 'terminus-core' import { TerminalService } from './services/terminal.service' @@ -11,7 +10,6 @@ export class ButtonProvider extends ToolbarButtonProvider { constructor ( electron: ElectronService, private terminal: TerminalService, - private domSanitizer: DomSanitizer, ) { super() if (!electron.remote.process.env.TERMINUS_DEV) { @@ -31,7 +29,7 @@ export class ButtonProvider extends ToolbarButtonProvider { provide (): ToolbarButton[] { return [ { - icon: this.domSanitizer.bypassSecurityTrustHtml(require('./icons/plus.svg')), + icon: require('./icons/plus.svg'), title: 'New terminal', touchBarNSImage: 'NSTouchBarAddDetailTemplate', click: async () => { @@ -39,7 +37,7 @@ export class ButtonProvider extends ToolbarButtonProvider { }, }, { - icon: this.domSanitizer.bypassSecurityTrustHtml(require('./icons/profiles.svg')), + icon: require('./icons/profiles.svg'), title: 'New terminal with profile', submenu: async () => { const profiles = await this.terminal.getProfiles() diff --git a/terminus-terminal/src/components/searchPanel.component.pug b/terminus-terminal/src/components/searchPanel.component.pug index c94dfff8..09f14997 100644 --- a/terminus-terminal/src/components/searchPanel.component.pug +++ b/terminus-terminal/src/components/searchPanel.component.pug @@ -1,6 +1,6 @@ .input-group.w-100 input.search-input.form-control( - type='search', + type='search', [(ngModel)]='query', (ngModelChange)='notFound = false', [class.text-danger]='notFound', @@ -15,20 +15,20 @@ (click)='options.caseSensitive = !options.caseSensitive', [class.active]='options.caseSensitive', ngbTooltip='Case sensitivity', - placement='bottom' + placement='bottom' ) i.fa.fa-fw.fa-font button.btn.btn-outline-primary( (click)='options.regex = !options.regex', [class.active]='options.regex', ngbTooltip='Regular expression', - placement='bottom' + placement='bottom' ) i.fa.fa-fw.fa-asterisk button.btn.btn-outline-primary( (click)='options.wholeWord = !options.wholeWord', [class.active]='options.wholeWord', ngbTooltip='Whole word', - placement='bottom' + placement='bottom' ) - i.fa.fa-fw.fa-square + i.fa.fa-fw.fa-text-width diff --git a/terminus-terminal/src/components/searchPanel.component.scss b/terminus-terminal/src/components/searchPanel.component.scss index 1245e090..df590207 100644 --- a/terminus-terminal/src/components/searchPanel.component.scss +++ b/terminus-terminal/src/components/searchPanel.component.scss @@ -3,7 +3,7 @@ width: 400px; align-self: center; z-index: 5; - padding: 5px; + padding: 10px; border-radius: 0 0 3px 3px; - background: rgba(0, 0, 0, .25); + background: rgba(0, 0, 0, .75); } diff --git a/terminus-terminal/src/config.ts b/terminus-terminal/src/config.ts index 7d733860..c86cc500 100644 --- a/terminus-terminal/src/config.ts +++ b/terminus-terminal/src/config.ts @@ -73,6 +73,7 @@ export class TerminalConfigProvider extends ConfigProvider { '⌘-C', ], paste: [ + '⌘-V', ], clear: [ '⌘-K', diff --git a/terminus-terminal/src/frontends/xtermFrontend.ts b/terminus-terminal/src/frontends/xtermFrontend.ts index f4cb499d..a6cb2909 100644 --- a/terminus-terminal/src/frontends/xtermFrontend.ts +++ b/terminus-terminal/src/frontends/xtermFrontend.ts @@ -19,9 +19,9 @@ const COLOR_NAMES = [ /** @hidden */ export class XTermFrontend extends Frontend { enableResizing = true - xterm: Terminal - xtermCore: any - enableWebGL = false + protected xtermCore: any + protected enableWebGL = false + private xterm: Terminal private configuredFontSize = 0 private zoom = 0 private resizeHandler: () => void @@ -85,7 +85,9 @@ export class XTermFrontend extends Frontend { this.resizeHandler = () => { try { - this.fitAddon.fit() + if (getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') { + this.fitAddon.fit() + } } catch (e) { // tends to throw when element wasn't shown yet console.warn('Could not resize xterm', e) @@ -291,5 +293,5 @@ export class XTermFrontend extends Frontend { /** @hidden */ export class XTermWebGLFrontend extends XTermFrontend { - enableWebGL = true + protected enableWebGL = true } diff --git a/terminus-terminal/src/index.ts b/terminus-terminal/src/index.ts index 8edb51d6..9fe78b04 100644 --- a/terminus-terminal/src/index.ts +++ b/terminus-terminal/src/index.ts @@ -106,7 +106,7 @@ import { XTermFrontend, XTermWebGLFrontend } from './frontends/xtermFrontend' ShellSettingsTabComponent, TerminalSettingsTabComponent, EditProfileModalComponent, - ], + ] as any[], declarations: [ ColorPickerComponent, TerminalTabComponent, @@ -116,7 +116,7 @@ import { XTermFrontend, XTermWebGLFrontend } from './frontends/xtermFrontend' EditProfileModalComponent, EnvironmentEditorComponent, SearchPanelComponent, - ], + ] as any[], exports: [ ColorPickerComponent, EnvironmentEditorComponent, diff --git a/terminus-terminal/src/services/dockMenu.service.ts b/terminus-terminal/src/services/dockMenu.service.ts index b1ac1528..312b2d90 100644 --- a/terminus-terminal/src/services/dockMenu.service.ts +++ b/terminus-terminal/src/services/dockMenu.service.ts @@ -7,7 +7,7 @@ import { TerminalService } from './terminal.service' export class DockMenuService { appVersion: string - constructor ( + private constructor ( private electron: ElectronService, private config: ConfigService, private hostApp: HostAppService, diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts index 16ad0381..50c5bf50 100644 --- a/terminus-terminal/src/services/sessions.service.ts +++ b/terminus-terminal/src/services/sessions.service.ts @@ -21,6 +21,7 @@ try { var windowsProcessTree = require('@terminus-term/windows-process-tree') // eslint-disable-line @typescript-eslint/no-var-requires } catch { } + export interface ChildProcess { pid: number ppid: number diff --git a/terminus-terminal/src/shells/cmder.ts b/terminus-terminal/src/shells/cmder.ts index b9b5dbb8..07c5dce3 100644 --- a/terminus-terminal/src/shells/cmder.ts +++ b/terminus-terminal/src/shells/cmder.ts @@ -1,6 +1,5 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { HostAppService, Platform } from 'terminus-core' import { ShellProvider } from '../api/shellProvider' @@ -10,7 +9,6 @@ import { Shell } from '../api/interfaces' @Injectable() export class CmderShellProvider extends ShellProvider { constructor ( - private domSanitizer: DomSanitizer, private hostApp: HostAppService, ) { super() @@ -34,7 +32,7 @@ export class CmderShellProvider extends ShellProvider { '/k', path.join(process.env.CMDER_ROOT, 'vendor', 'init.bat'), ], - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/cmder.svg')), + icon: require('../icons/cmder.svg'), env: { TERM: 'cygwin', }, @@ -52,7 +50,7 @@ export class CmderShellProvider extends ShellProvider { '-command', `Invoke-Expression '. ''${path.join(process.env.CMDER_ROOT, 'vendor', 'profile.ps1')}'''`, ], - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/cmder-powershell.svg')), + icon: require('../icons/cmder-powershell.svg'), env: {}, }, ] diff --git a/terminus-terminal/src/shells/cygwin32.ts b/terminus-terminal/src/shells/cygwin32.ts index cebc72e2..5dd09bd6 100644 --- a/terminus-terminal/src/shells/cygwin32.ts +++ b/terminus-terminal/src/shells/cygwin32.ts @@ -1,6 +1,5 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { HostAppService, Platform } from 'terminus-core' import { ShellProvider } from '../api/shellProvider' @@ -16,7 +15,6 @@ try { @Injectable() export class Cygwin32ShellProvider extends ShellProvider { constructor ( - private domSanitizer: DomSanitizer, private hostApp: HostAppService, ) { super() @@ -37,7 +35,7 @@ export class Cygwin32ShellProvider extends ShellProvider { id: 'cygwin32', name: 'Cygwin (32 bit)', command: path.join(cygwinPath, 'bin', 'bash.exe'), - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/cygwin.svg')), + icon: require('../icons/cygwin.svg'), env: { TERM: 'cygwin', }, diff --git a/terminus-terminal/src/shells/cygwin64.ts b/terminus-terminal/src/shells/cygwin64.ts index d75dbc1a..70d3efff 100644 --- a/terminus-terminal/src/shells/cygwin64.ts +++ b/terminus-terminal/src/shells/cygwin64.ts @@ -1,6 +1,5 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { HostAppService, Platform } from 'terminus-core' import { ShellProvider } from '../api/shellProvider' @@ -16,7 +15,6 @@ try { @Injectable() export class Cygwin64ShellProvider extends ShellProvider { constructor ( - private domSanitizer: DomSanitizer, private hostApp: HostAppService, ) { super() @@ -37,7 +35,7 @@ export class Cygwin64ShellProvider extends ShellProvider { id: 'cygwin64', name: 'Cygwin', command: path.join(cygwinPath, 'bin', 'bash.exe'), - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/cygwin.svg')), + icon: require('../icons/cygwin.svg'), env: { TERM: 'cygwin', }, diff --git a/terminus-terminal/src/shells/gitBash.ts b/terminus-terminal/src/shells/gitBash.ts index f197bad1..984bf38e 100644 --- a/terminus-terminal/src/shells/gitBash.ts +++ b/terminus-terminal/src/shells/gitBash.ts @@ -1,6 +1,5 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { HostAppService, Platform } from 'terminus-core' import { ShellProvider } from '../api/shellProvider' @@ -16,7 +15,6 @@ try { @Injectable() export class GitBashShellProvider extends ShellProvider { constructor ( - private domSanitizer: DomSanitizer, private hostApp: HostAppService, ) { super() @@ -42,7 +40,7 @@ export class GitBashShellProvider extends ShellProvider { name: 'Git-Bash', command: path.join(gitBashPath, 'bin', 'bash.exe'), args: ['--login', '-i'], - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/git-bash.svg')), + icon: require('../icons/git-bash.svg'), env: { TERM: 'cygwin', }, diff --git a/terminus-terminal/src/shells/powershellCore.ts b/terminus-terminal/src/shells/powershellCore.ts index ae98d407..394bfbe9 100644 --- a/terminus-terminal/src/shells/powershellCore.ts +++ b/terminus-terminal/src/shells/powershellCore.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { HostAppService, Platform } from 'terminus-core' import { ShellProvider } from '../api/shellProvider' import { Shell } from '../api/interfaces' @@ -14,7 +13,6 @@ try { @Injectable() export class PowerShellCoreShellProvider extends ShellProvider { constructor ( - private domSanitizer: DomSanitizer, private hostApp: HostAppService, ) { super() @@ -36,7 +34,7 @@ export class PowerShellCoreShellProvider extends ShellProvider { name: 'PowerShell Core', command: pwshPath, args: ['-nologo'], - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/powershell-core.svg')), + icon: require('../icons/powershell-core.svg'), env: { TERM: 'cygwin', }, diff --git a/terminus-terminal/src/shells/windowsStock.ts b/terminus-terminal/src/shells/windowsStock.ts index bacf0949..eeae316f 100644 --- a/terminus-terminal/src/shells/windowsStock.ts +++ b/terminus-terminal/src/shells/windowsStock.ts @@ -1,6 +1,5 @@ import * as path from 'path' import { Injectable } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { HostAppService, Platform, ElectronService } from 'terminus-core' import { ShellProvider } from '../api/shellProvider' @@ -10,7 +9,6 @@ import { Shell } from '../api/interfaces' @Injectable() export class WindowsStockShellsProvider extends ShellProvider { constructor ( - private domSanitizer: DomSanitizer, private hostApp: HostAppService, private electron: ElectronService, ) { @@ -38,21 +36,21 @@ export class WindowsStockShellsProvider extends ShellProvider { 'inject', ], env: {}, - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/clink.svg')), + icon: require('../icons/clink.svg'), }, { id: 'cmd', name: 'CMD (stock)', command: 'cmd.exe', env: {}, - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/cmd.svg')), + icon: require('../icons/cmd.svg'), }, { id: 'powershell', name: 'PowerShell', command: 'powershell.exe', args: ['-nologo'], - icon: this.domSanitizer.bypassSecurityTrustHtml(require('../icons/powershell.svg')), + icon: require('../icons/powershell.svg'), env: { TERM: 'cygwin', }, diff --git a/terminus-terminal/webpack.config.js b/terminus-terminal/webpack.config.js index e2fd2181..285cce15 100644 --- a/terminus-terminal/webpack.config.js +++ b/terminus-terminal/webpack.config.js @@ -2,77 +2,83 @@ const path = require('path') const webpack = require('webpack') module.exports = { - target: 'node', - entry: 'src/index.ts', - devtool: 'source-map', - context: __dirname, - output: { - path: path.resolve(__dirname, 'dist'), - filename: 'index.js', - pathinfo: true, - libraryTarget: 'umd', - devtoolModuleFilenameTemplate: 'webpack-terminus-terminal:///[resource-path]', - }, - mode: process.env.TERMINUS_DEV ? 'development' : 'production', - optimization: { - minimize: false, - }, - resolve: { - modules: ['.', 'src', 'node_modules', '../app/node_modules', 'node_modules/xterm/src'].map(x => path.join(__dirname, x)), - extensions: ['.ts', '.js'], - }, - module: { - rules: [ - { - test: /\.ts$/, - use: { - loader: 'awesome-typescript-loader', - query: { - configFileName: path.resolve(__dirname, 'tsconfig.json'), - typeRoots: [path.resolve(__dirname, 'node_modules/@types')], - paths: { - "terminus-*": [path.resolve(__dirname, '../terminus-*')], - "*": [ - path.resolve(__dirname, '../app/node_modules/*'), - path.resolve(__dirname, './node_modules/xterm/src/*') - ], - } - }, - }, - }, - { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, - { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, - { test: /\.css$/, use: ['style-loader', 'css-loader'] }, - { test: /\.svg/, use: ['svg-inline-loader'] }, - { - test: /\.(ttf|eot|otf|woff|woff2|ogg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, - use: { - loader: 'url-loader', - options: { - limit: 999999999999, - } - } - }, - ] - }, - externals: [ - 'child_process', - 'electron', - 'fontmanager-redux', - 'fs', - 'path', - 'macos-native-processlist', - 'windows-native-registry', - 'node-pty', - '@terminus-term/windows-process-tree', - 'os', - /^rxjs/, - /^@angular/, - /^@ng-bootstrap/, - 'ngx-toastr', - /^terminus-/, - ], - plugins: [ - new webpack.optimize.ModuleConcatenationPlugin(), - ], + target: 'node', + entry: 'src/index.ts', + context: __dirname, + output: { + path: path.resolve(__dirname, 'dist'), + filename: 'index.js', + pathinfo: true, + libraryTarget: 'umd', + devtoolModuleFilenameTemplate: 'webpack-terminus-terminal:///[resource-path]', + }, + mode: process.env.TERMINUS_DEV ? 'development' : 'production', + optimization: { + minimize: false, + }, + resolve: { + modules: ['.', 'src', 'node_modules', '../app/node_modules', 'node_modules/xterm/src'].map(x => path.join(__dirname, x)), + extensions: ['.ts', '.js'], + }, + module: { + rules: [ + { + test: /\.ts$/, + use: { + loader: 'awesome-typescript-loader', + query: { + configFileName: path.resolve(__dirname, 'tsconfig.json'), + typeRoots: [ + path.resolve(__dirname, 'node_modules/@types'), + path.resolve(__dirname, '../node_modules/@types'), + ], + paths: { + "terminus-*": [path.resolve(__dirname, '../terminus-*')], + "*": [ + path.resolve(__dirname, '../app/node_modules/*'), + path.resolve(__dirname, './node_modules/xterm/src/*'), + ], + }, + }, + }, + }, + { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] }, + { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] }, + { test: /\.css$/, use: ['style-loader', 'css-loader'] }, + { test: /\.svg/, use: ['svg-inline-loader'] }, + { + test: /\.(ttf|eot|otf|woff|woff2|ogg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, + use: { + loader: 'url-loader', + options: { + limit: 999999999999, + }, + }, + }, + ], + }, + externals: [ + 'child_process', + 'electron', + 'fontmanager-redux', + 'fs', + 'path', + 'macos-native-processlist', + 'windows-native-registry', + 'node-pty', + '@terminus-term/windows-process-tree', + 'os', + /^rxjs/, + /^@angular/, + /^@ng-bootstrap/, + 'ngx-toastr', + /^terminus-/, + ], + plugins: [ + new webpack.optimize.ModuleConcatenationPlugin(), + new webpack.SourceMapDevToolPlugin({ + exclude: [/node_modules/, /vendor/], + filename: '[file].map', + }), + ], } diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index e9dd7af9..edb46f7d 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -2,13 +2,6 @@ # yarn lockfile v1 -"@terminus-term/windows-process-tree@^0.2.4": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@terminus-term/windows-process-tree/-/windows-process-tree-0.2.4.tgz#558f33d5afd934b070aec78da2529fc4042cf90d" - integrity sha512-FbquNhrFoe9EBwVITV9bqd/wukJLJSVI2pAzvM8dBvPP3/ErTiavZWU0W/J5av61SavJFDMkSiYVYL5NJe30zg== - dependencies: - nan "^2.13.2" - "@types/deep-equal@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03" @@ -21,7 +14,7 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@12.0.10": +"@types/node@*": version "12.0.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031" integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ== @@ -31,21 +24,11 @@ resolved "https://registry.yarnpkg.com/@types/slug/-/slug-0.9.1.tgz#16dbf8b77d73e0a09ce51a96400878f33806ab32" integrity sha512-zR/u8WFQ4/6uCIikjI00a5uB084XjgEGNRAvM4a1BL39Bw9yEiDQFiPS2DgJ8lPDkR2Qd/vZ26dCR9XqlKbDqQ== -"@types/webpack-env@1.13.9": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" - integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== - any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - connected-domain@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/connected-domain/-/connected-domain-1.0.0.tgz#bfe77238c74be453a79f0cb6058deeb4f2358e93" @@ -61,18 +44,6 @@ deep-equal@1.0.1: resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - -file-loader@^0.11.2: - version "0.11.2" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34" - integrity sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg== - dependencies: - loader-utils "^1.0.2" - font-finder@^1.0.2, font-finder@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/font-finder/-/font-finder-1.0.4.tgz#2ca944954dd8d0e1b5bdc4c596cc08607761d89b" @@ -90,11 +61,6 @@ font-ligatures@^1.3.1: lru-cache "^4.1.3" opentype.js "^0.8.0" -fontmanager-redux@0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/fontmanager-redux/-/fontmanager-redux-0.3.2.tgz#e5c8d8dc8fda98629eaef4201a27df9e56a122f4" - integrity sha512-NWmTbYfDijrx8qLJ2+O2VgYKhdfsMy/ec+Qf2DGxoLJDZHaRhBKd2Eufh4fFmfJUAwhzrkIgbKJsNT/IYJDbaA== - get-system-fonts@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/get-system-fonts/-/get-system-fonts-2.0.0.tgz#a43b9a33f05c0715a60176d2aad5ce6e98f0a3c6" @@ -105,22 +71,6 @@ hterm-umdjs@1.4.1: resolved "https://registry.yarnpkg.com/hterm-umdjs/-/hterm-umdjs-1.4.1.tgz#0cd5352eaf927c70b83c36146cf2c2a281dba957" integrity sha512-r5JOmdDK1bZCmp3cKcuGRLVeum33H+pzD119ZxmQou+QUVe6SAVSz03HvKWVhM2Ao1Biv+fkhFDmnsaRPq0tFg== -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - -loader-utils@^1.0.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== - dependencies: - big.js "^5.2.2" - emojis-list "^2.0.0" - json5 "^1.0.1" - lru-cache@^4.1.3: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -129,18 +79,6 @@ lru-cache@^4.1.3: pseudomap "^1.0.2" yallist "^2.1.2" -macos-native-processlist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/macos-native-processlist/-/macos-native-processlist-1.0.1.tgz#df48bbd114554bd69e7c2c76f976836ef8270ca8" - integrity sha512-Kn8EUW8xOM+06GFMp8I2fxIK8iSaR/fraAU5ddfnKVRn6/+dmQ5VGBSG4k6ce3u/EOQxd/7paBCAz17nXqH0cg== - dependencies: - nan "^2.13.2" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - mz@^2.6.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -150,18 +88,6 @@ mz@^2.6.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.13.2: - version "2.13.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" - integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== - -node-pty@^0.9.0-beta9: - version "0.9.0-beta9" - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta9.tgz#75cffcf4026f543475c115f017ca7fe66cf6e7fe" - integrity sha512-h6e8jUikGSZwqt1JHmzT5Zi0fdUCultX/BWrS35suTaZNJm/YSJA2QDG9HTVoSA6dhRvtFoaGiBtgbX9uZKe6w== - dependencies: - nan "^2.13.2" - object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -239,17 +165,10 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -windows-native-registry@^1.0.14: - version "1.0.14" - resolved "https://registry.yarnpkg.com/windows-native-registry/-/windows-native-registry-1.0.14.tgz#35c742b1278473127cbfb3b76e0db3d1ef626872" - integrity sha512-C2UgyZYJYcPFjkhfNuy09CUa6wXAti4x/tLPgzudDDrqpTyczcgnBEpiablmE6j7E7ownouWTqgVcHW8HJyqhw== - dependencies: - nan "^2.13.2" - xterm-addon-fit@^0.1.0-beta3: - version "0.1.0-beta3" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.1.0-beta3.tgz#82bc2474cb00a2872d9a43ea52ed801bdfeebeaf" - integrity sha512-5UWwCH3smDWlqskK8r0GcCgLPvwbJiPpKiM01E67g5HIrQqCxITKawc01cuKCDLVj03sFJB9jDCOoh0n0mN+Zw== + version "0.1.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.1.0.tgz#dd52d8b2ec6ef05faab8285bafd9310063704468" + integrity sha512-DzYThnR5rXYX7JrOZ8rHGMU36BiTwYNFUOhhNwrDSFvoUR2MgwQrfA/JrqLE62KRj0D8bkRR7+xe7qGBp1O4Rw== xterm-addon-ligatures@^0.1.0-beta-2: version "0.1.0-beta-2" @@ -259,20 +178,20 @@ xterm-addon-ligatures@^0.1.0-beta-2: font-finder "^1.0.2" font-ligatures "^1.3.1" -xterm-addon-search@^0.1.0-beta6: - version "0.1.0-beta6" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.1.0-beta6.tgz#e2a2b441f8f7b0245c63731d0b2af32c7d4e6747" - integrity sha512-XKxdfO48HkCJW2m1wXW0PK/BOk00WEaN+W2LgDQqCBwwUjyBzWc9HaV8gzLXhSCDAYesWvtQa3RfqHfSp9qsbQ== +xterm-addon-search@^0.2.0-beta1: + version "0.2.0-beta2" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.2.0-beta2.tgz#c3173f0a6f207ee9f1848849174ee5d6b6ce8262" + integrity sha512-XEcwi2TeFGk2MuIFjiI/OpVXSNO5dGQBvHH3o+9KzqG3ooVqhhDqzwxs092QGNcNCGh8hGn/PWZiczaBBnKm/g== xterm-addon-webgl@^0.2.0-beta1: - version "0.2.0-beta1" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta1.tgz#c688e4b26bbd01a8a0cd9143362bbe040fc98ef9" - integrity sha512-arDNdOyiGs0BCFUaQ0jEa1UgybqMsMRZwV9+/xc0D4vJi5STWtH8lRtTUAgvDxaTJQBo1frz56JkYpDddHDSXw== + version "0.2.0-beta5" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.2.0-beta5.tgz#79d97c21bb09c34c6aca6f4e72afe8085f8a77dc" + integrity sha512-TR6071ZWQ2l0E/P7KedDfsGCW21BWCfemiV/swBF+X/BiRzzsZlJXpZP62jR/XV0/J7r1SMVPSIP5j8TMCoDmw== -xterm@3.15.0-beta61: - version "3.15.0-beta61" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta61.tgz#44f3b1959c955013d0661b7008c33a913f900329" - integrity sha512-nPr9DQCUnAnC8COoL5QfZqdFADj6nD+03xsqfu+6DLJAY0BPF0Tdhm+VzWlB4GGEhjA/DEuTD5vq70+j3gE/bw== +xterm@3.15.0-beta80: + version "3.15.0-beta80" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.15.0-beta80.tgz#6a17eea9c9d05667acdede641cfb76a7c0d0a3cd" + integrity sha512-nidVf1uDiOa5BsYR4/uK61qsVeo/gsuvgL6HeVthcLO3WkObGpsXNaZmIFmLmgsyA4RROpjSvKipTFD8mPt+Jg== yallist@^2.1.2: version "2.1.2" diff --git a/tsconfig.json b/tsconfig.json index 4bb34072..c5e25d85 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,6 +15,7 @@ "skipLibCheck": true, "esModuleInterop": true, "allowSyntheticDefaultImports": true, + "importHelpers": true, "lib": [ "dom", "es5", diff --git a/webpack.config.js b/webpack.config.js index 6f007064..06e8aa05 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,10 +1,10 @@ module.exports = [ - require('./app/webpack.config.js'), - require('./app/webpack.main.config.js'), - require('./terminus-core/webpack.config.js'), - require('./terminus-settings/webpack.config.js'), - require('./terminus-terminal/webpack.config.js'), - require('./terminus-community-color-schemes/webpack.config.js'), - require('./terminus-plugin-manager/webpack.config.js'), - require('./terminus-ssh/webpack.config.js'), + require('./app/webpack.config.js'), + require('./app/webpack.main.config.js'), + require('./terminus-core/webpack.config.js'), + require('./terminus-settings/webpack.config.js'), + require('./terminus-terminal/webpack.config.js'), + require('./terminus-community-color-schemes/webpack.config.js'), + require('./terminus-plugin-manager/webpack.config.js'), + require('./terminus-ssh/webpack.config.js'), ] diff --git a/yarn.lock b/yarn.lock index 96a00b6e..4a1641f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -132,10 +132,10 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@^12.0.10": - version "12.0.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.10.tgz#51babf9c7deadd5343620055fc8aff7995c8b031" - integrity sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ== +"@types/node@*", "@types/node@^12.6.2": + version "12.6.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.2.tgz#a5ccec6abb6060d5f20d256fb03ed743e9774999" + integrity sha512-gojym4tX0FWeV2gsW4Xmzo5wxGjXGm550oVUII7f7G5o4BV6c7DBdiG1RRQd+y1bvqRyYtPfMK85UM95vsapqQ== "@types/node@^10.12.18": version "10.12.26" @@ -153,39 +153,39 @@ resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== -"@typescript-eslint/eslint-plugin@^1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.11.0.tgz#870f752c520db04db6d3668af7479026a6f2fb9a" - integrity sha512-mXv9ccCou89C8/4avKHuPB2WkSZyY/XcTQUXd5LFZAcLw1I3mWYVjUu6eS9Ja0QkP/ClolbcW9tb3Ov/pMdcqw== +"@typescript-eslint/eslint-plugin@^1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.12.0.tgz#96b4e08b5f998a198b8414508b1a289f9e8c549a" + integrity sha512-J/ZTZF+pLNqjXBGNfq5fahsoJ4vJOkYbitWPavA05IrZ7BXUaf4XWlhUB/ic1lpOGTRpLWF+PLAePjiHp6dz8g== dependencies: - "@typescript-eslint/experimental-utils" "1.11.0" + "@typescript-eslint/experimental-utils" "1.12.0" eslint-utils "^1.3.1" functional-red-black-tree "^1.0.1" regexpp "^2.0.1" tsutils "^3.7.0" -"@typescript-eslint/experimental-utils@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.11.0.tgz#594abe47091cbeabac1d6f9cfed06d0ad99eb7e3" - integrity sha512-7LbfaqF6B8oa8cp/315zxKk8FFzosRzzhF8Kn/ZRsRsnpm7Qcu25cR/9RnAQo5utZ2KIWVgaALr+ZmcbG47ruw== +"@typescript-eslint/experimental-utils@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.12.0.tgz#98417ee2e0c6fe8d1e50d934a6535d9c0f4277b6" + integrity sha512-s0soOTMJloytr9GbPteMLNiO2HvJ+qgQkRNplABXiVw6vq7uQRvidkby64Gqt/nA7pys74HksHwRULaB/QRVyw== dependencies: - "@typescript-eslint/typescript-estree" "1.11.0" + "@typescript-eslint/typescript-estree" "1.12.0" eslint-scope "^4.0.0" -"@typescript-eslint/parser@^1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.11.0.tgz#2f6d4f7e64eeb1e7c25b422f8df14d0c9e508e36" - integrity sha512-5xBExyXaxVyczrZvbRKEXvaTUFFq7gIM9BynXukXZE0zF3IQP/FxF4mPmmh3gJ9egafZFqByCpPTFm3dk4SY7Q== +"@typescript-eslint/parser@^1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.12.0.tgz#9965895ec4745578185965d63f21510f93a3f35a" + integrity sha512-0uzbaa9ZLCA5yMWJywnJJ7YVENKGWVUhJDV5UrMoldC5HoI54W5kkdPhTfmtFKpPFp93MIwmJj0/61ztvmz5Dw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "1.11.0" - "@typescript-eslint/typescript-estree" "1.11.0" + "@typescript-eslint/experimental-utils" "1.12.0" + "@typescript-eslint/typescript-estree" "1.12.0" eslint-visitor-keys "^1.0.0" -"@typescript-eslint/typescript-estree@1.11.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.11.0.tgz#b7b5782aab22e4b3b6d84633652c9f41e62d37d5" - integrity sha512-fquUHF5tAx1sM2OeRCC7wVxFd1iMELWMGCzOSmJ3pLzArj9+kRixdlC4d5MncuzXpjEqc6045p3KwM0o/3FuUA== +"@typescript-eslint/typescript-estree@1.12.0": + version "1.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.12.0.tgz#d8dd0a7cffb5e3c0c3e98714042d83e316dfc9a9" + integrity sha512-nwN6yy//XcVhFs0ZyU+teJHB8tbCm7AIA8mu6E2r5hu6MajwYBY3Uwop7+rPZWUN/IUOHpL8C+iUPMDVYUU3og== dependencies: lodash.unescape "4.0.1" semver "5.5.0" @@ -391,7 +391,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1, ajv@^6.9.2: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1: version "6.10.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" dependencies: @@ -467,33 +467,28 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -app-builder-bin@2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.7.1.tgz#9f690af65093821b8a6149aa29ce9f8c81fc554c" - integrity sha512-ubIBeiL9XysjMW4HETBKxj3DC8ika6dGyC0vftPc0kZwGh1iXQ5bycsjoAqY/3t3BBEEIg0VruicvBaUl1pOSQ== +app-builder-bin@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.1.5.tgz#235c42dddee88045c8b6efec8ba7a7abdcaa81e9" + integrity sha512-WShO6mkz3Syvxzylg8JftHyILnWWPL/vrEwZSGy366QFvD3X1lvMuyKeIffmpFEXemveziamFOl/3rBLMaNfPg== -app-builder-bin@3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.0.3.tgz#6b82a82c0e855ae90db20b4f80563ce767cf36f4" - integrity sha512-e/mnAyzGC9q5OGnWbbiAZ429ECWYtHB2YUM42KEaoIJcEc1LNecA5MNAvFyB85znOKHPGpcOygBrcWPlGJcQgw== - -app-builder-lib@20.44.4, app-builder-lib@~20.44.4: - version "20.44.4" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.44.4.tgz#39ac20b3155e1b0c2499862bcdea879b50389573" - integrity sha512-1K1xfrhyqDgnibwyuYMgvfwGilGLMF31YwOUJ8IXreyjRef9lUjWW+BZuBXqk4Uqd0C0EYPjhofgpuN0WoAQ+A== +app-builder-lib@21.0.8, app-builder-lib@^21.0.8, app-builder-lib@~21.0.7: + version "21.0.8" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.8.tgz#f9c0f69ae2684a6b73f6fe37cddb8287fad07112" + integrity sha512-CgmXKgywl4+/6q4z9K+kFczDWiT+qaZyZGi6ov06/SSRwFb1CdVzFk8gQNzMu99+CMvnPdRBfVuO3BiOtMnTgg== dependencies: "7zip-bin" "~4.1.0" - app-builder-bin "2.7.1" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "10.1.2" - builder-util-runtime "8.2.5" + builder-util "10.3.2" + builder-util-runtime "8.3.0" chromium-pickle-js "^0.2.0" debug "^4.1.1" ejs "^2.6.2" electron-osx-sign "0.4.11" - electron-publish "20.44.4" - fs-extra-p "^8.0.2" + electron-publish "21.0.7" + fs-extra "^8.1.0" + fs-extra-p "^8.1.0" hosted-git-info "^2.7.1" is-ci "^2.0.0" isbinaryfile "^4.0.1" @@ -501,39 +496,9 @@ app-builder-lib@20.44.4, app-builder-lib@~20.44.4: lazy-val "^1.0.4" minimatch "^3.0.4" normalize-package-data "^2.5.0" - plist "^3.0.1" - read-config-file "3.2.2" + read-config-file "4.0.0" sanitize-filename "^1.6.1" - semver "^6.1.1" - temp-file "^3.3.3" - -app-builder-lib@^21.0.3: - version "21.0.3" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.0.3.tgz#103dddac859f267874d25ea562fee4c4da3f9e36" - integrity sha512-kAz355M7TA4/wgEpdVtPwb0n/wgx4P204RHQQipNeCujthMpOr02PxxLWV5K8QDczgF+MWCHE8W4pSe4o8OD5Q== - dependencies: - "7zip-bin" "~4.1.0" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.9" - builder-util "10.2.1" - builder-util-runtime "8.2.5" - chromium-pickle-js "^0.2.0" - debug "^4.1.1" - ejs "^2.6.2" - electron-osx-sign "0.4.11" - electron-publish "21.0.3" - fs-extra-p "^8.0.2" - hosted-git-info "^2.7.1" - is-ci "^2.0.0" - isbinaryfile "^4.0.1" - js-yaml "^3.13.1" - lazy-val "^1.0.4" - minimatch "^3.0.4" - normalize-package-data "^2.5.0" - plist "^3.0.1" - read-config-file "3.3.0" - sanitize-filename "^1.6.1" - semver "^6.1.2" + semver "^6.2.0" temp-file "^3.3.3" apply-loader@2.0.0: @@ -776,7 +741,7 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird-lst@^1.0.7, bluebird-lst@^1.0.9: +bluebird-lst@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== @@ -856,7 +821,7 @@ brorand@^1.0.1: browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" - resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" dependencies: buffer-xor "^1.0.3" cipher-base "^1.0.0" @@ -884,7 +849,7 @@ browserify-des@^1.0.0: browserify-rsa@^4.0.0: version "4.0.1" - resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" + resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" dependencies: bn.js "^4.1.0" randombytes "^2.0.1" @@ -932,54 +897,33 @@ buffer-xor@^1.0.3: buffer@^4.3.0: version "4.9.1" - resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" + resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" isarray "^1.0.0" -builder-util-runtime@8.2.5, builder-util-runtime@^8.2.5: - version "8.2.5" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.2.5.tgz#6f19330178345f8ce2c65842b0a9cf6a187d5946" - integrity sha512-YILT+YUlxrE3yNB6mDC1tF+Q24mr1LSYdjP5U861jbBeDZfvy1/VPDzW3boMVrDtzYnDnvkYrzLJnoh6TXA75w== +builder-util-runtime@8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.3.0.tgz#f5fac9139af6facf42a21fbe4d3aebed88fda33e" + integrity sha512-CSOdsYqf4RXIHh1HANPbrZHlZ9JQJXSuDDloblZPcWQVN62inyYoTQuSmY3KrgefME2Sv3Kn2MxHvbGQHRf8Iw== dependencies: - bluebird-lst "^1.0.9" debug "^4.1.1" - fs-extra-p "^8.0.2" sax "^1.2.4" -builder-util@10.1.2, builder-util@~10.1.2: - version "10.1.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.1.2.tgz#29e631025aa4c837411d5e4ef425d14e320eb2d0" - integrity sha512-LQMh36Cg0r4ZfKqNlaUclndS/IXxZ3OdCgmXvw1vdP3QwYT2NkyE7LfMikAFIHpXOs6zsVH+iW+Fe/AX1jfFag== +builder-util@10.3.2, builder-util@~10.3.2: + version "10.3.2" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.3.2.tgz#3bc50e31207fa14f6174f071f6aa5493be80f2d2" + integrity sha512-ZvvCvZKfYSikuNEHPqsQrDMM4VqR3MXe4iiZ4q1dv/VLyE9iJrCTi50uQIuDFhDbtnlj8ZtBL1mzOzyGAzrqpA== dependencies: "7zip-bin" "~4.1.0" "@types/debug" "^4.1.4" - app-builder-bin "2.7.1" + app-builder-bin "3.1.5" bluebird-lst "^1.0.9" - builder-util-runtime "^8.2.5" + builder-util-runtime "8.3.0" chalk "^2.4.2" debug "^4.1.1" - fs-extra-p "^8.0.2" - is-ci "^2.0.0" - js-yaml "^3.13.1" - source-map-support "^0.5.12" - stat-mode "^0.3.0" - temp-file "^3.3.3" - -builder-util@10.2.1, builder-util@~10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-10.2.1.tgz#47db02a1dfea073284083f57a5ab1e58c0d40159" - integrity sha512-cotxXgsNL0kpgIwz/g6q9yfSbHIHlwfy2CR5VbMZg7WD0jCZCugSvICJjPjDkgYKK2EOn5tgCEZNfMIu77q45w== - dependencies: - "7zip-bin" "~4.1.0" - "@types/debug" "^4.1.4" - app-builder-bin "3.0.3" - bluebird-lst "^1.0.9" - builder-util-runtime "8.2.5" - chalk "^2.4.2" - debug "^4.1.1" - fs-extra-p "^8.0.2" + fs-extra "^8.1.0" is-ci "^2.0.0" js-yaml "^3.13.1" source-map-support "^0.5.12" @@ -1379,7 +1323,7 @@ columnify@~1.5.4: combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.6" - resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" + resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" dependencies: delayed-stream "~1.0.0" @@ -1539,7 +1483,7 @@ create-error-class@^3.0.0: create-hash@^1.1.0, create-hash@^1.1.2: version "1.2.0" - resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + resolved "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" dependencies: cipher-base "^1.0.1" inherits "^2.0.1" @@ -1549,7 +1493,7 @@ create-hash@^1.1.0, create-hash@^1.1.2: create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: version "1.1.7" - resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + resolved "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" dependencies: cipher-base "^1.0.3" create-hash "^1.1.0" @@ -1804,22 +1748,22 @@ dezalgo@^1.0.0, dezalgo@~1.0.3: diffie-hellman@^5.0.0: version "5.0.3" - resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" + resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" dependencies: bn.js "^4.1.0" miller-rabin "^4.0.0" randombytes "^2.0.0" -dmg-builder@6.7.2: - version "6.7.2" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.7.2.tgz#4ba4955e7f35f159ce53c68d74d3ea74875f9afd" - integrity sha512-xfYOwhHjOSOIqkk8A0h8zcaio/WyzrAWpMTu9hzV3Z5PI4tOG0Pq6a9Lh/mHr1r3bydif8R21qGvKU1Re9CpUg== +dmg-builder@6.9.3: + version "6.9.3" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.9.3.tgz#64ab0cb85d81781d1b998d3fa9d4049e11de3ad7" + integrity sha512-FIq9MW/aZrfQ27dz9F9T3WDCviPfybpkGUpIkPx2ee7xZt3PIDsK00rmGuImWIh5tcDrYh2TVPU2bTcGF5U80A== dependencies: - app-builder-lib "~20.44.4" + app-builder-lib "~21.0.7" bluebird-lst "^1.0.9" - builder-util "~10.1.2" - fs-extra-p "^8.0.2" - iconv-lite "^0.4.24" + builder-util "~10.3.2" + fs-extra "^8.1.0" + iconv-lite "^0.5.0" js-yaml "^3.13.1" parse-color "^1.0.0" sanitize-filename "^1.6.1" @@ -1853,10 +1797,6 @@ dot-prop@^4.1.0: dependencies: is-obj "^1.0.0" -dotenv-expand@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" @@ -1864,11 +1804,7 @@ dotenv-expand@^5.1.0: dotenv@^5.0.1: version "5.0.1" - resolved "http://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" - -dotenv@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" + resolved "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" dotenv@^8.0.0: version "8.0.0" @@ -1904,23 +1840,23 @@ ejs@^2.6.2: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6" integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q== -electron-builder@^20.44.4: - version "20.44.4" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.44.4.tgz#c47981ddf486d582c0ae0f4d530c831010aacad7" - integrity sha512-H8zzP01albkKh2Ec1zc0A7RGriUkHb5M99NJskaYtgKtGATTAGH+r9OIWVk5Hk9c1dLMVudbqEeaSlygMF2asw== +electron-builder@^21.0.8: + version "21.0.8" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.0.8.tgz#3311695c5c2c12db2a70eefcaabee90da2f122f4" + integrity sha512-4B4AyDwjY0sBYa3YWvH06+RL+ucnrR1w865QuAzRsnYxyBokQ0NphIuP/nTNuDp/8u/tF+lGIYxIKFrmMMza0w== dependencies: - app-builder-lib "20.44.4" + app-builder-lib "21.0.8" bluebird-lst "^1.0.9" - builder-util "10.1.2" - builder-util-runtime "8.2.5" + builder-util "10.3.2" + builder-util-runtime "8.3.0" chalk "^2.4.2" - dmg-builder "6.7.2" - fs-extra-p "^8.0.2" + dmg-builder "6.9.3" + fs-extra-p "^8.1.0" is-ci "^2.0.0" lazy-val "^1.0.4" - read-config-file "3.2.2" + read-config-file "4.0.0" sanitize-filename "^1.6.1" - update-notifier "^3.0.0" + update-notifier "^3.0.1" yargs "^13.2.4" electron-config@*: @@ -2024,29 +1960,16 @@ electron-osx-sign@0.4.11: minimist "^1.2.0" plist "^3.0.1" -electron-publish@20.44.4: - version "20.44.4" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.44.4.tgz#f826de3788c4e3848b7f6ebd2c3acb910a1d66cc" - integrity sha512-50NzsKOnNqOpGJzPl04vMyitdguUvp15FWKWtu4KISsHfgdLMWGgxHGZwfMphc/vf364zXvPHsYQza3MASgaEQ== +electron-publish@21.0.7: + version "21.0.7" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.7.tgz#3ae28dbff45210b0cc802c558ffe80331eccd241" + integrity sha512-I8qkaXCLICRSwItcrsN3vD4aVKug8gcVJi8yzC9bQpTCeWkXDVCBg+1v+W9FbMYGgwi/OhLwBkAkpTBzEGIKhA== dependencies: bluebird-lst "^1.0.9" - builder-util "~10.1.2" - builder-util-runtime "^8.2.5" + builder-util "~10.3.2" + builder-util-runtime "8.3.0" chalk "^2.4.2" - fs-extra-p "^8.0.2" - lazy-val "^1.0.4" - mime "^2.4.4" - -electron-publish@21.0.3: - version "21.0.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.0.3.tgz#328b92dcd1a34b0ebe3379913e9d9e1d2bc1fdcc" - integrity sha512-uZtDckKBNOqUVW8oqkC64cG0phfAHOl4YTdCiqKW2c9MosCGVRAXgY0xCTtFcaChRYWpPTnuHQ/Tr9uzSLG1TA== - dependencies: - bluebird-lst "^1.0.9" - builder-util "~10.2.1" - builder-util-runtime "8.2.5" - chalk "^2.4.2" - fs-extra-p "^8.0.2" + fs-extra-p "^8.1.0" lazy-val "^1.0.4" mime "^2.4.4" @@ -2618,20 +2541,13 @@ fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" -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-p@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-8.0.2.tgz#3b8e03ad963358570b70a152b2ee8d1c9eed5bf4" - integrity sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA== +fs-extra-p@^8.0.2, fs-extra-p@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-8.1.0.tgz#781b7105e96cf3c1d3c8a88a83215c8a31c52bae" + integrity sha512-sCLpU5kk5CvrWZvFM9dUlqPgHrE02AEt6XYzF7kDscr5COc7DHfhNfODTXt0bkVNmt5DkvU2uJSYjorxY3bRKA== dependencies: bluebird-lst "^1.0.9" - fs-extra "^8.0.1" + fs-extra "^8.1.0" fs-extra@^4.0.1: version "4.0.3" @@ -2649,12 +2565,12 @@ fs-extra@^7.0.0, fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.0.1.tgz#90294081f978b1f182f347a440a209154344285b" - integrity sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A== +fs-extra@^8.0.1, fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== dependencies: - graceful-fs "^4.1.2" + graceful-fs "^4.2.0" jsonfile "^4.0.0" universalify "^0.1.0" @@ -2863,7 +2779,7 @@ globule@^1.0.0: got@^6.7.1: version "6.7.1" - resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" + resolved "https://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" dependencies: create-error-class "^3.0.0" duplexer3 "^0.1.4" @@ -2894,7 +2810,12 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@~4.1.11: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b" + integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg== + +graceful-fs@~4.1.11: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" @@ -3128,6 +3049,13 @@ iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.0.tgz#59cdde0a2a297cc2aeb0c6445a195ee89f127550" + integrity sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw== + dependencies: + safer-buffer ">= 2.1.2 < 3" + icss-utils@^4.0.0, icss-utils@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" @@ -3419,7 +3347,7 @@ is-number@^3.0.0: is-obj@^1.0.0: version "1.0.1" - resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" is-path-inside@^1.0.0: version "1.0.1" @@ -3548,7 +3476,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.10.0, js-yaml@^3.12.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.5.2: +js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.5.2: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" dependencies: @@ -3831,8 +3759,9 @@ lodash.filter@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" lodash.merge@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash.pull@^4.1.0: version "4.1.0" @@ -3860,8 +3789,9 @@ lodash.without@~4.4.0: resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" + version "4.17.14" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" + integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw== log-symbols@^2.1.0, log-symbols@^2.2.0: version "2.2.0" @@ -4085,7 +4015,7 @@ minimist@0.0.8: minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" - resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" minimist@~0.0.1: version "0.0.10" @@ -4175,7 +4105,7 @@ mixin-object@^2.0.1: mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" - resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: minimist "0.0.8" @@ -4307,10 +4237,10 @@ node-gyp@^4.0.0: tar "^4.4.8" which "1" -node-gyp@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.0.tgz#b5fecc7d86ed739d15a458703251af4b0aa67d3e" - integrity sha512-6IemIMOtCFsMm/GRHBclAKKLOBZgCjvdZVwuIQhJino14BMz5oFASXLTkPgDhbYsucM2979N3/gPLGlzfpky/Q== +node-gyp@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.2.tgz#422f7b7550d2c37952ac184e2a5a2d9fe49a8b77" + integrity sha512-sNcb5O7eJ9XiNAhWZ/UE2bWsBJn3Jb7rayMqMP4wjenlr1DwzZxUmbtmIrl04EU0p5fN2rU9WIDV+u0EbsI8oQ== dependencies: env-paths "^1.0.0" glob "^7.0.3" @@ -4909,7 +4839,7 @@ parent-module@^1.0.0: parse-asn1@^5.0.0: version "5.1.1" - resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" + resolved "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" @@ -5212,7 +5142,7 @@ psl@^1.1.24: public-encrypt@^4.0.0: version "4.0.2" - resolved "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994" + resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994" dependencies: bn.js "^4.1.0" browserify-rsa "^4.0.0" @@ -5470,31 +5400,17 @@ read-cmd-shim@~1.0.1: dependencies: graceful-fs "^4.1.2" -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.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.1" - js-yaml "^3.12.1" - json5 "^2.1.0" - lazy-val "^1.0.4" - -read-config-file@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.3.0.tgz#fdb81476372aa63d39dc74b3b1393e5970d0decf" - integrity sha512-VzA1UVvNwEYQi9wGVa7Cji/E6YNr3VwbPXUcHed00cYoZsqg1kYcMnHgIx8nt0NQjFz/ai/8n8Xq0rmHD153Gg== +read-config-file@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-4.0.0.tgz#d57d6edc3a4c8a0999860e57e85664570ef56cd5" + integrity sha512-ZEqYePqjCkOoZu+HFhpjSB0r1eJ7RNNqf8O5/oxPT85b7ZB910au4AGxxxuJ1b81atdmBpiyODonI6vnefVIAA== dependencies: ajv "^6.10.0" ajv-keywords "^3.4.0" bluebird-lst "^1.0.9" dotenv "^8.0.0" dotenv-expand "^5.1.0" - fs-extra-p "^8.0.2" + fs-extra "^8.1.0" js-yaml "^3.13.1" json5 "^2.1.0" lazy-val "^1.0.4" @@ -5573,7 +5489,7 @@ read@1, read@~1.0.1, read@~1.0.7: "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.2: version "2.3.6" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -5943,10 +5859,10 @@ semver@5.5.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== -semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318" - integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ== +semver@^6.0.0, semver@^6.1.0, semver@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" + integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== semver@~5.3.0: version "5.3.0" @@ -5984,7 +5900,7 @@ setimmediate@^1.0.4: sha.js@^2.4.0, sha.js@^2.4.8: version "2.4.11" - resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" @@ -6658,6 +6574,11 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +tslib@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" + integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + tslib@^1.8.1, tslib@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" @@ -6729,10 +6650,10 @@ typescript@3.2.x: version "3.2.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d" -typescript@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.2.tgz#a09e1dc69bc9551cadf17dba10ee42cf55e5d56c" - integrity sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA== +typescript@^3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977" + integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g== uglify-js@3.4.x: version "3.4.7" @@ -6839,10 +6760,10 @@ update-notifier@^2.3.0: semver-diff "^2.0.0" xdg-basedir "^3.0.0" -update-notifier@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.0.tgz#e9bbf8f0f5b7a2ce6666ca46334fdb29492e8fab" - integrity sha512-6Xe3oF2bvuoj4YECUc52yxVs94yWrxwqHbzyveDktTS1WhnlTRpNcQMxUshcB7nRVGi1jEXiqL5cW1S5WSyzKg== +update-notifier@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250" + integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ== dependencies: boxen "^3.0.0" chalk "^2.0.1" @@ -7001,10 +6922,10 @@ wcwidth@^1.0.0, wcwidth@^1.0.1: dependencies: defaults "^1.0.3" -webpack-cli@^3.3.5: - version "3.3.5" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.5.tgz#f4d1238a66a2843d9cebf189835ea22142e72767" - integrity sha512-w0j/s42c5UhchwTmV/45MLQnTVwRoaUTu9fM5LuyOd/8lFoCNCELDogFoecx5NzRUndO0yD/gF2b02XKMnmAWQ== +webpack-cli@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.6.tgz#2c8c399a2642133f8d736a359007a052e060032c" + integrity sha512-0vEa83M7kJtxK/jUhlpZ27WHIOndz5mghWL2O53kiDoA9DIxSKnfqB92LoqEn77cT4f3H2cZm1BMEat/6AZz3A== dependencies: chalk "2.4.2" cross-spawn "6.0.5" @@ -7034,10 +6955,10 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.35.0: - version "4.35.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.0.tgz#ad3f0f8190876328806ccb7a36f3ce6e764b8378" - integrity sha512-M5hL3qpVvtr8d4YaJANbAQBc4uT01G33eDpl/psRTBCfjxFTihdhin1NtAKB1ruDwzeVdcsHHV3NX+QsAgOosw== +webpack@^4.35.2: + version "4.35.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.2.tgz#5c8b8a66602cbbd6ec65c6e6747914a61c1449b1" + integrity sha512-TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5"