From 4695d7042cabaed8700f1748a7272aecb508970e Mon Sep 17 00:00:00 2001 From: crusader Date: Tue, 2 Oct 2018 14:03:43 +0900 Subject: [PATCH] ing --- @overflow/core/shell.ts | 6 +- electron-builder.json | 15 +-- package.json | 10 +- yarn.lock | 221 +++++++++++++++++++++++----------------- 4 files changed, 138 insertions(+), 114 deletions(-) diff --git a/@overflow/core/shell.ts b/@overflow/core/shell.ts index 80803db..242a295 100644 --- a/@overflow/core/shell.ts +++ b/@overflow/core/shell.ts @@ -1,5 +1,5 @@ /* eslint-disable no-sync */ - +import * as stream from 'stream'; import * as ChildProcess from 'child_process'; import * as os from 'os'; @@ -57,9 +57,9 @@ async function getRawShellEnv(): Promise { cleanup(); }, 5000); - const options = { + const options: ChildProcess.SpawnOptions = { detached: true, - stdio: ['ignore', 'pipe', process.stderr], + stdio: ['ignore', 'pipe', process.stderr as stream.Stream] }; child = ChildProcess.spawn(shell, ['-ilc', 'command env'], options); diff --git a/electron-builder.json b/electron-builder.json index 88f7692..785241f 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -48,9 +48,7 @@ "target": [ { "target": "deb", - "arch": [ - "x64" - ] + "arch": ["x64"] } ], "executableName": "overFlow-NetworkScanner", @@ -73,9 +71,7 @@ "minimumSystemVersion": "10.12.0", "extendInfo": "config/build/darwin/Info.plist", "icon": "config/build/darwin/icon/icon.icns", - "target": [ - "dmg" - ], + "target": ["dmg"], "extraFiles": [ { "from": "build/nrfjprog/unpacked/nrfjprog", @@ -105,10 +101,7 @@ "target": [ { "target": "nsis", - "arch": [ - "x64", - "ia32" - ] + "arch": ["x64", "ia32"] } ], "legalTrademarks": "overFlow", @@ -125,4 +118,4 @@ "artifactName": "${productName} Setup ${version}.${ext}", "menuCategory": "overFlow" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index e039c61..022a918 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,9 @@ "homepage": "https://www.loafle.com", "description": "Desktop App for overFlow Network Scanner", "scripts": { - "postinstall": "yarn electron:builder:install-app-deps", + "postinstall": "npm-run-all -s electron:builder:init electron:builder:install-app-deps", "ng": "ng", - "start": "yarn start:electron:hmr", + "start": "npm-run-all start:electron:hmr", "start:hmr": "ng serve --configuration hmr", "start:electron:hmr": "npm-run-all -p start:hmr wait-on:build:main:dev", "build": "cross-env NODE_ENV=production npm-run-all -s build:renderer:prod build:main:prod", @@ -22,7 +22,8 @@ "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", - "wait-on:build:main:dev": "wait-on http-get://localhost:4200/ && yarn build:main:dev", + "wait-on:build:main:dev": "wait-on http-get://localhost:4200/ && npm-run-all build:main:dev", + "electron:builder:init": "cpx config/package.json build/dist/", "electron:builder:install-app-deps": "electron-builder install-app-deps", "electron:builder:linux": "cross-env NODE_ENV=production npm-run-all build && electron-builder build --linux" }, @@ -66,6 +67,7 @@ "codelyzer": "~4.2.1", "copy-webpack-plugin": "^4.5.2", "core-js": "^2.5.4", + "cpx": "^1.5.0", "cross-env": "^5.2.0", "d3": "^5.7.0", "devtron": "^1.4.0", @@ -104,4 +106,4 @@ "webpack-node-externals": "^1.7.2", "zone.js": "^0.8.26" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 94a1702..d2d6019 100644 --- a/yarn.lock +++ b/yarn.lock @@ -106,8 +106,8 @@ rxjs "^6.0.0" "@angular/animations@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/animations/-/animations-6.1.8.tgz#a1861c7f63aca5bd18ba48e0c736ee7b1f2dac36" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/animations/-/animations-6.1.9.tgz#1d87469e6f6b89a8713570dfbe97700ea85bd007" dependencies: tslib "^1.9.0" @@ -127,14 +127,14 @@ yargs-parser "^10.0.0" "@angular/common@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/common/-/common-6.1.8.tgz#e9106cecd448f24e3a553a6ea9431e113fe3becd" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/common/-/common-6.1.9.tgz#638fa8e8e30626116ea9ea36e6f2f00fed971f77" dependencies: tslib "^1.9.0" "@angular/compiler-cli@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/compiler-cli/-/compiler-cli-6.1.8.tgz#b31842b42a6cee90d0f61f3849fbd15fc6f5ddbf" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/compiler-cli/-/compiler-cli-6.1.9.tgz#9ac56fc3ea274c897ccbb3c3fe0aaa100c01137d" dependencies: chokidar "^1.4.2" minimist "^1.2.0" @@ -142,48 +142,48 @@ tsickle "^0.32.1" "@angular/compiler@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/compiler/-/compiler-6.1.8.tgz#bbbb70961724c6e5755e05fc5d7f4b39d3bb4a0c" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/compiler/-/compiler-6.1.9.tgz#3696659f752b5e239f5186cea72cf17965b59cb8" dependencies: tslib "^1.9.0" "@angular/core@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/core/-/core-6.1.8.tgz#2de584e184dc148a55ec153f8125acdf3e88eae6" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/core/-/core-6.1.9.tgz#a21a35de551c95f276ecbb1f314949cc69326950" dependencies: tslib "^1.9.0" "@angular/forms@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/forms/-/forms-6.1.8.tgz#058429b99fc4c6554fe4943a23d4d6221cb1d9ac" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/forms/-/forms-6.1.9.tgz#d9d8591f4c74270e53e3184eb45e19ba490fdf32" dependencies: tslib "^1.9.0" "@angular/http@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/http/-/http-6.1.8.tgz#8c627a879285a366e960edc15522006474f4ec6f" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/http/-/http-6.1.9.tgz#241f35207d62f86bc155feb124a1e73515d66fb6" dependencies: tslib "^1.9.0" "@angular/language-service@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/language-service/-/language-service-6.1.8.tgz#2b076eca1e415204a4e2e8e4b066d258a7fe16fd" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/language-service/-/language-service-6.1.9.tgz#ca82f51775bcf9ccf56421229ac9016bb63b9885" "@angular/platform-browser-dynamic@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.8.tgz#a0c523857e9e55343e6e1747052141d870d4e870" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.9.tgz#e00f1a4948b4c299b17c9561d83f7ea588117818" dependencies: tslib "^1.9.0" "@angular/platform-browser@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/platform-browser/-/platform-browser-6.1.8.tgz#2a0340995ee4b67809f10e039a872afb7f228403" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/platform-browser/-/platform-browser-6.1.9.tgz#6c832e528c660ad880a16531754e65b9b97d4f9f" dependencies: tslib "^1.9.0" "@angular/router@^6.1.0": - version "6.1.8" - resolved "https://nexus.loafle.net/repository/npm-all/@angular/router/-/router-6.1.8.tgz#7106a55392e9f920358544f431dace2ef3715630" + version "6.1.9" + resolved "https://nexus.loafle.net/repository/npm-all/@angular/router/-/router-6.1.9.tgz#29869e53442703c53a943ce375cbb0a0f36927fb" dependencies: tslib "^1.9.0" @@ -198,10 +198,10 @@ "@babel/highlight" "^7.0.0" "@babel/generator@^7.0.0": - version "7.0.0" - resolved "https://nexus.loafle.net/repository/npm-all/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa" + version "7.1.2" + resolved "https://nexus.loafle.net/repository/npm-all/@babel/generator/-/generator-7.1.2.tgz#fde75c072575ce7abbd97322e8fef5bae67e4630" dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.1.2" jsesc "^2.5.1" lodash "^4.17.10" source-map "^0.5.0" @@ -235,17 +235,17 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0": - version "7.1.0" - resolved "https://nexus.loafle.net/repository/npm-all/@babel/parser/-/parser-7.1.0.tgz#a7cd42cb3c12aec52e24375189a47b39759b783e" +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.2": + version "7.1.2" + resolved "https://nexus.loafle.net/repository/npm-all/@babel/parser/-/parser-7.1.2.tgz#85c5c47af6d244fab77bce6b9bd830e38c978409" "@babel/template@^7.0.0", "@babel/template@^7.1.0": - version "7.1.0" - resolved "https://nexus.loafle.net/repository/npm-all/@babel/template/-/template-7.1.0.tgz#58cc9572e1bfe24fe1537fdf99d839d53e517e22" + version "7.1.2" + resolved "https://nexus.loafle.net/repository/npm-all/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644" dependencies: "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.1.2" + "@babel/types" "^7.1.2" "@babel/traverse@^7.0.0": version "7.1.0" @@ -261,9 +261,9 @@ globals "^11.1.0" lodash "^4.17.10" -"@babel/types@^7.0.0": - version "7.0.0" - resolved "https://nexus.loafle.net/repository/npm-all/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118" +"@babel/types@^7.0.0", "@babel/types@^7.1.2": + version "7.1.2" + resolved "https://nexus.loafle.net/repository/npm-all/@babel/types/-/types-7.1.2.tgz#183e7952cf6691628afdc2e2b90d03240bac80c0" dependencies: esutils "^2.0.2" lodash "^4.17.10" @@ -343,24 +343,24 @@ semver-intersect "^1.1.2" "@types/d3-array@*": - version "1.2.1" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-array/-/d3-array-1.2.1.tgz#e489605208d46a1c9d980d2e5772fa9c75d9ec65" + version "1.2.2" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-array/-/d3-array-1.2.2.tgz#29edf3e2001e5f4e33e899fcda52ee2387401792" "@types/d3-axis@*": - version "1.0.10" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-axis/-/d3-axis-1.0.10.tgz#41d6b3ea9032f9531ec0d71d83bcf49294511210" + version "1.0.11" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-axis/-/d3-axis-1.0.11.tgz#efd975f9fec14c2afd03828f3acec0ef97d37c3b" dependencies: "@types/d3-selection" "*" "@types/d3-brush@*": - version "1.0.8" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-brush/-/d3-brush-1.0.8.tgz#2bb9b93e58115da9e0c94ac2b865e34d3631b69b" + version "1.0.9" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-brush/-/d3-brush-1.0.9.tgz#c71070845946eeee4cf330e04123a3997e6476bf" dependencies: "@types/d3-selection" "*" "@types/d3-chord@*": - version "1.0.7" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-chord/-/d3-chord-1.0.7.tgz#6cb982d84c02bf1b05874d921316451546fde9c3" + version "1.0.8" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-chord/-/d3-chord-1.0.8.tgz#08c0fbb10281be0a5b3fdf48c9c081af02f79fb6" "@types/d3-collection@*": version "1.0.7" @@ -420,8 +420,8 @@ resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-hierarchy/-/d3-hierarchy-1.1.4.tgz#b04dfcb1f2074da789ada10fe4942d13f0bce421" "@types/d3-interpolate@*": - version "1.2.0" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-interpolate/-/d3-interpolate-1.2.0.tgz#b5587e013f8afbbc0194046e6a66bb7b8f1c8619" + version "1.3.0" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-interpolate/-/d3-interpolate-1.3.0.tgz#65b9627900bfdd82474875d9b23d574a4388af7c" dependencies: "@types/d3-color" "*" @@ -446,8 +446,8 @@ resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-scale-chromatic/-/d3-scale-chromatic-1.3.0.tgz#b8b58a7a262a583fc1c95ce851d5a75811875034" "@types/d3-scale@*": - version "2.0.1" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-scale/-/d3-scale-2.0.1.tgz#f94cd991c50422b2e68d8f43be3f9fffdb1ae7be" + version "2.0.2" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-scale/-/d3-scale-2.0.2.tgz#61145948aa1a52ab31384766cd013308699112b3" dependencies: "@types/d3-time" "*" @@ -474,8 +474,8 @@ resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-timer/-/d3-timer-1.0.8.tgz#a3441d9605367059e14ad8c3494132143cbc8d58" "@types/d3-transition@*": - version "1.1.2" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-transition/-/d3-transition-1.1.2.tgz#1106fc3129decc9ad5682a9f52b2dfa52f14e57c" + version "1.1.3" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-transition/-/d3-transition-1.1.3.tgz#efcf4941dae22135d595514ba488f4f370d396b0" dependencies: "@types/d3-selection" "*" @@ -484,8 +484,8 @@ resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-voronoi/-/d3-voronoi-1.1.8.tgz#a039cb8368bce4efc1a70aebe744d210851cf1a7" "@types/d3-zoom@*": - version "1.7.1" - resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-zoom/-/d3-zoom-1.7.1.tgz#0d69be0bf5849cffb66f48e4258c838436b43822" + version "1.7.2" + resolved "https://nexus.loafle.net/repository/npm-all/@types/d3-zoom/-/d3-zoom-1.7.2.tgz#ee67f063199c179949d83b6b1e6166207de5f06e" dependencies: "@types/d3-interpolate" "*" "@types/d3-selection" "*" @@ -545,8 +545,8 @@ resolved "https://nexus.loafle.net/repository/npm-all/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9" "@types/jasminewd2@~2.0.3": - version "2.0.3" - resolved "https://nexus.loafle.net/repository/npm-all/@types/jasminewd2/-/jasminewd2-2.0.3.tgz#0d2886b0cbdae4c0eeba55e30792f584bf040a95" + version "2.0.4" + resolved "https://nexus.loafle.net/repository/npm-all/@types/jasminewd2/-/jasminewd2-2.0.4.tgz#12422ee719f372d30c3cc7d99cc72dadba6ace01" dependencies: "@types/jasmine" "*" @@ -555,16 +555,16 @@ resolved "https://nexus.loafle.net/repository/npm-all/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9" "@types/node@*": - version "10.11.0" - resolved "https://nexus.loafle.net/repository/npm-all/@types/node/-/node-10.11.0.tgz#ddd0d67a3b6c3810dd1a59e36675fa82de5e19ae" + version "10.11.3" + resolved "https://nexus.loafle.net/repository/npm-all/@types/node/-/node-10.11.3.tgz#c055536ac8a5e871701aa01914be5731539d01ee" "@types/node@^6.0.46": version "6.0.117" resolved "https://nexus.loafle.net/repository/npm-all/@types/node/-/node-6.0.117.tgz#ccfc2506001404708528d657aad9c1b931111646" "@types/node@^8.0.24", "@types/node@^8.10.4": - version "8.10.30" - resolved "https://nexus.loafle.net/repository/npm-all/@types/node/-/node-8.10.30.tgz#2c82cbed5f79d72280c131d2acffa88fbd8dd353" + version "8.10.31" + resolved "https://nexus.loafle.net/repository/npm-all/@types/node/-/node-8.10.31.tgz#1d9033eebdbc4dc139ff7af36e003a56dbf4ed79" "@types/q@^0.0.32": version "0.0.32" @@ -803,8 +803,8 @@ ansi-align@^2.0.0: string-width "^2.0.0" ansi-colors@^3.0.0: - version "3.0.6" - resolved "https://nexus.loafle.net/repository/npm-all/ansi-colors/-/ansi-colors-3.0.6.tgz#a0b9e00e8c1cc6685b1c3130dbeb9abed03ca6a4" + version "3.1.0" + resolved "https://nexus.loafle.net/repository/npm-all/ansi-colors/-/ansi-colors-3.1.0.tgz#dcfaacc90ef9187de413ec3ef8d5eb981a98808f" ansi-html@0.0.7: version "0.0.7" @@ -1099,7 +1099,7 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-runtime@^6.22.0, babel-runtime@^6.26.0: +babel-runtime@^6.22.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2: version "6.26.0" resolved "https://nexus.loafle.net/repository/npm-all/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" dependencies: @@ -1532,8 +1532,8 @@ camelcase@^4.0.0, camelcase@^4.1.0: resolved "https://nexus.loafle.net/repository/npm-all/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864: - version "1.0.30000887" - resolved "https://nexus.loafle.net/repository/npm-all/caniuse-lite/-/caniuse-lite-1.0.30000887.tgz#1769458c27bbdcf61b0cb6b5072bb6cd11fd9c23" + version "1.0.30000888" + resolved "https://nexus.loafle.net/repository/npm-all/caniuse-lite/-/caniuse-lite-1.0.30000888.tgz#22edb50d91dd70612b5898e3b36f460600c6492f" capture-stack-trace@^1.0.0: version "1.0.1" @@ -1561,7 +1561,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chokidar@^1.4.1, chokidar@^1.4.2: +chokidar@^1.4.1, chokidar@^1.4.2, chokidar@^1.6.0: version "1.7.0" resolved "https://nexus.loafle.net/repository/npm-all/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -1916,6 +1916,22 @@ cosmiconfig@^4.0.0: parse-json "^4.0.0" require-from-string "^2.0.1" +cpx@^1.5.0: + version "1.5.0" + resolved "https://nexus.loafle.net/repository/npm-all/cpx/-/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f" + dependencies: + babel-runtime "^6.9.2" + chokidar "^1.6.0" + duplexer "^0.1.1" + glob "^7.0.5" + glob2base "^0.0.12" + minimatch "^3.0.2" + mkdirp "^0.5.1" + resolve "^1.1.7" + safe-buffer "^5.0.1" + shell-quote "^1.6.1" + subarg "^1.0.0" + create-ecdh@^4.0.0: version "4.0.3" resolved "https://nexus.loafle.net/repository/npm-all/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -2524,11 +2540,11 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -dom-converter@~0.1: - version "0.1.4" - resolved "https://nexus.loafle.net/repository/npm-all/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b" +dom-converter@~0.2: + version "0.2.0" + resolved "https://nexus.loafle.net/repository/npm-all/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" dependencies: - utila "~0.3" + utila "~0.4" dom-serialize@^2.2.0: version "2.2.1" @@ -2725,8 +2741,8 @@ electron-publish@20.28.3: mime "^2.3.1" electron-to-chromium@^1.3.47: - version "1.3.70" - resolved "https://nexus.loafle.net/repository/npm-all/electron-to-chromium/-/electron-to-chromium-1.3.70.tgz#ded377256d92d81b4257d36c65aa890274afcfd2" + version "1.3.73" + resolved "https://nexus.loafle.net/repository/npm-all/electron-to-chromium/-/electron-to-chromium-1.3.73.tgz#aa67787067d58cc3920089368b3b8d6fe0fc12f6" electron-window-state@^5.0.1: version "5.0.1" @@ -2737,8 +2753,8 @@ electron-window-state@^5.0.1: mkdirp "^0.5.1" electron@^2.0.9: - version "2.0.10" - resolved "https://nexus.loafle.net/repository/npm-all/electron/-/electron-2.0.10.tgz#9d7cccd33698e12ecda4d3f585b3bd678a4d4546" + version "2.0.11" + resolved "https://nexus.loafle.net/repository/npm-all/electron/-/electron-2.0.11.tgz#8e352a83ec607471e82d323a2adc7e7b53698e79" dependencies: "@types/node" "^8.0.24" electron-download "^3.0.1" @@ -2852,12 +2868,12 @@ es-abstract@^1.4.3, es-abstract@^1.5.1: is-regex "^1.0.4" es-to-primitive@^1.1.1: - version "1.1.1" - resolved "https://nexus.loafle.net/repository/npm-all/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" + version "1.2.0" + resolved "https://nexus.loafle.net/repository/npm-all/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" dependencies: - is-callable "^1.1.1" + is-callable "^1.1.4" is-date-object "^1.0.1" - is-symbol "^1.0.1" + is-symbol "^1.0.2" es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: version "0.10.46" @@ -3256,6 +3272,10 @@ find-cache-dir@^1.0.0: make-dir "^1.0.0" pkg-dir "^2.0.0" +find-index@^0.1.1: + version "0.1.1" + resolved "https://nexus.loafle.net/repository/npm-all/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" + find-up@^1.0.0: version "1.1.2" resolved "https://nexus.loafle.net/repository/npm-all/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -3488,6 +3508,12 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" +glob2base@^0.0.12: + version "0.0.12" + resolved "https://nexus.loafle.net/repository/npm-all/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" + dependencies: + find-index "^0.1.1" + glob@7.0.x: version "7.0.6" resolved "https://nexus.loafle.net/repository/npm-all/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" @@ -4047,7 +4073,7 @@ is-builtin-module@^1.0.0: dependencies: builtin-modules "^1.0.0" -is-callable@^1.1.1, is-callable@^1.1.3: +is-callable@^1.1.3, is-callable@^1.1.4: version "1.1.4" resolved "https://nexus.loafle.net/repository/npm-all/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" @@ -4238,7 +4264,7 @@ is-stream@^1.0.0, is-stream@^1.1.0: version "1.1.0" resolved "https://nexus.loafle.net/repository/npm-all/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" -is-symbol@^1.0.1: +is-symbol@^1.0.2: version "1.0.2" resolved "https://nexus.loafle.net/repository/npm-all/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" dependencies: @@ -5172,8 +5198,8 @@ multicast-dns@^6.0.1: thunky "^1.0.2" nan@^2.10.0, nan@^2.9.2: - version "2.11.0" - resolved "https://nexus.loafle.net/repository/npm-all/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099" + version "2.11.1" + resolved "https://nexus.loafle.net/repository/npm-all/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766" nan@~2.10.0: version "2.10.0" @@ -6060,14 +6086,15 @@ psl@^1.1.24: resolved "https://nexus.loafle.net/repository/npm-all/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" public-encrypt@^4.0.0: - version "4.0.2" - resolved "https://nexus.loafle.net/repository/npm-all/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994" + version "4.0.3" + resolved "https://nexus.loafle.net/repository/npm-all/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" dependencies: bn.js "^4.1.0" browserify-rsa "^4.0.0" create-hash "^1.1.0" parse-asn1 "^5.0.0" randombytes "^2.0.1" + safe-buffer "^5.1.2" pump@^2.0.0, pump@^2.0.1: version "2.0.1" @@ -6348,14 +6375,14 @@ remove-trailing-separator@^1.0.1: resolved "https://nexus.loafle.net/repository/npm-all/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" renderkid@^2.0.1: - version "2.0.1" - resolved "https://nexus.loafle.net/repository/npm-all/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319" + version "2.0.2" + resolved "https://nexus.loafle.net/repository/npm-all/renderkid/-/renderkid-2.0.2.tgz#12d310f255360c07ad8fde253f6c9e9de372d2aa" dependencies: css-select "^1.1.0" - dom-converter "~0.1" + dom-converter "~0.2" htmlparser2 "~3.3.0" strip-ansi "^3.0.0" - utila "~0.3" + utila "^0.4.0" repeat-element@^1.1.2: version "1.1.3" @@ -6945,15 +6972,15 @@ source-map@~0.2.0: amdefine ">=0.0.4" spdx-correct@^3.0.0: - version "3.0.0" - resolved "https://nexus.loafle.net/repository/npm-all/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" + version "3.0.1" + resolved "https://nexus.loafle.net/repository/npm-all/spdx-correct/-/spdx-correct-3.0.1.tgz#434434ff9d1726b4d9f4219d1004813d80639e30" dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.1.0" - resolved "https://nexus.loafle.net/repository/npm-all/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" + version "2.2.0" + resolved "https://nexus.loafle.net/repository/npm-all/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" spdx-expression-parse@^3.0.0: version "3.0.0" @@ -7211,6 +7238,12 @@ stylus@^0.54.5: sax "0.5.x" source-map "0.1.x" +subarg@^1.0.0: + version "1.0.0" + resolved "https://nexus.loafle.net/repository/npm-all/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" + dependencies: + minimist "^1.1.0" + sumchecker@^1.2.0: version "1.3.1" resolved "https://nexus.loafle.net/repository/npm-all/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d" @@ -7699,11 +7732,7 @@ util@^0.10.3: dependencies: inherits "2.0.3" -utila@~0.3: - version "0.3.3" - resolved "https://nexus.loafle.net/repository/npm-all/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226" - -utila@~0.4: +utila@^0.4.0, utila@~0.4: version "0.4.0" resolved "https://nexus.loafle.net/repository/npm-all/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" @@ -7822,8 +7851,8 @@ webdriver-manager@^12.0.6: xml2js "^0.4.17" webpack-cli@^3.1.0: - version "3.1.1" - resolved "https://nexus.loafle.net/repository/npm-all/webpack-cli/-/webpack-cli-3.1.1.tgz#92be3e324c1788208a301172139febb476566262" + version "3.1.2" + resolved "https://nexus.loafle.net/repository/npm-all/webpack-cli/-/webpack-cli-3.1.2.tgz#17d7e01b77f89f884a2bbf9db545f0f6a648e746" dependencies: chalk "^2.4.1" cross-spawn "^6.0.5"