From cb7123dcc3584abf1b4495c8378e9ca20f90b524 Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 17:05:41 -0300 Subject: [PATCH 1/8] feature: setup electron dependencies --- package.json | 43 ++- yarn.lock | 932 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 944 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 74c732d..ba3cd9e 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,19 @@ "main": "index.js", "license": "MIT", "scripts": { - "start": "yarn dev", + "start": "concurrently \"cross-env BROWSER=none yarn dev\" \"wait-on http://0.0.0.0:8080 && yarn electron:dev\"", "dev": "webpack-dev-server --config config/webpack-dev.config.js --mode development --open --hot", "build": "rm -rf dist && webpack --config config/webpack-prod.config.js --mode production --env.NODE_ENV=production", "lint:precommit": "eslint ./app/", "flow:precommit": "glow", "flow:coverage": "flow-coverage-report -t html -i 'app/**/*.js' -x 'dist/*.js' --threshold 70", - "flow:report": "yarn flow:coverage && cd ./flow-coverage && open index.html" + "flow:report": "yarn flow:coverage && cd ./flow-coverage && open index.html", + "electron:dev": "electron -r @babel/register .", + "electron:prepare": "yarn icon:build && rm -rf dist && mkdir dist", + "electron:pack": "yarn electron:prepare && electron-builder --dir", + "electron:dist": "yarn electron:prepare && electron-builder", + "preelectron:prepare": "yarn build", + "icon:build": "./node_modules/.bin/electron-icon-maker --input=build-assets/icon.png --output=./build" }, "author": { "name": "André Neves", @@ -29,7 +35,15 @@ "@babel/preset-react": "^7.0.0", "babel-eslint": "^10.0.1", "babel-loader": "^8.0.4", + "concurrently": "^4.1.0", + "cross-env": "^5.2.0", "css-loader": "^1.0.1", + "electron": "^3.0.10", + "electron-builder": "^20.36.2", + "electron-is-dev": "^1.0.1", + "electron-log": "^2.2.17", + "electron-positioner": "^4.1.0", + "electron-updater": "^4.0.4", "eslint": "^5.8.0", "eslint-config-airbnb": "^17.1.0", "eslint-plugin-flowtype": "^3.2.0", @@ -47,12 +61,14 @@ "sass-loader": "^7.1.0", "style-loader": "^0.23.1", "uglifyjs-webpack-plugin": "^2.0.1", + "wait-on": "^3.2.0", "webpack": "^4.4.1", "webpack-bundle-analyzer": "^3.0.3", "webpack-cli": "^3.1.2", "webpack-dev-server": "^3.1.1" }, "dependencies": { + "@babel/register": "^7.0.0", "autoprefixer": "^9.3.1", "connected-react-router": "^5.0.1", "flow-coverage-report": "^0.6.0", @@ -69,5 +85,26 @@ "pre-commit": [ "lint:precommit", "flow:precommit" - ] + ], + "build": { + "appId": "com.zcash", + "productName": "ZCash", + "asar": true, + "directories": { + "buildResources": "dist", + "output": "build" + }, + "files": [ + "dist/**/*", + "node_modules/**/*" + ], + "mac": { + "category": "public.app-category.productivity", + "type": "distribution", + "target": [ + "pkg", + "dmg" + ] + } + } } diff --git a/yarn.lock b/yarn.lock index 226d3e5..337ddae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"7zip-bin@~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.1.0.tgz#33eff662a5c39c0c2061170cc003c5120743fff0" + integrity sha512-AsnBZN3a8/JcNt+KPkGGODaA4c7l3W5+WpeKgGSbstSLxqWtTXqd1ieJGBQ8IFCtRg8DmmKUcSkIkUc0A4p3YA== + "@babel/cli@^7.0.0": version "7.1.5" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.1.5.tgz#4ccf0a8cdabeefdd8ce955384530f050935bc4d7" @@ -667,6 +672,19 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" +"@babel/register@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0.tgz#fa634bae1bfa429f60615b754fc1f1d745edd827" + integrity sha512-f/+CRmaCe7rVEvcvPvxeA8j5aJhHC3aJie7YuqcMDhUOuyWLA7J/aNrTaHIzoWPEhpHA54mec4Mm8fv8KBlv3g== + dependencies: + core-js "^2.5.7" + find-cache-dir "^1.0.0" + home-or-tmp "^3.0.0" + lodash "^4.17.10" + mkdirp "^0.5.1" + pirates "^4.0.0" + source-map-support "^0.5.9" + "@babel/runtime@^7.1.2": version "7.1.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39" @@ -724,6 +742,11 @@ resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f" integrity sha512-4zAPlpDEh2VwXswwr/t8xGNDGg8RQiPxtxZ3qQEXyQsBV39ptTdESCjuBvGze1nLMVrxmTIKmnO/nAV8Tqjjzg== +"@types/node@^8.0.24": + version "8.10.38" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.38.tgz#e05c201a668492e534b48102aca0294898f449f6" + integrity sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A== + "@webassemblyjs/ast@1.7.11": version "1.7.11" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" @@ -917,7 +940,7 @@ ajv-errors@^1.0.0: resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59" integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk= -ajv-keywords@^3.1.0: +ajv-keywords@^3.1.0, ajv-keywords@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo= @@ -937,6 +960,13 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= +ansi-align@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" + integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= + dependencies: + string-width "^2.0.0" + ansi-colors@^3.0.0: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95" @@ -982,6 +1012,41 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +app-builder-bin@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.5.1.tgz#a5bcff31e4572d8a179bd88a1335bad8e5d62d81" + integrity sha512-Hm+eyyfQCs5N5avLAw3w9Cf1S5TX/t6ecAfHusbzCDh/rLKLKYso2vwDWH4OQZ8uWLnuJwaAUDf3PstRcn0H+A== + +app-builder-lib@20.36.2, app-builder-lib@~20.36.0: + version "20.36.2" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.36.2.tgz#9bc2fb3191eb81afe9af2bc35e9384d3bf7b6f01" + integrity sha512-5FxLnWI13t0LLmh2QjmPx3KW/xhj67su7UxdCzQgULsUmYurdPx8yAOb9YxoX+RpR08inqt+H3GBOJlqSSrVgg== + dependencies: + "7zip-bin" "~4.1.0" + app-builder-bin "2.5.1" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.6" + builder-util "9.3.0" + builder-util-runtime "8.0.2" + chromium-pickle-js "^0.2.0" + debug "^4.1.0" + ejs "^2.6.1" + electron-osx-sign "0.4.11" + electron-publish "20.36.0" + fs-extra-p "^7.0.0" + hosted-git-info "^2.7.1" + is-ci "^1.2.1" + isbinaryfile "^3.0.3" + js-yaml "^3.12.0" + lazy-val "^1.0.3" + minimatch "^3.0.4" + normalize-package-data "^2.4.0" + plist "^3.0.1" + read-config-file "3.2.0" + sanitize-filename "^1.6.1" + semver "^5.6.0" + temp-file "^3.2.0" + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1139,6 +1204,11 @@ async-each@^1.0.0: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" integrity sha1-GdOGodntxufByF04iu28xW0zYC0= +async-exit-hook@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" + integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== + async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" @@ -1275,7 +1345,7 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base64-js@^1.0.2: +base64-js@^1.0.2, base64-js@^1.2.3: version "1.3.0" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3" integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw== @@ -1342,7 +1412,14 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.5.1: +bluebird-lst@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.6.tgz#89bc4de0a357373605c8781f293f7b06d454f869" + integrity sha512-CBWFoPuUPpcvMUxfyr8DKdI5d4kjxFl1h39+VbKxP3KJWJHEsLtuT4pPLkjpxCGU6Ask21tvbnftWXdqIxYldQ== + dependencies: + bluebird "^3.5.2" + +bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2: version "3.5.3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== @@ -1385,6 +1462,19 @@ boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= +boxen@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" + integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw== + dependencies: + ansi-align "^2.0.0" + camelcase "^4.0.0" + chalk "^2.0.1" + cli-boxes "^1.0.0" + string-width "^2.0.0" + term-size "^1.2.0" + widest-line "^2.0.0" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1482,6 +1572,24 @@ browserslist@^4.1.0, browserslist@^4.3.3: electron-to-chromium "^1.3.82" node-releases "^1.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" @@ -1506,6 +1614,34 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" +builder-util-runtime@8.0.2, builder-util-runtime@^8.0.1, builder-util-runtime@~8.0.2: + version "8.0.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.0.2.tgz#9d638a266ca3aa25ced1cff4df74c8fd97dd78cf" + integrity sha512-46AjyMQ1/yBvGnXWmqNGlg8te7jCPCs7TJ0zDC2+4vV/t5iZp2dR1H9UfVpcBxlvBq3dlAOmwb9fz1d9xZN1+Q== + dependencies: + bluebird-lst "^1.0.6" + debug "^4.1.0" + fs-extra-p "^7.0.0" + sax "^1.2.4" + +builder-util@9.3.0, builder-util@~9.3.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.3.0.tgz#1c94c3bd1c9095840d46a59cdf9514852a47ce8a" + integrity sha512-K+kj5vWj4Mk3jOm6kVT9ZwNcECLHe449vdMxYuZpCnn7CSxRm+TeZm9P9ZFCQUID5Hww/Sy4NMFo+VVJh6+Ptw== + dependencies: + "7zip-bin" "~4.1.0" + app-builder-bin "2.5.1" + bluebird-lst "^1.0.6" + builder-util-runtime "^8.0.1" + chalk "^2.4.1" + debug "^4.1.0" + fs-extra-p "^7.0.0" + is-ci "^1.2.1" + js-yaml "^3.12.0" + source-map-support "^0.5.9" + stat-mode "^0.2.2" + temp-file "^3.2.0" + builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -1603,7 +1739,7 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^4.1.0: +camelcase@^4.0.0, camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= @@ -1618,6 +1754,11 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000910.tgz#755d5181d4b006e5a2b59b1ffa05d0a0470039f5" integrity sha512-u/nxtHGAzCGZzIxt3dA/tpSPOcirBZFWKwz1EPz4aaupnBI2XR0Rbr74g0zc6Hzy41OEM4uMoZ38k56TpYAWjQ== +capture-stack-trace@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" + integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -1634,7 +1775,7 @@ chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== @@ -1685,6 +1826,16 @@ chrome-trace-event@^1.0.0: dependencies: tslib "^1.9.0" +chromium-pickle-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" + integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= + +ci-info@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" + integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -1720,6 +1871,11 @@ clear@^0.0.1: resolved "https://registry.yarnpkg.com/clear/-/clear-0.0.1.tgz#e5186e229d99448179c130311b6f9d30bff6b0ba" integrity sha1-5RhuIp2ZRIF5wTAxG2+dML/2sLo= +cli-boxes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" + integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM= + cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" @@ -1787,6 +1943,11 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@~0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd" + integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0= + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" @@ -1824,6 +1985,11 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= + component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -1854,7 +2020,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.4.7, concat-stream@^1.5.0: +concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.5.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -1864,6 +2030,33 @@ concat-stream@^1.4.7, concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" +concurrently@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-4.1.0.tgz#17fdf067da71210685d9ea554423ef239da30d33" + integrity sha512-pwzXCE7qtOB346LyO9eFWpkFJVO3JQZ/qU/feGeaAHiX1M3Rw3zgXKc5cZ8vSH5DGygkjzLFDzA/pwoQDkRNGg== + dependencies: + chalk "^2.4.1" + date-fns "^1.23.0" + lodash "^4.17.10" + read-pkg "^4.0.1" + rxjs "^6.3.3" + spawn-command "^0.0.2-1" + supports-color "^4.5.0" + tree-kill "^1.1.0" + yargs "^12.0.1" + +configstore@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" + integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== + dependencies: + dot-prop "^4.1.0" + graceful-fs "^4.1.2" + make-dir "^1.0.0" + unique-string "^1.0.0" + write-file-atomic "^2.0.0" + xdg-basedir "^3.0.0" + connect-history-api-fallback@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" @@ -1948,7 +2141,7 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= -core-js@^2.4.0: +core-js@^2.4.0, core-js@^2.5.7: version "2.5.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw== @@ -1976,6 +2169,13 @@ create-ecdh@^4.0.0: bn.js "^4.1.0" elliptic "^6.0.0" +create-error-class@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" + integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= + dependencies: + capture-stack-trace "^1.0.0" + create-hash@^1.1.0, create-hash@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" @@ -1999,6 +2199,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-env@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" + integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg== + dependencies: + cross-spawn "^6.0.5" + is-windows "^1.0.0" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -2044,6 +2252,11 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" +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" + integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= + css-color-keywords@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" @@ -2134,12 +2347,17 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +date-fns@^1.23.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6" + integrity sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw== + date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2153,7 +2371,7 @@ debug@=3.1.0: dependencies: ms "2.0.0" -debug@^3.1.0, debug@^3.2.5: +debug@^3.0.0, debug@^3.1.0, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2308,6 +2526,20 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dmg-builder@6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.4.0.tgz#a95a9cb951d8535acc14bde7b1cd3412ccf43c34" + integrity sha512-q84fMrMm9mXh2qH0Sb3+o0gCvfeJRBI+46y+CpQystqgRyB+3bZB11WqCf5d8+qsENhzpi786jR82xbHG1Vvag== + dependencies: + app-builder-lib "~20.36.0" + bluebird-lst "^1.0.6" + builder-util "~9.3.0" + fs-extra-p "^7.0.0" + iconv-lite "^0.4.24" + js-yaml "^3.12.0" + parse-color "^1.0.0" + sanitize-filename "^1.6.1" + dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -2395,11 +2627,33 @@ domutils@1.5.1: dom-serializer "0" domelementtype "1" +dot-prop@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== + dependencies: + is-obj "^1.0.0" + dot@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/dot/-/dot-1.0.3.tgz#f8750bfb6b03c7664eb0e6cb1eb4c66419af9427" integrity sha1-+HUL+2sDx2ZOsObLHrTGZBmvlCc= +dotenv-expand@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" + integrity sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU= + +dotenv@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.1.0.tgz#9853b6ca98292acb7dec67a95018fa40bccff42c" + integrity sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw== + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -2438,11 +2692,109 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== +electron-builder@^20.36.2: + version "20.36.2" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.36.2.tgz#9fefef8c5f08ced5c2085d8331c2ad3c545daef8" + integrity sha512-xPJNt3ZBn5IYlp3pCP0Rvi00JYAKdTeOSLWFrkST1xqWfRZxXrI4uisVD9HQjzRN8hBHhTgTfXtb9uhWPha9eA== + dependencies: + app-builder-lib "20.36.2" + bluebird-lst "^1.0.6" + builder-util "9.3.0" + builder-util-runtime "8.0.2" + chalk "^2.4.1" + dmg-builder "6.4.0" + fs-extra-p "^7.0.0" + is-ci "^1.2.1" + lazy-val "^1.0.3" + read-config-file "3.2.0" + sanitize-filename "^1.6.1" + update-notifier "^2.5.0" + yargs "^12.0.2" + +electron-download@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8" + integrity sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg== + dependencies: + debug "^3.0.0" + env-paths "^1.0.0" + fs-extra "^4.0.1" + minimist "^1.2.0" + nugget "^2.0.1" + path-exists "^3.0.0" + rc "^1.2.1" + semver "^5.4.1" + sumchecker "^2.0.2" + +electron-is-dev@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.0.1.tgz#6e0a184736fe7aea77d18210b0b0f6a02402c4bc" + integrity sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w== + +electron-log@^2.2.17: + version "2.2.17" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.17.tgz#e71e2ebb949fc96ded7cdb99eeee7202e48981d2" + integrity sha512-v+Af5W5z99ehhaLOfE9eTSXUwjzh2wFlQjz51dvkZ6ZIrET6OB/zAZPvsuwT6tm3t5x+M1r+Ed3U3xtPZYAyuQ== + +electron-osx-sign@0.4.11: + version "0.4.11" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz#8377732fe7b207969f264b67582ee47029ce092f" + integrity sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ== + dependencies: + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-positioner@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/electron-positioner/-/electron-positioner-4.1.0.tgz#e158f8f6aabd6725a8a9b4f2279b9504bcbea1b0" + integrity sha512-726DfbI9ZNoCg+Fcu6XLuTKTnzf+6nFqv7h+K/V6Ug7IbaPMI7s9S8URnGtWFCy5N5PL4HSzRFF2mXuinftDdg== + +electron-publish@20.36.0: + version "20.36.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.36.0.tgz#419fe994938af2b158ac4677f72839ad229e05e8" + integrity sha512-LjJ4KoApSLtKyGWotv0B+PoTzpLEdHHXzDF9HLxatPlfoZCmrOexqm7Qiv1ODuYWPac7Zpf2OHitJp8WIOcZRQ== + dependencies: + bluebird-lst "^1.0.6" + builder-util "~9.3.0" + builder-util-runtime "^8.0.1" + chalk "^2.4.1" + fs-extra-p "^7.0.0" + lazy-val "^1.0.3" + mime "^2.3.1" + electron-to-chromium@^1.3.82: version "1.3.84" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.84.tgz#2e55df59e818f150a9f61b53471ebf4f0feecc65" integrity sha512-IYhbzJYOopiTaNWMBp7RjbecUBsbnbDneOP86f3qvS0G0xfzwNSvMJpTrvi5/Y1gU7tg2NAgeg8a8rCYvW9Whw== +electron-updater@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.0.4.tgz#d6a8a7a36cfe2882c8c0ae9ac4056ccf1a96eee9" + integrity sha512-y3wddJQyC5h1UTJhNAWoX4McJ5Z1r1ZDqyifpYWniVS286YCXe1xSLkbe9C6ZzxzPurt1jg2ZubPuBNt/811Dw== + dependencies: + bluebird-lst "^1.0.6" + builder-util-runtime "~8.0.2" + fs-extra-p "^7.0.0" + js-yaml "^3.12.0" + lazy-val "^1.0.3" + lodash.isequal "^4.5.0" + pako "^1.0.6" + semver "^5.6.0" + source-map-support "^0.5.9" + +electron@^3.0.10: + version "3.0.10" + resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.10.tgz#7d412856e8cf0d3041a612a32dd09e2af2d50f50" + integrity sha512-I39IeQP3NOlbjKzTDK8uK2JdiHDfhV5SruCS2Gttkn2MaKCY+yIzQ6Wr4DyBXLeTEkL1sbZxbqQVhCavAliv5w== + dependencies: + "@types/node" "^8.0.24" + electron-download "^4.1.0" + extract-zip "^1.0.3" + elliptic@^6.0.0: version "6.4.1" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a" @@ -2499,6 +2851,11 @@ entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== +env-paths@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" + integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA= + errno@^0.1.3, errno@~0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" @@ -2898,6 +3255,16 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" +extract-zip@^1.0.3: + version "1.6.7" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" + integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= + dependencies: + concat-stream "1.6.2" + debug "2.6.9" + mkdirp "0.5.1" + yauzl "2.4.1" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -2955,6 +3322,13 @@ fbjs@^0.8.5, fbjs@^0.8.9: setimmediate "^1.0.5" ua-parser-js "^0.7.18" +fd-slicer@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" + integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= + dependencies: + pend "~1.2.0" + figgy-pudding@^3.1.0, figgy-pudding@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" @@ -3187,6 +3561,32 @@ fs-exists-sync@^0.1.0: resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" integrity sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= +fs-extra-p@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-7.0.0.tgz#da9a72df71dc77fb938162025a5fc658713c98ab" + integrity sha512-5tg5jBOd0xIXjwj4PDnafOXL5TyPVzjxLby4DPKev53wurEXp7IsojBaD4Lj5M5w7jxw0pbkEU0fFEPmcKoMnA== + dependencies: + bluebird-lst "^1.0.6" + fs-extra "^7.0.0" + +fs-extra@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" + integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" @@ -3322,6 +3722,13 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" +global-dirs@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU= + dependencies: + ini "^1.3.4" + global-modules-path@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.0.tgz#b0e2bac6beac39745f7db5c59d26a36a0b94f7dc" @@ -3392,7 +3799,24 @@ glow@^1.2.2: strip-ansi "^4.0.0" util.promisify "^1.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.2: +got@^6.7.1: + version "6.7.1" + resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" + integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA= + dependencies: + create-error-class "^3.0.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + is-redirect "^1.0.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + lowercase-keys "^1.0.0" + safe-buffer "^5.0.1" + timed-out "^4.0.0" + unzip-response "^2.0.1" + url-parse-lax "^1.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== @@ -3430,6 +3854,11 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +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-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -3524,6 +3953,16 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" +hoek@5.x.x: + version "5.0.4" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da" + integrity sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w== + +hoek@6.x.x: + version "6.0.4" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.0.4.tgz#8db638130825534575e8e4e80f97ca66108e6382" + integrity sha512-9D47elppcwrTx2x9B6TrovxnUtlTBYFcHGgo0+LRA1+YfUkCecT//41ovdh6zbl7whB9Hc2whRO1c6lzPoTgww== + hoist-non-react-statics@^2.5.0: version "2.5.5" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" @@ -3536,6 +3975,11 @@ hoist-non-react-statics@^3.1.0: dependencies: react-is "^16.3.2" +home-or-tmp@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb" + integrity sha1-V6j+JM8zzdUkhgoVgh3cJchmcfs= + homedir-polyfill@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc" @@ -3548,7 +3992,7 @@ hoopy@^0.1.2: resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== -hosted-git-info@^2.1.4: +hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== @@ -3724,6 +4168,11 @@ import-from@^2.1.0: dependencies: resolve-from "^3.0.0" +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + import-local@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" @@ -3894,6 +4343,13 @@ is-callable@^1.1.3, is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-ci@^1.0.10, is-ci@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== + dependencies: + ci-info "^1.5.0" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -3986,6 +4442,19 @@ is-glob@^4.0.0: dependencies: is-extglob "^2.1.1" +is-installed-globally@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" + integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA= + dependencies: + global-dirs "^0.1.0" + is-path-inside "^1.0.0" + +is-npm@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" + integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ= + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -3993,6 +4462,11 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -4029,6 +4503,11 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= +is-redirect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" + integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= + is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -4041,7 +4520,12 @@ is-resolvable@^1.1.0: resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== -is-stream@^1.0.1, is-stream@^1.1.0: +is-retry-allowed@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" + integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= + +is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= @@ -4068,7 +4552,7 @@ is-windows@^0.2.0: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" integrity sha1-3hqm1j6indJIc3tp8f+LgALSEIw= -is-windows@^1.0.2: +is-windows@^1.0.0, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== @@ -4088,6 +4572,20 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isbinaryfile@^3.0.2, isbinaryfile@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + +isemail@3.x.x: + version "3.2.0" + resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c" + integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg== + dependencies: + punycode "2.x.x" + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -4118,6 +4616,15 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +joi@^13.0.0: + version "13.7.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f" + integrity sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q== + dependencies: + hoek "5.x.x" + isemail "3.x.x" + topo "3.x.x" + js-base64@^2.1.8: version "2.4.9" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" @@ -4211,6 +4718,13 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -4257,6 +4771,18 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== +latest-version@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" + integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU= + dependencies: + package-json "^4.0.0" + +lazy-val@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc" + integrity sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg== + lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" @@ -4372,6 +4898,11 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + lodash.mergewith@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" @@ -4412,6 +4943,11 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + lru-cache@^4.0.1, lru-cache@^4.1.3: version "4.1.4" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.4.tgz#51cc46e8e6d9530771c857e24ccc720ecdbcc031" @@ -4499,7 +5035,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1: errno "^0.1.3" readable-stream "^2.0.1" -meow@^3.7.0: +meow@^3.1.0, meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= @@ -4624,7 +5160,7 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@^1.1.3, minimist@^1.2.0: +minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= @@ -4851,6 +5387,11 @@ node-libs-browser@^2.0.0: util "^0.10.3" vm-browserify "0.0.4" +node-modules-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" + integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= + node-pre-gyp@^0.10.0: version "0.10.3" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" @@ -4914,7 +5455,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -4973,6 +5514,19 @@ nth-check@~1.0.1: dependencies: boolbase "~1.0.0" +nugget@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0" + integrity sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA= + dependencies: + debug "^2.1.3" + minimist "^1.1.0" + pretty-bytes "^1.0.2" + progress-stream "^1.1.0" + request "^2.45.0" + single-line-log "^1.1.2" + throttleit "0.0.2" + num2fraction@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" @@ -5007,6 +5561,11 @@ object-keys@^1.0.11, object-keys@^1.0.12: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2" integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag== +object-keys@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" + integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY= + object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -5231,7 +5790,17 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== -pako@~1.0.5: +package-json@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" + integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= + dependencies: + got "^6.7.1" + registry-auth-token "^3.0.1" + registry-url "^3.0.3" + semver "^5.1.0" + +pako@^1.0.6, pako@~1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg== @@ -5263,6 +5832,13 @@ parse-asn1@^5.0.0: evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" +parse-color@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz#7b748b95a83f03f16a94f535e52d7f3d94658619" + integrity sha1-e3SLlag/A/FqlPU15S1/PZRlhhk= + dependencies: + color-convert "~0.5.0" + parse-json@2.2.0, parse-json@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" @@ -5381,6 +5957,11 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -5408,6 +5989,13 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +pirates@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.0.tgz#850b18781b4ac6ec58a43c9ed9ec5fe6796addbd" + integrity sha512-8t5BsXy1LUIjn3WWOlOuFDuKswhQb/tkak641lvBgmPOBUQHXveORtlMCp6OdPV1dtuTaEahKA8VNz6uLfKBtA== + dependencies: + node-modules-regexp "^1.0.0" + pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -5429,6 +6017,15 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" +plist@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" + integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ== + dependencies: + base64-js "^1.2.3" + xmlbuilder "^9.0.7" + xmldom "0.1.x" + pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" @@ -5534,6 +6131,19 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + +pretty-bytes@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84" + integrity sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ= + dependencies: + get-stdin "^4.0.1" + meow "^3.1.0" + pretty-error@^2.0.2: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" @@ -5557,6 +6167,14 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= +progress-stream@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-1.2.0.tgz#2cd3cfea33ba3a89c9c121ec3347abe9ab125f77" + integrity sha1-LNPP6jO6OonJwSHsM0er6asSX3c= + dependencies: + speedometer "~0.1.2" + through2 "~0.2.3" + progress@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" @@ -5655,16 +6273,16 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= +punycode@2.x.x, punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - q@~0.9.6: version "0.9.7" resolved "https://registry.yarnpkg.com/q/-/q-0.9.7.tgz#4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75" @@ -5725,7 +6343,7 @@ raw-body@2.3.3: iconv-lite "0.4.23" unpipe "1.0.0" -rc@^1.2.7: +rc@^1.0.1, rc@^1.1.6, rc@^1.2.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== @@ -5823,6 +6441,21 @@ react@^16.6.0: prop-types "^15.6.2" scheduler "^0.11.2" +read-config-file@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.0.tgz#50a2756a9a128ab9dcbe087e2724c512e3d0ccd1" + integrity sha512-i1QRc5jy4sHm9YBGb6ArA5SU1mDrc5wu2mnm3r9gPnm+LVZhBGbpTCKqAXyvV4TJHnBR3Yaaww+9b3DyRZcfww== + dependencies: + ajv "^6.5.5" + ajv-keywords "^3.2.0" + bluebird-lst "^1.0.6" + dotenv "^6.1.0" + dotenv-expand "^4.2.0" + fs-extra-p "^7.0.0" + js-yaml "^3.12.0" + json5 "^2.1.0" + lazy-val "^1.0.3" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -5874,6 +6507,15 @@ read-pkg@^3.0.0: normalize-package-data "^2.3.2" path-type "^3.0.0" +read-pkg@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237" + integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc= + dependencies: + normalize-package-data "^2.3.2" + parse-json "^4.0.0" + pify "^3.0.0" + "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.2.9, readable-stream@^2.3.3, 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" @@ -5897,6 +6539,16 @@ readable-stream@1.0: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readdirp@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -6010,6 +6662,21 @@ regexpu-core@^4.1.3, regexpu-core@^4.2.0: unicode-match-property-ecmascript "^1.0.4" unicode-match-property-value-ecmascript "^1.0.2" +registry-auth-token@^3.0.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" + integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ== + dependencies: + rc "^1.1.6" + safe-buffer "^5.0.1" + +registry-url@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" + integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI= + dependencies: + rc "^1.0.1" + regjsgen@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" @@ -6072,7 +6739,7 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@^2.87.0, request@^2.88.0: +request@^2.45.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -6215,7 +6882,12 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^6.1.0: +rx@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" + integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= + +rxjs@^6.1.0, rxjs@^6.3.3: version "6.3.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw== @@ -6239,6 +6911,13 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sanitize-filename@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a" + integrity sha1-YS2hyWRz+gLczaktzVtKsWSmdyo= + dependencies: + truncate-utf8-bytes "^1.0.0" + sass-graph@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" @@ -6321,7 +7000,14 @@ selfsigned@^1.9.1: dependencies: node-forge "0.7.5" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1: +semver-diff@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" + integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= + dependencies: + semver "^5.0.3" + +"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== @@ -6447,6 +7133,13 @@ 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= +single-line-log@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/single-line-log/-/single-line-log-1.1.2.tgz#c2f83f273a3e1a16edb0995661da0ed5ef033364" + integrity sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q= + dependencies: + string-width "^1.0.1" + slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -6525,7 +7218,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@~0.5.6: +source-map-support@^0.5.9, source-map-support@~0.5.6: version "0.5.9" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA== @@ -6555,6 +7248,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spawn-command@^0.0.2-1: + version "0.0.2-1" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2-1.tgz#62f5e9466981c1b796dc5929937e11c9c6921bd0" + integrity sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= + spawn-sync@^1.0.15: version "1.0.15" resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" @@ -6622,6 +7320,11 @@ spdy@^3.4.1: select-hose "^2.0.0" spdy-transport "^2.0.18" +speedometer@~0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d" + integrity sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0= + split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -6656,6 +7359,11 @@ ssri@^6.0.0: dependencies: figgy-pudding "^3.5.1" +stat-mode@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502" + integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI= + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -6824,11 +7532,25 @@ stylis@^3.5.0: resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== +sumchecker@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e" + integrity sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4= + dependencies: + debug "^2.2.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@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" + integrity sha1-vnoN5ITexcXN34s9WRJQRJEvY1s= + dependencies: + has-flag "^2.0.0" + supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -6889,6 +7611,15 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" +temp-file@^3.2.0: + version "3.3.2" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.2.tgz#69b6daf1bbe23231d0a5d03844e3d96f3f531aaa" + integrity sha512-FGKccAW0Mux9hC/2bdUIe4bJRv4OyVo4RpVcuplFird1V/YoplIFbnPZjfzbJSf/qNvRZIRB9/4n/RkI0GziuQ== + dependencies: + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.6" + fs-extra-p "^7.0.0" + temp@0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" @@ -6897,6 +7628,13 @@ temp@0.8.3: os-tmpdir "^1.0.0" rimraf "~2.2.6" +term-size@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" + integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk= + dependencies: + execa "^0.7.0" + terminal-table@0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/terminal-table/-/terminal-table-0.0.12.tgz#7b56d009aa6828dfdd10f11b654e79c062965fa2" @@ -6933,6 +7671,11 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +throttleit@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf" + integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8= + through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -6941,6 +7684,14 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" +through2@~0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f" + integrity sha1-6zKE2k6jEbbMis42U3SKUqvyWj8= + dependencies: + readable-stream "~1.1.9" + xtend "~2.1.1" + through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -6951,6 +7702,11 @@ thunky@^1.0.2: resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826" integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow== +timed-out@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= + timers-browserify@^2.0.4: version "2.0.10" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae" @@ -7000,6 +7756,13 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" +topo@3.x.x: + version "3.0.3" + resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c" + integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ== + dependencies: + hoek "6.x.x" + toposort@^1.0.0: version "1.0.7" resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" @@ -7013,6 +7776,11 @@ tough-cookie@~2.4.3: psl "^1.1.24" punycode "^1.4.1" +tree-kill@^1.1.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a" + integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q== + trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" @@ -7035,6 +7803,13 @@ trim-right@^1.0.1: dependencies: glob "^7.1.2" +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + dependencies: + utf8-byte-length "^1.0.1" + tryer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" @@ -7166,6 +7941,18 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" +unique-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" + integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= + dependencies: + crypto-random-string "^1.0.0" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -7179,11 +7966,32 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" +unzip-response@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" + integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= + upath@^1.0.5: version "1.1.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw== +update-notifier@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" + integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw== + dependencies: + boxen "^1.2.1" + chalk "^2.0.1" + configstore "^3.0.0" + import-lazy "^2.1.0" + is-ci "^1.0.10" + is-installed-globally "^0.1.0" + is-npm "^1.0.0" + latest-version "^3.0.0" + semver-diff "^2.0.0" + xdg-basedir "^3.0.0" + upper-case@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" @@ -7201,6 +8009,13 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= + dependencies: + prepend-http "^1.0.1" + url-parse@^1.4.3: version "1.4.4" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8" @@ -7222,6 +8037,11 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -7303,6 +8123,17 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" +wait-on@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-3.2.0.tgz#c83924df0fc42a675c678324c49c769d378bcb85" + integrity sha512-QUGNKlKLDyY6W/qHdxaRlXUAgLPe+3mLL/tRByHpRNcHs/c7dZXbu+OnJWGNux6tU1WFh/Z8aEwvbuzSAu79Zg== + dependencies: + core-js "^2.5.7" + joi "^13.0.0" + minimist "^1.2.0" + request "^2.88.0" + rx "^4.1.0" + warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" @@ -7511,6 +8342,13 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" +widest-line@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" + integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA== + dependencies: + string-width "^2.1.1" + wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" @@ -7536,6 +8374,15 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write-file-atomic@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" + integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA== + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -7550,6 +8397,21 @@ ws@^6.0.0: dependencies: async-limiter "~1.0.0" +xdg-basedir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" + integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= + +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + +xmldom@0.1.x: + version "0.1.27" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9" + integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk= + xregexp@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" @@ -7560,6 +8422,13 @@ xtend@^4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= +xtend@~2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" + integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os= + dependencies: + object-keys "~0.4.0" + y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" @@ -7641,7 +8510,7 @@ yargs@8.0.1: y18n "^3.2.1" yargs-parser "^7.0.0" -yargs@^12.0.2: +yargs@^12.0.1, yargs@^12.0.2: version "12.0.5" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== @@ -7677,3 +8546,10 @@ yargs@^7.0.0: which-module "^1.0.0" y18n "^3.2.1" yargs-parser "^5.0.0" + +yauzl@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" + integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= + dependencies: + fd-slicer "~1.0.1" From 09db7ea6a22a91b4e2aadb47a4c2cc7dabcbcbe6 Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 17:06:38 -0300 Subject: [PATCH 2/8] lint: index.html --- public/index.html | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/public/index.html b/public/index.html index 130f7d1..c79828f 100644 --- a/public/index.html +++ b/public/index.html @@ -1,21 +1,19 @@ - - - - - + + + + + Zcash Reference Wallet - +
- \ No newline at end of file + From c84fe27386d41d952c973f963198d7f3bf69b8e7 Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 17:08:52 -0300 Subject: [PATCH 3/8] feature: add electron starter --- config/electron.js | 104 +++++++++++++++++++++++++++++++++++ index.js | 2 + public/images/zcash-icon.png | Bin 0 -> 24849 bytes utils/debugShortcut.js | 9 +++ 4 files changed, 115 insertions(+) create mode 100644 config/electron.js create mode 100644 index.js create mode 100644 public/images/zcash-icon.png create mode 100644 utils/debugShortcut.js diff --git a/config/electron.js b/config/electron.js new file mode 100644 index 0000000..0b5bfec --- /dev/null +++ b/config/electron.js @@ -0,0 +1,104 @@ +// @flow +import path from 'path' + +import { app, BrowserWindow, powerMonitor, Tray } from 'electron' +import { autoUpdater } from 'electron-updater' +import log from 'electron-log' +import Positioner from 'electron-positioner' +import isDev from 'electron-is-dev' + +import { registerDebugShortcut } from '../utils/debugShortcut' + +import type { BrowserWindow as BrowserWindowType, Tray as TrayType } from 'electron' + +let mainWindow: BrowserWindowType +let tray: TrayType +let updateAvailable = false + +const showStatus = text => { + if (text === 'Update downloaded') updateAvailable = true + + mainWindow.webContents.send('update', { + updateAvailable, + updateInfo: text, + }) +} + +function createWindow() { + autoUpdater.checkForUpdatesAndNotify() + + autoUpdater.on('checking-for-update', () => showStatus('Checking for update')) + autoUpdater.on('update-available', () => showStatus('Update available')) + autoUpdater.on('update-not-available', () => showStatus('No updates available')) + autoUpdater.on('error', err => showStatus(`Error while updating: ${err}`)) + autoUpdater.on('download-progress', progress => + showStatus(` + Download speed: ${progress.bytesPerSecond} - Downloaded ${progress.percent}% (${progress.transferred}/${ + progress.total + }) + `), + ) + autoUpdater.on('update-downloaded', () => { + updateAvailable = true + showStatus('Update downloaded') + }) + + mainWindow = new BrowserWindow({ + width: 800, + height: 600, + transparent: true, + frame: false, + resizable: true, + webPreferences: { + devTools: true, + webSecurity: false, + }, + }) + + mainWindow.setVisibleOnAllWorkspaces(true) + + // TODO: Update to right icon location + tray = new Tray(path.join(__dirname, '../public/images', 'zcash-icon.png')) + + registerDebugShortcut(app, mainWindow) + + tray.setToolTip('ZCash') + mainWindow.loadURL(isDev ? 'http://0.0.0.0:8080/' : `file://${path.join(__dirname, '../dist/index.html')}`) + + const positioner = new Positioner(mainWindow) + let bounds = tray.getBounds() + positioner.move('trayCenter', bounds) + + powerMonitor.on('suspend', () => mainWindow.webContents.send('suspend', 'suspended')) + powerMonitor.on('resume', () => mainWindow.webContents.send('resume', 'resumed')) + + mainWindow.once('ready-to-show', () => mainWindow.show()) + mainWindow.on('blur', () => mainWindow.hide()) + mainWindow.on('show', () => tray.setHighlightMode('always')) + mainWindow.on('hide', () => tray.setHighlightMode('never')) + mainWindow.on('closed', () => { + mainWindow = null + }) + + tray.on('click', () => { + bounds = tray.getBounds() + positioner.move('trayCenter', bounds) + + if (mainWindow.isVisible()) { + mainWindow.hide() + } else { + mainWindow.show() + } + }) + + exports.app = app + exports.tray = tray +} + +app.on('ready', createWindow) +app.on('activate', () => { + if (mainWindow === null) createWindow() +}) +app.on('window-all-closed', () => { + if (process.platform !== 'darwin') app.quit() +}) diff --git a/index.js b/index.js new file mode 100644 index 0000000..796a750 --- /dev/null +++ b/index.js @@ -0,0 +1,2 @@ +require('@babel/register') +require('./config/electron') diff --git a/public/images/zcash-icon.png b/public/images/zcash-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..060bd0030c3e31c4da52d88817db34f81c09577f GIT binary patch literal 24849 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 MV@spT)2<2s1Elg|C;$Ke literal 0 HcmV?d00001 diff --git a/utils/debugShortcut.js b/utils/debugShortcut.js new file mode 100644 index 0000000..a84cade --- /dev/null +++ b/utils/debugShortcut.js @@ -0,0 +1,9 @@ +// @flow + +import { globalShortcut } from 'electron' + +export const registerDebugShortcut = (app: Object, mainWindow: Object) => + globalShortcut.register('CommandOrControl+Option+B', () => { + app.dock.show() + mainWindow.webContents.openDevTools() + }) From 67313a95ba5caa512b1f4f132d1c3990816bf53a Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 17:19:12 -0300 Subject: [PATCH 4/8] lint: use rules from .eslintrc --- config/electron.js | 119 +++++++++++++++++++++-------------------- utils/debugShortcut.js | 12 ++--- 2 files changed, 67 insertions(+), 64 deletions(-) diff --git a/config/electron.js b/config/electron.js index 0b5bfec..d958a21 100644 --- a/config/electron.js +++ b/config/electron.js @@ -1,47 +1,50 @@ // @flow -import path from 'path' +import path from 'path'; -import { app, BrowserWindow, powerMonitor, Tray } from 'electron' -import { autoUpdater } from 'electron-updater' -import log from 'electron-log' -import Positioner from 'electron-positioner' -import isDev from 'electron-is-dev' +/* eslint-disable import/no-extraneous-dependencies */ +import { + app, BrowserWindow, powerMonitor, Tray, +} from 'electron'; +import { autoUpdater } from 'electron-updater'; +import Positioner from 'electron-positioner'; +import isDev from 'electron-is-dev'; +/* eslint-enable import/no-extraneous-dependencies */ -import { registerDebugShortcut } from '../utils/debugShortcut' +import type { BrowserWindow as BrowserWindowType, Tray as TrayType } from 'electron'; -import type { BrowserWindow as BrowserWindowType, Tray as TrayType } from 'electron' +import { registerDebugShortcut } from '../utils/debugShortcut'; -let mainWindow: BrowserWindowType -let tray: TrayType -let updateAvailable = false +let mainWindow: BrowserWindowType; +let tray: TrayType; +let updateAvailable = false; -const showStatus = text => { - if (text === 'Update downloaded') updateAvailable = true +const showStatus = (text) => { + if (text === 'Update downloaded') updateAvailable = true; mainWindow.webContents.send('update', { updateAvailable, updateInfo: text, - }) -} + }); +}; function createWindow() { - autoUpdater.checkForUpdatesAndNotify() + autoUpdater.checkForUpdatesAndNotify(); - autoUpdater.on('checking-for-update', () => showStatus('Checking for update')) - autoUpdater.on('update-available', () => showStatus('Update available')) - autoUpdater.on('update-not-available', () => showStatus('No updates available')) - autoUpdater.on('error', err => showStatus(`Error while updating: ${err}`)) - autoUpdater.on('download-progress', progress => - showStatus(` - Download speed: ${progress.bytesPerSecond} - Downloaded ${progress.percent}% (${progress.transferred}/${ + autoUpdater.on('checking-for-update', () => showStatus('Checking for update')); + autoUpdater.on('update-available', () => showStatus('Update available')); + autoUpdater.on('update-not-available', () => showStatus('No updates available')); + autoUpdater.on('error', err => showStatus(`Error while updating: ${err}`)); + + autoUpdater.on('download-progress', progress => showStatus( + /* eslint-disable-next-line max-len */ + `Download speed: ${progress.bytesPerSecond} - Downloaded ${progress.percent}% (${progress.transferred}/${ progress.total - }) - `), - ) + })`, + )); autoUpdater.on('update-downloaded', () => { - updateAvailable = true - showStatus('Update downloaded') - }) + updateAvailable = true; + showStatus('Update downloaded'); + }); mainWindow = new BrowserWindow({ width: 800, @@ -53,52 +56,52 @@ function createWindow() { devTools: true, webSecurity: false, }, - }) + }); - mainWindow.setVisibleOnAllWorkspaces(true) + mainWindow.setVisibleOnAllWorkspaces(true); // TODO: Update to right icon location - tray = new Tray(path.join(__dirname, '../public/images', 'zcash-icon.png')) + tray = new Tray(path.join(__dirname, '../public/images', 'zcash-icon.png')); - registerDebugShortcut(app, mainWindow) + registerDebugShortcut(app, mainWindow); - tray.setToolTip('ZCash') - mainWindow.loadURL(isDev ? 'http://0.0.0.0:8080/' : `file://${path.join(__dirname, '../dist/index.html')}`) + tray.setToolTip('ZCash'); + mainWindow.loadURL(isDev ? 'http://0.0.0.0:8080/' : `file://${path.join(__dirname, '../dist/index.html')}`); - const positioner = new Positioner(mainWindow) - let bounds = tray.getBounds() - positioner.move('trayCenter', bounds) + const positioner = new Positioner(mainWindow); + let bounds = tray.getBounds(); + positioner.move('trayCenter', bounds); - powerMonitor.on('suspend', () => mainWindow.webContents.send('suspend', 'suspended')) - powerMonitor.on('resume', () => mainWindow.webContents.send('resume', 'resumed')) + powerMonitor.on('suspend', () => mainWindow.webContents.send('suspend', 'suspended')); + powerMonitor.on('resume', () => mainWindow.webContents.send('resume', 'resumed')); - mainWindow.once('ready-to-show', () => mainWindow.show()) - mainWindow.on('blur', () => mainWindow.hide()) - mainWindow.on('show', () => tray.setHighlightMode('always')) - mainWindow.on('hide', () => tray.setHighlightMode('never')) + mainWindow.once('ready-to-show', () => mainWindow.show()); + mainWindow.on('blur', () => mainWindow.hide()); + mainWindow.on('show', () => tray.setHighlightMode('always')); + mainWindow.on('hide', () => tray.setHighlightMode('never')); mainWindow.on('closed', () => { - mainWindow = null - }) + mainWindow = null; + }); tray.on('click', () => { - bounds = tray.getBounds() - positioner.move('trayCenter', bounds) + bounds = tray.getBounds(); + positioner.move('trayCenter', bounds); if (mainWindow.isVisible()) { - mainWindow.hide() + mainWindow.hide(); } else { - mainWindow.show() + mainWindow.show(); } - }) + }); - exports.app = app - exports.tray = tray + exports.app = app; + exports.tray = tray; } -app.on('ready', createWindow) +app.on('ready', createWindow); app.on('activate', () => { - if (mainWindow === null) createWindow() -}) + if (mainWindow === null) createWindow(); +}); app.on('window-all-closed', () => { - if (process.platform !== 'darwin') app.quit() -}) + if (process.platform !== 'darwin') app.quit(); +}); diff --git a/utils/debugShortcut.js b/utils/debugShortcut.js index a84cade..3a75a68 100644 --- a/utils/debugShortcut.js +++ b/utils/debugShortcut.js @@ -1,9 +1,9 @@ // @flow -import { globalShortcut } from 'electron' +/* eslint-disable import/no-extraneous-dependencies */ +import { globalShortcut } from 'electron'; -export const registerDebugShortcut = (app: Object, mainWindow: Object) => - globalShortcut.register('CommandOrControl+Option+B', () => { - app.dock.show() - mainWindow.webContents.openDevTools() - }) +export const registerDebugShortcut = (app: Object, mainWindow: Object) => globalShortcut.register('CommandOrControl+Option+B', () => { + app.dock.show(); + mainWindow.webContents.openDevTools(); +}); From 6bf9a11c7ee01c6f86ea9cd3f0ae5f116576c375 Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 18:16:12 -0300 Subject: [PATCH 5/8] hotfix: electron loadURL path --- config/electron.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/electron.js b/config/electron.js index d958a21..2fd11d0 100644 --- a/config/electron.js +++ b/config/electron.js @@ -66,7 +66,7 @@ function createWindow() { registerDebugShortcut(app, mainWindow); tray.setToolTip('ZCash'); - mainWindow.loadURL(isDev ? 'http://0.0.0.0:8080/' : `file://${path.join(__dirname, '../dist/index.html')}`); + mainWindow.loadURL(isDev ? 'http://0.0.0.0:8080/' : `file://${path.join(__dirname, '../build/index.html')}`); const positioner = new Positioner(mainWindow); let bounds = tray.getBounds(); From ed956939e3de877831b3b165b39a661a3eb53e50 Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 18:16:59 -0300 Subject: [PATCH 6/8] chore: add build to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 42037e4..711a327 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules dist .DS_Store flow-coverage +build \ No newline at end of file From 3339f055f8949a1a281d19dda3d14d95dd11daf7 Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 18:17:57 -0300 Subject: [PATCH 7/8] hotfix: electron build command --- build-assets/icon.png | Bin 0 -> 24849 bytes config/webpack-dev.config.js | 2 +- config/webpack-prod.config.js | 2 +- index.js | 4 +- package.json | 15 +- yarn.lock | 446 ++++++++++++++++++++++++++++++++-- 6 files changed, 444 insertions(+), 25 deletions(-) create mode 100644 build-assets/icon.png diff --git a/build-assets/icon.png b/build-assets/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..060bd0030c3e31c4da52d88817db34f81c09577f GIT binary patch literal 24849 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 MV@spT)2<2s1Elg|C;$Ke literal 0 HcmV?d00001 diff --git a/config/webpack-dev.config.js b/config/webpack-dev.config.js index a1547de..8d3f7e7 100644 --- a/config/webpack-dev.config.js +++ b/config/webpack-dev.config.js @@ -1,7 +1,7 @@ const path = require('path'); const mainWebpack = require('./webpack-main.config'); -const outputPath = path.resolve(__dirname, '../', 'dist'); +const outputPath = path.resolve(__dirname, '../', 'build'); module.exports = { output: { diff --git a/config/webpack-prod.config.js b/config/webpack-prod.config.js index 75a2623..7e030a0 100644 --- a/config/webpack-prod.config.js +++ b/config/webpack-prod.config.js @@ -1,7 +1,7 @@ const path = require('path'); const mainWebpack = require('./webpack-main.config'); -const outputPath = path.resolve(__dirname, '../', 'dist'); +const outputPath = path.resolve(__dirname, '../', 'build'); module.exports = { output: { diff --git a/index.js b/index.js index 796a750..6efb44d 100644 --- a/index.js +++ b/index.js @@ -1,2 +1,2 @@ -require('@babel/register') -require('./config/electron') +require('@babel/register'); +require('./config/electron'); diff --git a/package.json b/package.json index ba3cd9e..42a20e1 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "start": "concurrently \"cross-env BROWSER=none yarn dev\" \"wait-on http://0.0.0.0:8080 && yarn electron:dev\"", "dev": "webpack-dev-server --config config/webpack-dev.config.js --mode development --open --hot", - "build": "rm -rf dist && webpack --config config/webpack-prod.config.js --mode production --env.NODE_ENV=production", + "build": "rm -rf build && webpack --config config/webpack-prod.config.js --mode production --env.NODE_ENV=production", "lint:precommit": "eslint ./app/", "flow:precommit": "glow", "flow:coverage": "flow-coverage-report -t html -i 'app/**/*.js' -x 'dist/*.js' --threshold 70", @@ -40,6 +40,7 @@ "css-loader": "^1.0.1", "electron": "^3.0.10", "electron-builder": "^20.36.2", + "electron-icon-maker": "^0.0.4", "electron-is-dev": "^1.0.1", "electron-log": "^2.2.17", "electron-positioner": "^4.1.0", @@ -91,13 +92,17 @@ "productName": "ZCash", "asar": true, "directories": { - "buildResources": "dist", - "output": "build" + "buildResources": "build", + "output": "dist" }, "files": [ - "dist/**/*", - "node_modules/**/*" + "./index.js", + "./build/**/*", + "./node_modules/**/*" ], + "linux": { + "icon": "./build/icons/png" + }, "mac": { "category": "public.app-category.productivity", "type": "distribution", diff --git a/yarn.lock b/yarn.lock index 337ddae..c62c4e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1075,6 +1075,17 @@ argparse@^1.0.7, argparse@^1.0.9: underscore "~1.7.0" underscore.string "~2.4.0" +args@^2.3.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/args/-/args-2.6.1.tgz#b2590ed4168cd31b62444199bdc5166bb1920c2f" + integrity sha1-slkO1BaM0xtiREGZvcUWa7GSDC8= + dependencies: + camelcase "4.1.0" + chalk "1.1.3" + minimist "1.2.0" + pkginfo "0.4.0" + string-similarity "1.1.0" + aria-query@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc" @@ -1395,6 +1406,11 @@ big.js@^3.1.3: resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q== +bignumber.js@^2.1.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8" + integrity sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg= + binary-extensions@^1.0.0: version "1.12.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" @@ -1424,6 +1440,11 @@ bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== +bmp-js@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.0.3.tgz#64113e9c7cf1202b376ed607bf30626ebe57b18a" + integrity sha1-ZBE+nHzxICs3btYHvzBibr5XsYo= + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -1585,6 +1606,11 @@ buffer-alloc@^1.2.0: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" +buffer-equal@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" + integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs= + buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" @@ -1729,6 +1755,11 @@ camelcase-keys@^4.0.0: map-obj "^2.0.0" quick-lru "^1.0.0" +camelcase@4.1.0, camelcase@^4.0.0, camelcase@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= + camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -1739,11 +1770,6 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^4.0.0, camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - camelcase@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" @@ -1764,7 +1790,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@^1.1.1, chalk@^1.1.3: +chalk@1.1.3, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -2467,6 +2493,19 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" +del@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" + integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag= + dependencies: + globby "^5.0.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + rimraf "^2.2.8" + del@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" @@ -2590,6 +2629,11 @@ dom-serializer@0: domelementtype "~1.1.1" entities "~1.1.1" +dom-walk@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" + integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg= + domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" @@ -2726,6 +2770,15 @@ electron-download@^4.1.0: semver "^5.4.1" sumchecker "^2.0.2" +electron-icon-maker@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/electron-icon-maker/-/electron-icon-maker-0.0.4.tgz#0766087c270a736d0857204bb72130d574d91c51" + integrity sha512-7Lp5VJH7T7jy0YoM5Qz/pEaJloshTYzb73+ra4Nxhvf7UUs/z/FZW1nJ1dC9vaZqVvzZZduYIa9ELQpiqPnLTg== + dependencies: + args "^2.3.0" + icon-gen "1.0.7" + jimp "^0.2.27" + electron-is-dev@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.0.1.tgz#6e0a184736fe7aea77d18210b0b0f6a02402c4bc" @@ -2890,6 +2943,16 @@ es-to-primitive@^1.1.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +es6-promise@^3.0.2: + version "3.3.1" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613" + integrity sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM= + +es6-promise@^4.0.3: + version "4.2.5" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054" + integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -3156,6 +3219,11 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +exif-parser@^0.1.9: + version "0.1.12" + resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922" + integrity sha1-WKnS1ywCwfbwKg70qRZicrd2CSI= + expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" @@ -3255,7 +3323,7 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.0.3: +extract-zip@^1.0.3, extract-zip@^1.6.5: version "1.6.7" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= @@ -3357,6 +3425,18 @@ file-loader@^2.0.0: loader-utils "^1.0.2" schema-utils "^1.0.0" +file-type@^3.1.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek= + +file-url@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/file-url/-/file-url-1.1.0.tgz#a0f9cf3eb6904c9b1d3a6790b83a976fc40217bb" + integrity sha1-oPnPPraQTJsdOmeQuDqXb8QCF7s= + dependencies: + meow "^3.7.0" + filesize@^3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -3500,6 +3580,13 @@ follow-redirects@^1.0.0: dependencies: debug "=3.1.0" +for-each@^0.3.2: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + for-in@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" @@ -3569,6 +3656,15 @@ fs-extra-p@^7.0.0: bluebird-lst "^1.0.6" fs-extra "^7.0.0" +fs-extra@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" + integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= + dependencies: + graceful-fs "^4.1.2" + jsonfile "^2.1.0" + klaw "^1.0.0" + fs-extra@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -3752,11 +3848,31 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" +global@~4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" + integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8= + dependencies: + min-document "^2.19.0" + process "~0.5.1" + globals@^11.1.0, globals@^11.7.0: version "11.9.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg== +globby@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" + integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0= + dependencies: + array-union "^1.0.1" + arrify "^1.0.0" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -3816,7 +3932,7 @@ got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== @@ -3928,6 +4044,14 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hasha@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" + integrity sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE= + dependencies: + is-stream "^1.0.1" + pinkie-promise "^2.0.0" + he@1.2.x: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -4101,6 +4225,17 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +icon-gen@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/icon-gen/-/icon-gen-1.0.7.tgz#0c710adccbf96e10d05c4595d549df43e423a20a" + integrity sha1-DHEK3Mv5bhDQXEWV1UnfQ+Qjogo= + dependencies: + del "^2.2.2" + mkdirp "^0.5.1" + pngjs "^3.0.0" + svg2png "4.1.0" + uuid "^3.0.0" + iconv-lite@0.4.23: version "0.4.23" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" @@ -4280,6 +4415,11 @@ invert-kv@^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@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd" + integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0= + ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -4428,6 +4568,11 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-function@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5" + integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU= + is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -4616,6 +4761,28 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +jimp@^0.2.27: + version "0.2.28" + resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz#dd529a937190f42957a7937d1acc3a7762996ea2" + integrity sha1-3VKak3GQ9ClXp5N9Gsw6d2KZbqI= + dependencies: + bignumber.js "^2.1.0" + bmp-js "0.0.3" + es6-promise "^3.0.2" + exif-parser "^0.1.9" + file-type "^3.1.0" + jpeg-js "^0.2.0" + load-bmfont "^1.2.3" + mime "^1.3.4" + mkdirp "0.5.1" + pixelmatch "^4.0.0" + pngjs "^3.0.0" + read-chunk "^1.0.1" + request "^2.65.0" + stream-to-buffer "^0.1.0" + tinycolor2 "^1.1.2" + url-regex "^3.0.0" + joi@^13.0.0: version "13.7.0" resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f" @@ -4625,6 +4792,11 @@ joi@^13.0.0: isemail "3.x.x" topo "3.x.x" +jpeg-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz#53e448ec9d263e683266467e9442d2c5a2ef5482" + integrity sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII= + js-base64@^2.1.8: version "2.4.9" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" @@ -4718,6 +4890,13 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" +jsonfile@^2.1.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" + integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug= + optionalDependencies: + graceful-fs "^4.1.6" + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -4742,6 +4921,11 @@ jsx-ast-utils@^2.0.1: dependencies: array-includes "^3.0.3" +kew@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" + integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s= + killable@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -4771,6 +4955,13 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== +klaw@^1.0.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" + integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk= + optionalDependencies: + graceful-fs "^4.1.9" + latest-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" @@ -4805,6 +4996,20 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +load-bmfont@^1.2.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz#75f17070b14a8c785fe7f5bee2e6fd4f98093b6b" + integrity sha512-kT63aTAlNhZARowaNYcY29Fn/QYkc52M3l6V1ifRcPewg2lvUZDAj7R6dXjOL9D0sict76op3T5+odumDSF81g== + dependencies: + buffer-equal "0.0.1" + mime "^1.3.4" + parse-bmfont-ascii "^1.0.3" + parse-bmfont-binary "^1.0.5" + parse-bmfont-xml "^1.1.4" + phin "^2.9.1" + xhr "^2.0.1" + xtend "^4.0.0" + load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" @@ -4883,7 +5088,7 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lodash.assign@^4.2.0: +lodash.assign@^4.1.0, lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= @@ -4913,7 +5118,7 @@ lodash.tail@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ= -lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, 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" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== @@ -5120,6 +5325,11 @@ mime@1.4.1: resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ== +mime@^1.3.4: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + mime@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" @@ -5130,6 +5340,13 @@ 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== +min-document@^2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" + integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= + dependencies: + dom-walk "^0.1.0" + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -5160,7 +5377,7 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: +minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= @@ -5832,6 +6049,24 @@ parse-asn1@^5.0.0: evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" +parse-bmfont-ascii@^1.0.3: + version "1.0.6" + resolved "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz#11ac3c3ff58f7c2020ab22769079108d4dfa0285" + integrity sha1-Eaw8P/WPfCAgqyJ2kHkQjU36AoU= + +parse-bmfont-binary@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz#d038b476d3e9dd9db1e11a0b0e53a22792b69006" + integrity sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY= + +parse-bmfont-xml@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz#015319797e3e12f9e739c4d513872cd2fa35f389" + integrity sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ== + dependencies: + xml-parse-from-string "^1.0.0" + xml2js "^0.4.5" + parse-color@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz#7b748b95a83f03f16a94f535e52d7f3d94658619" @@ -5839,6 +6074,14 @@ parse-color@^1.0.0: dependencies: color-convert "~0.5.0" +parse-headers@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.1.tgz#6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536" + integrity sha1-aug6eqJanZtwCswoaYzR8e1+lTY= + dependencies: + for-each "^0.3.2" + trim "0.0.1" + parse-json@2.2.0, parse-json@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" @@ -5967,6 +6210,26 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +phantomjs-prebuilt@^2.1.10: + version "2.1.16" + resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef" + integrity sha1-79ISpKOWbTZHaE6ouniFSb4q7+8= + dependencies: + es6-promise "^4.0.3" + extract-zip "^1.6.5" + fs-extra "^1.0.0" + hasha "^2.2.0" + kew "^0.7.0" + progress "^1.1.8" + request "^2.81.0" + request-progress "^2.0.1" + which "^1.2.10" + +phin@^2.9.1: + version "2.9.3" + resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c" + integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -5996,6 +6259,13 @@ pirates@^4.0.0: dependencies: node-modules-regexp "^1.0.0" +pixelmatch@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854" + integrity sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ= + dependencies: + pngjs "^3.0.0" + pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -6017,6 +6287,11 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" +pkginfo@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.0.tgz#349dbb7ffd38081fcadc0853df687f0c7744cd65" + integrity sha1-NJ27f/04CB/K3AhT32h/DHdEzWU= + plist@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" @@ -6031,6 +6306,16 @@ pluralize@^7.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== +pn@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" + integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== + +pngjs@^3.0.0: + version "3.3.3" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz#85173703bde3edac8998757b96e5821d0966a21b" + integrity sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q== + portfinder@^1.0.9: version "1.0.19" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f" @@ -6167,6 +6452,11 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= +process@~0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" + integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8= + progress-stream@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-1.2.0.tgz#2cd3cfea33ba3a89c9c121ec3347abe9ab125f77" @@ -6175,6 +6465,11 @@ progress-stream@^1.1.0: speedometer "~0.1.2" through2 "~0.2.3" +progress@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" + integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= + progress@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" @@ -6441,6 +6736,11 @@ react@^16.6.0: prop-types "^15.6.2" scheduler "^0.11.2" +read-chunk@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz#5f68cab307e663f19993527d9b589cace4661194" + integrity sha1-X2jKswfmY/GZk1J9m1icrORmEZQ= + read-config-file@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.0.tgz#50a2756a9a128ab9dcbe087e2724c512e3d0ccd1" @@ -6739,7 +7039,14 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@^2.45.0, request@^2.87.0, request@^2.88.0: +request-progress@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" + integrity sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg= + dependencies: + throttleit "^1.0.0" + +request@^2.45.0, request@^2.65.0, request@^2.81.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== @@ -6940,7 +7247,7 @@ sass-loader@^7.1.0: pify "^3.0.0" semver "^5.5.0" -sax@^1.2.4: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -7421,6 +7728,25 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= +stream-to-buffer@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz#26799d903ab2025c9bd550ac47171b00f8dd80a9" + integrity sha1-JnmdkDqyAlyb1VCsRxcbAPjdgKk= + dependencies: + stream-to "~0.2.0" + +stream-to@~0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stream-to/-/stream-to-0.2.2.tgz#84306098d85fdb990b9fa300b1b3ccf55e8ef01d" + integrity sha1-hDBgmNhf25kLn6MAsbPM9V6O8B0= + +string-similarity@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-1.1.0.tgz#3c66498858a465ec7c40c7d81739bbd995904914" + integrity sha1-PGZJiFikZex8QMfYFzm72ZWQSRQ= + dependencies: + lodash "^4.13.1" + 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" @@ -7558,6 +7884,16 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-co dependencies: has-flag "^3.0.0" +svg2png@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/svg2png/-/svg2png-4.1.0.tgz#68e85fc9d0784dc041f97d2a28815405acd56217" + integrity sha1-aOhfydB4TcBB+X0qKIFUBazVYhc= + dependencies: + file-url "^1.1.0" + phantomjs-prebuilt "^2.1.10" + pn "^1.0.0" + yargs "^5.0.0" + svgo@~0.4.5: version "0.4.5" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.4.5.tgz#ba56155fb1733728956c01b405221ee7e789a2a4" @@ -7676,6 +8012,11 @@ throttleit@0.0.2: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf" integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8= +throttleit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" + integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= + through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -7714,6 +8055,11 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" +tinycolor2@^1.1.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" + integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g= + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -7796,6 +8142,11 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +trim@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= + "true-case-path@^1.0.2": version "1.0.3" resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" @@ -8024,6 +8375,13 @@ url-parse@^1.4.3: querystringify "^2.0.0" requires-port "^1.0.0" +url-regex@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724" + integrity sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ= + dependencies: + ip-regex "^1.0.1" + url@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" @@ -8079,7 +8437,7 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.0.1, uuid@^3.3.2: +uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== @@ -8321,7 +8679,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1, which@^1.2.12, which@^1.2.9: +which@1, which@^1.2.10, which@^1.2.12, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -8349,6 +8707,11 @@ widest-line@^2.0.0: dependencies: string-width "^2.1.1" +window-size@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" + integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU= + wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" @@ -8402,7 +8765,30 @@ xdg-basedir@^3.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= -xmlbuilder@^9.0.7: +xhr@^2.0.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd" + integrity sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ== + dependencies: + global "~4.3.0" + is-function "^1.0.1" + parse-headers "^2.0.0" + xtend "^4.0.0" + +xml-parse-from-string@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28" + integrity sha1-qQKekp09vN7RafPG4oI42VpdWig= + +xml2js@^0.4.5: + version "0.4.19" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" + integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== + dependencies: + sax ">=0.6.0" + xmlbuilder "~9.0.1" + +xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: version "9.0.7" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= @@ -8459,6 +8845,14 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-3.2.0.tgz#5081355d19d9d0c8c5d81ada908cb4e6d186664f" + integrity sha1-UIE1XRnZ0MjF2BrakIy05tGGZk8= + dependencies: + camelcase "^3.0.0" + lodash.assign "^4.1.0" + yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" @@ -8528,6 +8922,26 @@ yargs@^12.0.1, yargs@^12.0.2: y18n "^3.2.1 || ^4.0.0" yargs-parser "^11.1.1" +yargs@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-5.0.0.tgz#3355144977d05757dbb86d6e38ec056123b3a66e" + integrity sha1-M1UUSXfQV1fbuG1uOOwFYSOzpm4= + dependencies: + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + lodash.assign "^4.2.0" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + window-size "^0.2.0" + y18n "^3.2.1" + yargs-parser "^3.2.0" + yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" From 6e268bdb5786f08469f27bf7ab5ff39741c88e30 Mon Sep 17 00:00:00 2001 From: George Lima Date: Mon, 26 Nov 2018 18:21:25 -0300 Subject: [PATCH 8/8] hotfix: make createWindow arrow function --- config/electron.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/electron.js b/config/electron.js index 2fd11d0..d3cdad9 100644 --- a/config/electron.js +++ b/config/electron.js @@ -27,7 +27,7 @@ const showStatus = (text) => { }); }; -function createWindow() { +const createWindow = () => { autoUpdater.checkForUpdatesAndNotify(); autoUpdater.on('checking-for-update', () => showStatus('Checking for update')); @@ -96,7 +96,7 @@ function createWindow() { exports.app = app; exports.tray = tray; -} +}; app.on('ready', createWindow); app.on('activate', () => {