diff --git a/app/package.json b/app/package.json index 38bf233b..f9f42355 100644 --- a/app/package.json +++ b/app/package.json @@ -10,8 +10,8 @@ "url": "https://github.com/LN-Zap/zap-desktop" }, "scripts": { - "postinstall": "npm rebuild --runtime=electron --target=1.6.16 --disturl=https://atom.io/download/atom-shell --build-from-source", - "install-grpc": "cd node_modules/grpc && git submodule update --init && npm run electron-build -- --target=1.6.16" + "postinstall": "npm rebuild --runtime=electron --target=1.8.4 --disturl=https://atom.io/download/atom-shell --build-from-source", + "install-grpc": "cd node_modules/grpc && git submodule update --init && npm run electron-build -- --target=1.8.4" }, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 24da0a80..47cf9146 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,15 @@ "test-watch": "npm test -- --watch", "install-grpc": "cd app && npm run install-grpc" }, - "browserslist": "electron 1.6", + "browserslist": "electron 1.8", "engines": { - "node": ">=8.0.0", - "npm": ">=5.0.0" + "node": ">=8.2.1", + "npm": ">=5.3.0" + }, + "devEngines": { + "node": ">=8.2.1", + "npm": ">=5.3.0", + "yarn": ">=0.21.3" }, "build": { "productName": "Zap", @@ -187,7 +192,7 @@ "rimraf": "^2.6.1", "sass-loader": "^6.0.6", "sinon": "^2.3.5", - "spectron": "^3.7.0", + "spectron": "^3.8.0", "style-loader": "^0.18.1", "stylelint": "^9.1.1", "stylelint-config-standard": "^18.2.0", @@ -206,7 +211,7 @@ "d3-selection": "^1.2.0", "d3-zoom": "^1.7.1", "devtron": "^1.4.0", - "electron": "1.6.16", + "electron": "1.8.4", "electron-debug": "^1.2.0", "font-awesome": "^4.7.0", "history": "^4.6.3", @@ -232,11 +237,6 @@ "source-map-support": "^0.4.15", "xtend": "^4.0.1" }, - "devEngines": { - "node": ">=7.x", - "npm": ">=4.x", - "yarn": ">=0.21.3" - }, "main": "webpack.config.base.js", "directories": { "test": "test" diff --git a/yarn.lock b/yarn.lock index 0a4daa9d..c01378a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -99,9 +99,9 @@ version "6.0.78" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470" -"@types/node@^7.0.18": - version "7.0.52" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.52.tgz#8990d3350375542b0c21a83cd0331e6a8fc86716" +"@types/node@^8.0.24": + version "8.9.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.5.tgz#162b864bc70be077e6db212b322754917929e976" abab@^1.0.3: version "1.0.3" @@ -222,7 +222,7 @@ ansi-align@^2.0.0: dependencies: string-width "^2.0.0" -ansi-escapes@^1.1.0, ansi-escapes@^1.4.0: +ansi-escapes@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" @@ -230,6 +230,10 @@ ansi-escapes@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b" +ansi-escapes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92" + ansi-html@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" @@ -317,9 +321,9 @@ archiver-utils@^1.3.0: normalize-path "^2.0.0" readable-stream "^2.0.0" -archiver@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-1.3.0.tgz#4f2194d6d8f99df3f531e6881f14f15d55faaf22" +archiver@~2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc" dependencies: archiver-utils "^1.3.0" async "^2.0.0" @@ -328,8 +332,7 @@ archiver@~1.3.0: lodash "^4.8.0" readable-stream "^2.0.0" tar-stream "^1.5.0" - walkdir "^0.0.11" - zip-stream "^1.1.0" + zip-stream "^1.2.0" are-we-there-yet@~1.1.2: version "1.1.4" @@ -1510,7 +1513,7 @@ babel-register@^6.24.1: mkdirp "^0.5.1" source-map-support "^0.4.2" -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@~6.23.0: +babel-runtime@^6.18.0, babel-runtime@^6.22.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b" dependencies: @@ -2378,9 +2381,9 @@ compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" -compress-commons@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.0.tgz#58587092ef20d37cb58baf000112c9278ff73b9f" +compress-commons@^1.2.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f" dependencies: buffer-crc32 "^0.2.1" crc32-stream "^2.0.0" @@ -2928,9 +2931,9 @@ deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" -deepmerge@~1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.3.2.tgz#1663691629d4dbfe364fa12a2a4f0aa86aa3a050" +deepmerge@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.0.1.tgz#25c1c24f110fb914f80001b925264dd77f3f4312" default-require-extensions@^1.0.0: version "1.0.0" @@ -3243,9 +3246,9 @@ electron-builder@^19.49.2: update-notifier "^2.3.0" yargs "^10.0.3" -electron-chromedriver@~1.7.0: - version "1.7.1" - resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-1.7.1.tgz#008c97976007aa4eb18491ee095e94d17ee47610" +electron-chromedriver@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-1.8.0.tgz#901714133cf6f6093d365e1f44a52d99624d8241" dependencies: electron-download "^4.1.0" extract-zip "^1.6.5" @@ -3363,11 +3366,11 @@ electron-to-chromium@^1.3.36: version "1.3.37" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.37.tgz#4a92734e0044c8cf0b1553be57eae21a4c6e5fab" -electron@1.6.16: - version "1.6.16" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.6.16.tgz#f37a8f49cc2625059c99eb266dee4dffe0917b63" +electron@1.8.4: + version "1.8.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.4.tgz#cca8d0e6889f238f55b414ad224f03e03b226a38" dependencies: - "@types/node" "^7.0.18" + "@types/node" "^8.0.24" electron-download "^3.0.1" extract-zip "^1.0.3" @@ -3928,7 +3931,7 @@ extend@3.0.1, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" -external-editor@^2.0.1, external-editor@^2.0.4: +external-editor@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.0.4.tgz#1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972" dependencies: @@ -4995,22 +4998,23 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@~3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347" +inquirer@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" dependencies: - ansi-escapes "^1.1.0" - chalk "^1.0.0" + ansi-escapes "^3.0.0" + chalk "^2.0.0" cli-cursor "^2.1.0" cli-width "^2.0.0" - external-editor "^2.0.1" + external-editor "^2.0.4" figures "^2.0.0" lodash "^4.3.0" mute-stream "0.0.7" run-async "^2.2.0" - rx "^4.1.0" - string-width "^2.0.0" - strip-ansi "^3.0.0" + rx-lite "^4.0.8" + rx-lite-aggregates "^4.0.8" + string-width "^2.1.0" + strip-ansi "^4.0.0" through "^2.3.6" int64-buffer@^0.1.10: @@ -8247,7 +8251,7 @@ request-promise-native@^1.0.3: stealthy-require "^1.1.0" tough-cookie ">=2.3.0" -request@2, request@^2.65.0, request@^2.69.0, request@^2.79.0, request@^2.81.0, request@~2.81.0: +request@2, request@^2.69.0, request@^2.79.0, request@^2.81.0: version "2.81.0" resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" dependencies: @@ -8274,7 +8278,7 @@ request@2, request@^2.65.0, request@^2.69.0, request@^2.79.0, request@^2.81.0, r tunnel-agent "^0.6.0" uuid "^3.0.0" -request@^2.45.0: +request@^2.45.0, request@~2.83.0: version "2.83.0" resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" dependencies: @@ -8414,10 +8418,6 @@ rx@2.3.24: version "2.3.24" resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7" -rx@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" - 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" @@ -8809,15 +8809,15 @@ specificity@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42" -spectron@^3.7.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/spectron/-/spectron-3.7.1.tgz#818f68584732187d757da1d7a352adfc89ba136b" +spectron@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/spectron/-/spectron-3.8.0.tgz#122c3562fd7e92b7cdf6f94094aa495b150dfa51" dependencies: dev-null "^0.1.1" - electron-chromedriver "~1.7.0" - request "^2.65.0" + electron-chromedriver "~1.8.0" + request "^2.81.0" split "^1.0.0" - webdriverio "^4.0.4" + webdriverio "^4.8.0" speedometer@~0.1.2: version "0.1.4" @@ -9094,7 +9094,7 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" -supports-color@^3.1.1, supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3: +supports-color@^3.1.1, supports-color@^3.1.2, supports-color@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" dependencies: @@ -9124,6 +9124,12 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +supports-color@~5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.0.1.tgz#1c5331f22250c84202805b2f17adf16699f3a39a" + dependencies: + has-flag "^2.0.0" + svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" @@ -9704,10 +9710,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" -validator@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-7.0.0.tgz#c74deb8063512fac35547938e6f0b1504a282fd2" - value-equal@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.1.tgz#c220a304361fce6994dbbedaa3c7e1a1b895871d" @@ -9765,10 +9767,6 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" -walkdir@^0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532" - walker@~1.0.5: version "1.0.7" resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" @@ -9803,30 +9801,29 @@ wdio-dot-reporter@~0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/wdio-dot-reporter/-/wdio-dot-reporter-0.0.8.tgz#36195576da0d998210c71948cbb65f5bf11bfc65" -webdriverio@^4.0.4: - version "4.8.0" - resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-4.8.0.tgz#d52929b749080f89967f6e1614051cbc8172d132" +webdriverio@^4.8.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-4.12.0.tgz#e340def272183c8168a4dd0b382322f9d7bee10d" dependencies: - archiver "~1.3.0" - babel-runtime "~6.23.0" + archiver "~2.1.0" + babel-runtime "^6.26.0" css-parse "~2.0.0" css-value "~0.0.1" - deepmerge "~1.3.2" + deepmerge "~2.0.1" ejs "~2.5.6" gaze "~1.1.2" glob "~7.1.1" - inquirer "~3.0.6" + inquirer "~3.3.0" json-stringify-safe "~5.0.1" mkdirp "~0.5.1" npm-install-package "~2.1.0" optimist "~0.6.1" q "~1.5.0" - request "~2.81.0" + request "~2.83.0" rgb2hex "~0.1.0" - safe-buffer "~5.0.1" - supports-color "~3.2.3" + safe-buffer "~5.1.1" + supports-color "~5.0.0" url "~0.11.0" - validator "~7.0.0" wdio-dot-reporter "~0.0.8" wgxpath "~1.0.0" @@ -10241,11 +10238,11 @@ yauzl@2.4.1: dependencies: fd-slicer "~1.0.1" -zip-stream@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.1.1.tgz#5216b48bbb4d2651f64d5c6e6f09eb4a7399d557" +zip-stream@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04" dependencies: archiver-utils "^1.3.0" - compress-commons "^1.1.0" + compress-commons "^1.2.0" lodash "^4.8.0" readable-stream "^2.0.0"