diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..4346afc7f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,143 @@ +# +# TODO: compilation +# TODO: store_artifacts +# TODO: name commands properly +# TODO: mac job +# TODO: improve caching +# TODO: fix `xvfb gulp test` command +# TODO: windows job +# TODO: store_test_results +# TODO: docker images +# + +defaults: &defaults + working_directory: /home/circleci/mist + docker: + - image: circleci/node:8.9.4-browsers + environment: + # Setting variable to fix node-gyp build error: + # https://github.com/nodejs/node/issues/7173#issuecomment-224772258 + - CXX_host: 'g++ -m32' + +linux_dependencies: &linux_dependencies + name: Linux package dependencies + # Installing multilib (build for 32 and 64 architectures): + # https://www.quora.com/How-do-I-fix-fatal-error-sys-cdefs-h-file-not-found-include-sys-cdefs-h + command: | + sudo apt-get update && + sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib icnsutils xz-utils && + sudo apt-get install graphicsmagick + +install_meteor: &install_meteor + name: Installing Meteor + # PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh + command: which meteor || curl https://install.meteor.com | /bin/sh + +install_node_modules: &install_node_modules + name: Installing node dependencies using yarn + command: yarn + + +# Javascript Node CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-javascript/ for more details +# +version: 2 +jobs: + build: + <<: *defaults + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "package.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + # Setting PATH: https://circleci.com/docs/2.0/env-vars/#setting-path + - run: echo 'export PATH=`yarn global bin`:$PATH' >> $BASH_ENV + + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules + + - save_cache: + paths: + - node_modules + key: v1-dependencies-{{ checksum "package.json" }} + - persist_to_workspace: + root: /home/circleci/ + paths: + - mist + + mist-linux: + <<: *defaults + steps: + - attach_workspace: + at: /home/circleci/ + + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules + + - run: yarn build:mist --linux + + - store_artifacts: + path: dist_mist/release + + wallet-linux: + <<: *defaults + steps: + - attach_workspace: + at: /home/circleci/ + + - run: + <<: *linux_dependencies + - run: + <<: *install_meteor + - run: + <<: *install_node_modules + + - run: yarn build:wallet --linux + + - store_artifacts: + path: dist_wallet/release + + spectron-test: + docker: + - image: circleci/node:8.9.4 + steps: + - attach_workspace: + at: /home/circleci/ + - run: xvfb-run yarn test:e2e + + unit-test: + <<: *defaults + steps: + - attach_workspace: + at: /home/circleci/ + - run: << *install_node_modules + - run: yarn test:unit:once + +workflows: + version: 2 + build_and_test: + jobs: + - build + - mist-linux: + requires: + - build + - wallet-linux: + requires: + - build + - unit-test: + requires: + - build diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1d046a30f..ca18b6c66 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,4 +1,4 @@ -* [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue. +- [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue. diff --git a/.github/triage.yml b/.github/triage.yml index 1012c9306..e580ae94a 100644 --- a/.github/triage.yml +++ b/.github/triage.yml @@ -1,2 +1 @@ -initLabels: - - "Status: Triage" +label: "Status: Triage" diff --git a/.gitmodules b/.gitmodules index eaad99e7a..1a1fb6e7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "dapp-styles"] path = interface/public/dapp-styles url = git://github.com/ethereum/dapp-styles.git +[submodule "meteor-dapp-wallet"] + path = meteor-dapp-wallet + url = https://github.com/ethereum/meteor-dapp-wallet.git diff --git a/.travis.yml b/.travis.yml index 64fe4c200..1ef0174b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,40 +8,17 @@ cache: sudo: required -branches: - only: - - develop - - master - - /^greenkeeper/.*$/ - matrix: include: - # WINDOWS cross-built from linux - - os: linux - dist: trusty - env: - - GULP_PLATFORM=win - addons: - apt: - packages: - - icnsutils - - graphicsmagick - - xz-utils - - nsis - - g++-multilib - sources: - - mono - before_install: - - sudo dpkg --add-architecture i386 && sudo add-apt-repository ppa:ubuntu-wine/ppa -y - - sudo apt-get update -q - - sudo apt-get install --no-install-recommends -y mono-devel ca-certificates-mono wine1.8 - # LINUX - os: linux dist: trusty env: - GULP_PLATFORM=linux addons: + artifacts: + paths: + - $( ls dist_{mist,wallet}/release/* | tr "\n" ":" ) apt: packages: - icnsutils @@ -49,64 +26,42 @@ matrix: - xz-utils - gcc-multilib - g++-multilib - + before_install: + # prepare integration tests + - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start + # MAC - os: osx - osx_image: xcode8.3 # currently xcode8.1+ doesn't support electron-builder macOS code-signing (https://github.com/electron-userland/electron-builder/issues/820#issuecomment-267777060) + osx_image: xcode8.3 env: - GULP_PLATFORM=mac + addons: + artifacts: + paths: + - $( ls dist_{mist,wallet}/release/* | tr "\n" ":" ) before_install: - - npm install -g yarn # macOS xcode8 image doesn't natively support yarn yet - - allow_failures: - - os: osx - - fast_finish: true - + - npm install -g yarn install: - - echo $PATH - PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh - - export PATH=$PATH:`yarn global bin` - - yarn global add gulp-cli meteor-build-client electron@1.8.4 + - yarn -script: - # disable macOS code-signing (production certificate) on develop branch + # only code signs when on master - if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi - # windows code-signing on master branch - - if [[ $GULP_PLATFORM == "win" && $TRAVIS_BRANCH == "master" ]]; then export CSC_LINK=$CSC_WIN_LINK && CSC_KEY_PASSWORD=$CSC_WIN_KEY_PASSWORD; fi - # unit test - - if [[ $GULP_PLATFORM == "linux" ]]; then yarn test:unit:once; fi +script: + - yarn test:unit:once - # build mist - - if [[ $GULP_PLATFORM == "mac" ]]; then travis_wait 60 gulp --$GULP_PLATFORM; fi # increase timeout for slower mac builds - - if [[ $GULP_PLATFORM != "mac" ]]; then gulp --$GULP_PLATFORM; fi + - yarn build:mist --$GULP_PLATFORM - # assert creation of Mist artifacts - - gulp verify-artifacts --mist --$GULP_PLATFORM - - # build wallet if on master branch - - if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi + - yarn build:wallet --$GULP_PLATFORM - # assert creation of Wallet artifacts - - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp verify-artifacts --wallet --$GULP_PLATFORM; fi - - # prepare integration tests - - if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi - - # currently, tests should run in linux and mac - - if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi + - yarn test:e2e after_success: - - if [[ $TRAVIS_BRANCH == "master" ]]; then gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM; fi - + - if [[ $TRAVIS_BRANCH == "master" ]]; then + yarn dist:mist --$GULP_PLATFORM; + yarn dist:wallet --$GULP_PLATFORM; + fi -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/33972d9e627a142c57a6 - on_success: change - on_failure: always - on_start: never diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 14c032193..dbce2f2dd 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -20,28 +20,28 @@ If you see someone who is making an extra effort to ensure our community is welc The following behaviors are expected and requested of all community members: -* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community. -* Exercise consideration and respect in your speech and actions. -* Attempt collaboration before conflict. -* Refrain from demeaning, discriminatory, or harassing behavior and speech. -* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential. -* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations. +- Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community. +- Exercise consideration and respect in your speech and actions. +- Attempt collaboration before conflict. +- Refrain from demeaning, discriminatory, or harassing behavior and speech. +- Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential. +- Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations. ## 4. Unacceptable Behavior The following behaviors are considered harassment and are unacceptable within our community: -* Violence, threats of violence or violent language directed against another person. -* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. -* Posting or displaying sexually explicit or violent material. -* Posting or threatening to post other people’s personally identifying information ("doxing"). -* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability. -* Inappropriate photography or recording. -* Inappropriate physical contact. You should have someone’s consent before touching them. -* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances. -* Deliberate intimidation, stalking or following (online or in person). -* Advocating for, or encouraging, any of the above behavior. -* Sustained disruption of community events, including talks and presentations. +- Violence, threats of violence or violent language directed against another person. +- Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. +- Posting or displaying sexually explicit or violent material. +- Posting or threatening to post other people’s personally identifying information ("doxing"). +- Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability. +- Inappropriate photography or recording. +- Inappropriate physical contact. You should have someone’s consent before touching them. +- Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances. +- Deliberate intimidation, stalking or following (online or in person). +- Advocating for, or encouraging, any of the above behavior. +- Sustained disruption of community events, including talks and presentations. ## 5. Consequences of Unacceptable Behavior diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2ba332997..095df0601 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,14 +6,14 @@ To help improve Mist (_Ethereum Wallet_), please include the following: -* What do you run? (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_) -* Which version do you use? (_Check the `VERSION` file in the Mist folder_) -* What OS you're on? +- What do you run? (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_) +- Which version do you use? (_Check the `VERSION` file in the Mist folder_) +- What OS you're on? If applicable: -* Log file (Linux: `~/.config/Mist/logs/all.log`, Windows: `%APPDATA%/Roaming/Mist/logs/all.log`, MacOSX: `~/Library/Application Support/Mist/logs/all.log`) -* Screenshot (for GUI related issues) +- Log file (Linux: `~/.config/Mist/logs/all.log`, Windows: `%APPDATA%/Roaming/Mist/logs/all.log`, MacOSX: `~/Library/Application Support/Mist/logs/all.log`) +- Screenshot (for GUI related issues) ## Pull Requests diff --git a/MISTAPI.md b/MISTAPI.md index 5f48cbb6e..b86d67022 100644 --- a/MISTAPI.md +++ b/MISTAPI.md @@ -26,27 +26,27 @@ if (typeof web3 !== 'undefined') { ## API -* [mist.platform](#mistplatform) -* [mist.requestAccount](#mistrequestaccountcallback)(callback) -* [mist.menu](#mistmenu) -* [mist.menu.add](#mistmenuaddid-options-callback)([id,] options, callback) -* [mist.menu.clear](#mistmenuclear)() -* [mist.menu.remove](#mistmenuremoveid)(id) -* [mist.menu.select](#mistmenuselectid)(text) -* [mist.menu.setBadge](#mistmenusetbadgetext)(text) -* [mist.menu.update](#mistmenuupdateid--options--callback)(id [, options][, callback]) -* [mist.sounds](#mistsounds) -* [mist.sounds.bip](#mistsoundsbip)() -* [mist.sounds.bloop](#mistsoundsbloop)() -* [mist.sounds.invite](#mistsoundsinvite)() +- [mist.platform](#mistplatform) +- [mist.requestAccount](#mistrequestaccountcallback)(callback) +- [mist.menu](#mistmenu) +- [mist.menu.add](#mistmenuaddid-options-callback)([id,] options, callback) +- [mist.menu.clear](#mistmenuclear)() +- [mist.menu.remove](#mistmenuremoveid)(id) +- [mist.menu.select](#mistmenuselectid)(text) +- [mist.menu.setBadge](#mistmenusetbadgetext)(text) +- [mist.menu.update](#mistmenuupdateid--options--callback)(id [, options][, callback]) +- [mist.sounds](#mistsounds) +- [mist.sounds.bip](#mistsoundsbip)() +- [mist.sounds.bloop](#mistsoundsbloop)() +- [mist.sounds.invite](#mistsoundsinvite)() ### mist.platform Returns the current platform, mist is running on: -* `darwin` (Mac OSX) -* `win32` (Windows) -* `linux` (Linux) +- `darwin` (Mac OSX) +- `win32` (Windows) +- `linux` (Linux) --- @@ -82,10 +82,10 @@ Adds/Updates a sub menu entry, which is placed below you dapp button in the side 1. `String` **optional** and id string to identify your sub menu entry when updating. 2. `Object` The menu options: - * `name` (`String`): The name of the sub menu button. - * `badge` (`String|null`) **optional**: The badge text for the sub menu button, e.g. `50`. - * `position` (`Number`) **optional**: The position of the submenu button, `1` is on the top. - * `selected` (`Boolean`) **optional**: Whether or not this sub menu entry is currently selected. + - `name` (`String`): The name of the sub menu button. + - `badge` (`String|null`) **optional**: The badge text for the sub menu button, e.g. `50`. + - `position` (`Number`) **optional**: The position of the submenu button, `1` is on the top. + - `selected` (`Boolean`) **optional**: Whether or not this sub menu entry is currently selected. 3. `Function` **optional**: The callback to be called when the sub menu entry is clicked. #### Minimal example @@ -167,10 +167,10 @@ Works like `mist.menu.add()`, but only the `id` parameter is required. 1. `String` and id string to identify your sub menu entry. 2. `Object` The menu options: - * `name` (`String`): (optional) The name of the sub menu button. - * `badge` (`String|null`): (optional) The badge text for the sub menu button, e.g. `50`. - * `position` (`Number`): (optional) The position of the submenu button, `1` is on the top. - * `selected` (`Boolean`): (optional) Whether or not this sub menu entry is currently selected. + - `name` (`String`): (optional) The name of the sub menu button. + - `badge` (`String|null`): (optional) The badge text for the sub menu button, e.g. `50`. + - `position` (`Number`): (optional) The position of the submenu button, `1` is on the top. + - `selected` (`Boolean`): (optional) Whether or not this sub menu entry is currently selected. 3. `Function` (optional) The callback to be called when the sub menu entry is clicked. #### Example diff --git a/README.md b/README.md index 0de4a7da5..7fc596ca8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Mist Browserbeta -[![Github All Releases](https://img.shields.io/github/downloads/ethereum/mist/total.svg)]() +[![Github All Releases](https://img.shields.io/github/downloads/ethereum/mist/total.svg)](http://www.somsubhra.com/github-release-stats/?username=ethereum&repository=mist) [![Build Status develop branch](https://travis-ci.org/ethereum/mist.svg?branch=develop)](https://travis-ci.org/ethereum/mist) +[![CircleCI](https://circleci.com/gh/ethereum/mist/tree/develop.svg?style=svg)](https://circleci.com/gh/ethereum/mist/tree/develop) [![Greenkeeper badge](https://badges.greenkeeper.io/ethereum/mist.svg)](https://greenkeeper.io/) [![Join the chat at https://gitter.im/ethereum/mist](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/mist) [![Code Triagers Badge](https://www.codetriage.com/ethereum/mist/badges/users.svg)](https://www.codetriage.com/ethereum/mist) @@ -10,34 +11,7 @@ The Mist browser is the tool of choice to browse and use Ðapps. For the Mist API see [MISTAPI.md](MISTAPI.md). -This repository is the Electron host for the [Meteor-based wallet dapp](https://github.com/ethereum/meteor-dapp-wallet). - -## Release candidate 0.11.0 up for testing - -Feedback thread for 0.11.0-rc https://github.com/ethereum/mist/issues/3979 - -Reddit post: https://www.reddit.com/r/ethereum/comments/8uelv6/mist_browser_beta_and_ethereum_wallet_0110_preview/ - -File | Checksum (SHA256) --- | -- -[Ethereum-Wallet-installer-0-11-0-rc.exe](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-installer-0-11-0-rc.exe) | `f5431a32a419fdd51a379a02806a0d1cf9fa6a80213661aba2e4713731010615` -[Ethereum-Wallet-linux32-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux32-0-11-0-rc.deb) | `161f69d2546999363c64b1c85f938469a37afc51719ed48d4f4b02f33fd0206e` -[Ethereum-Wallet-linux32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux32-0-11-0-rc.zip) | `9da6da638b3cb851df78fbe5bf65229147e5a43555463da65ef3a31f7cf93034` -[Ethereum-Wallet-linux64-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux64-0-11-0-rc.deb) | `dd32ee3c36e4dc2ef04a118b4a6a3402097d722947b09fac9f8914672df39642` -[Ethereum-Wallet-linux64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-linux64-0-11-0-rc.zip) | `e515eb3ae7db6c9eee89892ed3fafa221bc8a0caad5c76305e08ffd950b31764` -[Ethereum-Wallet-macosx-0-11-0-rc.dmg](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-macosx-0-11-0-rc.dmg) | `408f50aca5049aeace30ca2d6357d8dd11868ab2ab9828d4ee7286b9eeff1081` -[Ethereum-Wallet-win32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-win32-0-11-0-rc.zip) | `c605ed12070d185d387f6d649e35659d003a029ad2a7c0c5e9903b488ec1e676` -[Ethereum-Wallet-win64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Ethereum-Wallet-win64-0-11-0-rc.zip) | `199af74e86c627fd0bc09027c01725869c0beb1eb4d85bfc7d9b9a3979a17b07` -[Mist-installer-0-11-0-rc.exe](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-installer-0-11-0-rc.exe) | `e11569e77abbc7555cd570d427c007ce6ab35fcdf299d4094fab55de10a6f101` -[Mist-linux32-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux32-0-11-0-rc.deb) | `29045433ac1020447e1977949deee05ae8eaef7c157ec6d7766d4eefccb48b9c` -[Mist-linux32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux32-0-11-0-rc.zip) | `9efccc68184eaa250a5dcce8515ffca59c6ce092913ac0ca7c8bb3a9c7db164c` -[Mist-linux64-0-11-0-rc.deb](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux64-0-11-0-rc.deb) | `e29bc4de4c3090b07130b3d96b9b5aae7c216fb6d51900330440535ece7681b5` -[Mist-linux64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-linux64-0-11-0-rc.zip) | `9137183d774ba57d071d3d0b9dcd566d878ace10b745c5b689c3fa2a0997f457` -[Mist-macosx-0-11-0-rc.dmg](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-macosx-0-11-0-rc.dmg) | `7f8ce72b9693f03a47674ea616ae9e22f67582d27c1265fbc4746d9584a7eab8` -[Mist-win32-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-win32-0-11-0-rc.zip) | `f208bb6e00fc0f69ad36a028dc4278507fc5810def2415268b1a302e4e433a79` -[Mist-win64-0-11-0-rc.zip](http://ethereum-mist.s3.amazonaws.com/mist/0.11.0-rc/Mist-win64-0-11-0-rc.zip) | `632a1aaa24cfd92507be05b443ed4c4a2b8f618d4deb6324824d6cf06cdd50d9` - - +This repository is also the Electron host for the [Meteor-based wallet dapp](https://github.com/ethereum/meteor-dapp-wallet). ## Help and troubleshooting @@ -107,14 +81,6 @@ $ cd mist $ yarn ``` -To update Mist in the future, run: - -```bash -$ cd mist -$ git pull -$ yarn -``` - ### Run Mist For development we start the interface with a Meteor server for auto-reload etc. @@ -232,16 +198,16 @@ $ brew install gnu-tar libicns graphicsmagick xz To generate the binaries for Mist run: ```bash -$ gulp +$ yarn build:mist ``` -To generate the Ethereum Wallet (this will pack the one Ðapp from https://github.com/ethereum/meteor-dapp-wallet): +To generate the Ethereum Wallet: ```bash -$ gulp --wallet +$ yarn build:wallet ``` -The generated binaries will be under `dist_mist/release` or `dist_wallet/release`. +The generated binaries will be under `dist_mist/release` or `dist_wallet/release`. From 0.11.0, both Ethereum Wallet and Mist bundle a meteor-dapp-wallet instance (https://github.com/ethereum/meteor-dapp-wallet). #### Options @@ -250,41 +216,35 @@ The generated binaries will be under `dist_mist/release` or `dist_wallet/release To build binaries for specific platforms (default: all available) use the following flags: ```bash -$ gulp --mac # mac -$ gulp --linux # linux -$ gulp --win # windows +$ yarn build:mist --mac # mac +$ yarn build:mist --linux # linux +$ yarn build:mist --win # windows ``` -##### walletSource - -With the `walletSource` you can specify the Wallet branch to use, default is `master`: - - $ gulp --wallet --walletSource local - -Options are: - -- `master` -- [any meteor-dapp-wallet branch](https://github.com/ethereum/meteor-dapp-wallet/branches) -- `local` Will try to build the wallet from [mist/]../meteor-dapp-wallet/app - -_Note: applicable only when combined with `--wallet`_ - ##### skipTasks When building a binary, you can optionally skip some tasks — generally for testing purposes. ```bash -$ gulp --mac --skipTasks=bundling-interface,release-dist +$ yarn build:mist --mac --skipTasks=bundling-interface,release-dist ``` ##### Checksums -Spits out the MD5 checksums of the distributables. +Prints the SHA-256 checksums of the distributables. It expects installer/zip files to be in the generated folders e.g. `dist_mist/release` ```bash -$ gulp checksums [--wallet] +$ yarn task checksums [--wallet] +``` + +#### Tasks found in gulpfile.js and gulpTasks/ + +Any other gulp task can be run using `yarn task`. + +```bash +$ yarn task clean-dist ``` #### Cutting a release @@ -310,13 +270,14 @@ Tests run using [Spectron](https://github.com/electron/spectron/), a webdriver.i First make sure to build Mist with: ```bash -$ gulp +$ yarn build:mist ``` Then run the tests: ```bash -$ gulp test +$ yarn test:unit:once +$ yarn test:e2e ``` _Note: Integration tests are not yet supported on Windows._ diff --git a/gulpTasks/building.js b/gulpTasks/building.js index cf6eba58b..4329e7d1d 100644 --- a/gulpTasks/building.js +++ b/gulpTasks/building.js @@ -15,7 +15,7 @@ const type = options.type; const applicationName = options.wallet ? 'Ethereum Wallet' : 'Mist'; gulp.task('clean-dist', cb => { - return del([`./dist_${type}`, './meteor-dapp-wallet'], cb); + return del([`./dist_${type}`], cb); }); gulp.task('copy-app-source-files', () => { @@ -32,9 +32,7 @@ gulp.task('copy-app-source-files', () => { 'wallet/**/*', '!node_modules/electron/', '!node_modules/electron/**/*', - '!./tests/wallet/*', - '!./tests/mist/*', - '!./tests/unit/*' + '!./tests/**/*' ], { base: './' @@ -75,63 +73,43 @@ gulp.task('switch-production', cb => { }); gulp.task('pack-wallet', cb => { - if (options.type == 'mist') { - del(['./wallet', './meteor-dapp-wallet']).then(() => { - console.log('Building wallet...'); - exec( - `git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git && \ - cd meteor-dapp-wallet/app && \ - npm install && \ - ../../node_modules/.bin/meteor-build-client ../../wallet -p ""`, - (err, stdout, stderr) => { - console.log(stdout, stderr); - del(['./meteor-dapp-wallet']); - cb(err); - } - ); - }); - } else { - cb(); - } -}); - -gulp.task('bundling-interface', cb => { - const bundle = additionalCommands => { - const buildPath = path.join('..', `dist_${type}`, 'app', 'interface'); - + del(['./wallet']).then(() => { + console.log('Building wallet...'); + const buildPath = path.join('..', '..', 'wallet'); exec( - `../node_modules/.bin/meteor-build-client ${buildPath} -p "" ${additionalCommands}`, - { cwd: 'interface' }, - (err, stdout) => { - console.log(stdout); + `cd meteor-dapp-wallet/app \ + && yarn install \ + && "../../node_modules/.bin/meteor-build-client" ${buildPath} -p ""`, + (err, stdout, stderr) => { + console.log(stdout, stderr); cb(err); } ); - }; + }); +}); +// Currently, Mist and Ethereum Wallet expects ./wallet/ to be in different paths. This task aims to fulfill this requirement. +gulp.task('move-wallet', cb => { if (type === 'wallet') { - if (options.walletSource === 'local') { - console.log('Use local wallet at ../meteor-dapp-wallet/app'); - bundle(`&& cd ../../meteor-dapp-wallet/app \ - && npm install \ - && ../../../node_modules/.bin/meteor-build-client ../../mist/dist_${type}/app/interface/wallet -p ""`); - } else { - console.log( - `Pulling https://github.com/ethereum/meteor-dapp-wallet/tree/${ - options.walletSource - } "${options.walletSource}" branch...` - ); - bundle(`&& cd ../dist_${type} \ - && git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git \ - && cd meteor-dapp-wallet/app \ - && npm install \ - && ../../../node_modules/.bin/meteor-build-client ../../app/interface/wallet -p "" \ - && cd ../../ \ - && rm -rf meteor-dapp-wallet`); - } - } else { - bundle(); + console.debug('Moving ./wallet to ./interface/wallet'); + const basePath = path.join('dist_wallet', 'app'); + const fromPath = path.join(basePath, 'wallet'); + const toPath = path.join(basePath, 'interface', 'wallet'); + shell.mv(fromPath, toPath); } + cb(); +}); + +gulp.task('bundling-interface', cb => { + const buildPath = path.join('..', `dist_${type}`, 'app', 'interface'); + exec( + `"../node_modules/.bin/meteor-build-client" ${buildPath} -p ""`, + { cwd: 'interface' }, + (err, stdout) => { + console.log(stdout); + cb(err); + } + ); }); gulp.task('copy-i18n', () => { @@ -148,6 +126,7 @@ gulp.task('build-dist', cb => { name: applicationName.replace(/\s/, ''), productName: applicationName, description: applicationName, + license: 'GPL-3.0', homepage: 'https://github.com/ethereum/mist', build: { appId: `org.ethereum.${type}`, diff --git a/gulpfile.js b/gulpfile.js index 1a32c497a..c3842ac98 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -78,10 +78,12 @@ const tasks = [ 'copy-build-folder-files', 'switch-production', 'bundling-interface', + 'move-wallet', 'copy-i18n', 'build-dist', 'release-dist', - 'build-nsis' + 'build-nsis', + 'verify-artifacts' ].filter(task => !skipTasks.includes(task)); gulp.task('default', gulp.series(tasks)); diff --git a/interface/client/collections.js b/interface/client/collections.js index 5063df9b3..9384103de 100644 --- a/interface/client/collections.js +++ b/interface/client/collections.js @@ -15,4 +15,4 @@ if (typeof window.dbSync !== 'undefined') { Tabs = window.dbSync.frontendSyncInit(Tabs); LastVisitedPages = window.dbSync.frontendSyncInit(LastVisitedPages); History = window.dbSync.frontendSyncInit(History); -} \ No newline at end of file +} diff --git a/interface/client/lib/ethereum/1_web3js_init.js b/interface/client/lib/ethereum/1_web3js_init.js index 9762d4960..1fd35fbd9 100644 --- a/interface/client/lib/ethereum/1_web3js_init.js +++ b/interface/client/lib/ethereum/1_web3js_init.js @@ -3,4 +3,4 @@ if (typeof web3 !== 'undefined') { web3 = new Web3(web3.currentProvider); } else { web3 = new Web3('ws://localhost:8546'); -} \ No newline at end of file +} diff --git a/interface/client/styles/layout.import.less b/interface/client/styles/layout.import.less index 49e2478e8..f22224bf3 100644 --- a/interface/client/styles/layout.import.less +++ b/interface/client/styles/layout.import.less @@ -203,6 +203,6 @@ aside.sidebar { display: block; text-align: center; position: relative; - top: calc(~"50% + 30px"); + top: calc(~'50% + 30px'); } -} \ No newline at end of file +} diff --git a/interface/client/templates/popupWindows/importAccount.js b/interface/client/templates/popupWindows/importAccount.js index 55b2b0bd6..212eb24fe 100644 --- a/interface/client/templates/popupWindows/importAccount.js +++ b/interface/client/templates/popupWindows/importAccount.js @@ -126,7 +126,11 @@ Template['popupWindows_importAccount'].events({ 'newAccount', web3.utils.toChecksumAddress(address) ); - TemplateVar.setTo('.importAccount-screen', 'currentActive', 'account'); + TemplateVar.setTo( + '.importAccount-screen', + 'currentActive', + 'account' + ); // otherwise simply close the window } else { diff --git a/interface/package-lock.json b/interface/package-lock.json deleted file mode 100644 index 0976f4d38..000000000 --- a/interface/package-lock.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "Mist-Interface", - "version": "0.1.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@babel/runtime": { - "version": "7.0.0-beta.42", - "resolved": - "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.42.tgz", - "integrity": - "sha512-iOGRzUoONLOtmCvjUsZv3mZzgCT6ljHQY5fr1qG1QIiJQwtM7zbPWGGpa3QWETq+UqwWyJnoi5XZDZRwZDFciQ==", - "requires": { - "core-js": "2.5.3", - "regenerator-runtime": "0.11.1" - } - }, - "core-js": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": - "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": - "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - } - } -} diff --git a/interface/package.json b/interface/package.json index 8d3275aa4..fec77f8c2 100644 --- a/interface/package.json +++ b/interface/package.json @@ -10,7 +10,11 @@ "type": "git", "url": "git+https://github.com/ethereum/mist.git" }, - "keywords": ["ethereum", "mist", "web3"], + "keywords": [ + "ethereum", + "mist", + "web3" + ], "author": "Fabian Vogelsteller ", "license": "GPL-3.0", "bugs": { diff --git a/meteor-dapp-wallet b/meteor-dapp-wallet new file mode 160000 index 000000000..6a6463b1a --- /dev/null +++ b/meteor-dapp-wallet @@ -0,0 +1 @@ +Subproject commit 6a6463b1a6aa615e4364592c12c933ee816fb28b diff --git a/modules/core/settings/actions.js b/modules/core/settings/actions.js index 9ba4ebd7c..fbe581061 100644 --- a/modules/core/settings/actions.js +++ b/modules/core/settings/actions.js @@ -172,4 +172,4 @@ export function toggleSwarm(event) { export function setSwarmEnableOnStart() { return { type: '[MAIN]:SWARM:ENABLE_ON_START' }; -} \ No newline at end of file +} diff --git a/modules/ipc/ipcProviderBackend.js b/modules/ipc/ipcProviderBackend.js index f50b66a49..889785d01 100644 --- a/modules/ipc/ipcProviderBackend.js +++ b/modules/ipc/ipcProviderBackend.js @@ -187,9 +187,12 @@ class IpcProviderBackend { } }) .then(() => { - return socket.connect(Settings.rpcConnectConfig, { - timeout: 5000 - }); + return socket.connect( + Settings.rpcConnectConfig, + { + timeout: 5000 + } + ); }) .then(() => { log.debug(`Socket connected, id=${ownerId}`); @@ -236,7 +239,9 @@ class IpcProviderBackend { * @param {String} state The new state. */ _onNodeStateChanged(state) { - switch (state) { // eslint-disable-line default-case + switch ( + state // eslint-disable-line default-case + ) { // stop syncing when node about to be stopped case ethereumNode.STATES.STOPPING: log.info('Ethereum node stopping, disconnecting sockets'); diff --git a/modules/preloader/injected/BigNumber.js b/modules/preloader/injected/BigNumber.js index 89a4661af..7d0a74866 100644 --- a/modules/preloader/injected/BigNumber.js +++ b/modules/preloader/injected/BigNumber.js @@ -204,7 +204,9 @@ return ( (t = r + t * b - 1) > G ? (e.c = e.e = null) - : $ > t ? (e.c = [(e.e = 0)]) : ((e.e = t), (e.c = n)), + : $ > t + ? (e.c = [(e.e = 0)]) + : ((e.e = t), (e.c = n)), e ); } @@ -263,7 +265,7 @@ (o += b), (u = n), (l = a[(f = 0)]), - (c = ((l / h[i - u - 1]) % 10) | 0); + (c = (l / h[i - u - 1]) % 10 | 0); else if (((f = g((o + 1) / b)), f >= a.length)) { if (!r) break e; for (; a.length <= f; a.push(0)); @@ -272,7 +274,7 @@ for (l = s = a[f], i = 1; s >= 10; s /= 10, i++); (o %= b), (u = o - b + i), - (c = 0 > u ? 0 : ((l / h[i - u - 1]) % 10) | 0); + (c = 0 > u ? 0 : (l / h[i - u - 1]) % 10 | 0); } if ( ((r = @@ -288,8 +290,8 @@ (4 == t || r || (6 == t && - ((o > 0 ? (u > 0 ? l / h[i - u] : 0) : a[f - 1]) % - 10) & + (o > 0 ? (u > 0 ? l / h[i - u] : 0) : a[f - 1]) % + 10 & 1) || t == (e.s < 0 ? 8 : 7)))), 1 > n || !a[0]) @@ -298,7 +300,7 @@ (a.length = 0), r ? ((n -= e.e + 1), - (a[0] = h[(b - n % b) % b]), + (a[0] = h[(b - (n % b)) % b]), (e.e = -n || 0)) : (a[0] = e.e = 0), e @@ -568,7 +570,9 @@ if (!(L && L[0] && U && U[0])) return new a( i.s && o.s && (L ? !U || L[0] != U[0] : U) - ? (L && 0 == L[0]) || !U ? 0 * x : x / 0 + ? (L && 0 == L[0]) || !U + ? 0 * x + : x / 0 : NaN ); for ( @@ -1176,12 +1180,16 @@ o = t.e; return ( null === o - ? i ? ((n = 'Infinity'), 0 > i && (n = '-' + n)) : (n = 'NaN') + ? i + ? ((n = 'Infinity'), 0 > i && (n = '-' + n)) + : (n = 'NaN') : ((n = r(t.c)), (n = null != e && V(e, 2, 64, 25, 'base') ? A(f(n, o), 0 | e, 10, i) - : q >= o || o >= k ? l(n, o) : f(n, o)), + : q >= o || o >= k + ? l(n, o) + : f(n, o)), 0 > i && t.c[0] && (n = '-' + n)), n ); diff --git a/modules/updateChecker.js b/modules/updateChecker.js index f546d8578..825b1efc4 100644 --- a/modules/updateChecker.js +++ b/modules/updateChecker.js @@ -14,7 +14,9 @@ const check = (exports.check = () => { let str = null; - switch (Settings.uiMode) { // eslint-disable-line default-case + switch ( + Settings.uiMode // eslint-disable-line default-case + ) { case 'mist': str = 'mist'; break; diff --git a/package.json b/package.json index dee2c627d..d6724ef71 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,27 @@ { "name": "Mist", - "version": "0.11.0", + "version": "0.11.1", "license": "GPL-3.0", "author": "Ethereum Mist Team ", + "description": "Ethereum Mist", "repository": { "type": "git", "url": "https://github.com/ethereum/mist.git" }, "scripts": { "precommit": "pretty-quick --staged", - "postinstall": "electron-builder install-app-deps; (cd interface && yarn); yarn dev:rebuild; gulp pack-wallet", + "postinstall": "git submodule update --recursive && (cd interface && yarn) && which meteor || curl https://install.meteor.com/?release=1.6.1 | /bin/sh", "dev:electron": "electron -r babel-register main.js", "dev:meteor": "cd interface && meteor --no-release-check", "dev:tools": "remotedev & (sleep 3 && open http://localhost:8000)", - "dev:rebuild": "./node_modules/.bin/electron-rebuild", - "test:basic": "gulp test --test=basic", "test:unit": "mocha --compilers babel-register tests/unit/**/* --watch", - "test:unit:once": "mocha --compilers babel-register tests/unit/**/*" + "test:unit:once": "mocha --compilers babel-register tests/unit/**/*", + "test:e2e": "gulp test", + "build:wallet": "gulp --wallet", + "build:mist": "gulp --mist", + "dist:mist": "gulp upload-queue --mist", + "dist:wallet": "gulp upload-queue --wallet", + "task": "gulp" }, "main": "main.js", "dependencies": { @@ -34,7 +39,6 @@ "ethereumjs-abi": "^0.6.3", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.2", - "ethereumjs-wallet": "^0.6.0", "fs-promise": "^2.0.0", "got": "^7.1.0", "i18next": "^8.4.3", @@ -69,8 +73,7 @@ "del": "^3.0.0", "ecstatic": "^2.1.0", "electron": "1.8.4", - "electron-builder": "^20.8.1", - "electron-rebuild": "^1.7.3", + "electron-builder": "^20.17.2", "eslint": "^4.19.1", "eslint-config-prettier": "^2.9.0", "eslint-plugin-import": "^2.12.0", diff --git a/yarn.lock b/yarn.lock index 728e1b664..c386f4c6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,10 +39,6 @@ addressparser@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746" -aes-js@^0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-0.2.4.tgz#94b881ab717286d015fa219e08fb66709dda5a3d" - agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce" @@ -57,13 +53,6 @@ ajv-keywords@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" @@ -73,9 +62,9 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.4.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.1.tgz#88ebc1263c7133937d108b80c5572e64e1d9322d" +ajv@^6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360" dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -167,17 +156,9 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -app-builder-bin@1.9.11: - version "1.9.11" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.11.tgz#bf04d4cdfc0a8ed83acedc5f9ab16be73b5a3a57" - -app-builder-bin@1.9.5: - version "1.9.5" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.5.tgz#f4e2b26e26578c9a48cea85da44f0bc1a7582fc0" - -app-builder-bin@1.9.7: - version "1.9.7" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.7.tgz#9f01439fa8088a43471df9e5e071dd3880a8cff0" +app-builder-bin@1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.11.1.tgz#33741167f2873cf76805c9557b62caac8ede017b" append-buffer@^1.0.2: version "1.0.2" @@ -780,10 +761,6 @@ base-64@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" -base-x@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-1.1.0.tgz#42d3d717474f9ea02207f6d1aa1f426913eeb7ac" - base64-js@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978" @@ -1036,23 +1013,6 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -bs58@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d" - -bs58@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bs58/-/bs58-3.1.0.tgz#d4c26388bf4804cac714141b1945aa47e5eb248e" - dependencies: - base-x "^1.1.0" - -bs58check@^1.0.8: - version "1.3.4" - resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-1.3.4.tgz#c52540073749117714fa042c3047eb8f9151cbf8" - dependencies: - bs58 "^3.1.0" - create-hash "^1.1.0" - 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" @@ -1121,71 +1081,33 @@ buffers@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" -builder-util-runtime@4.2.1, builder-util-runtime@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.2.1.tgz#0caa358f1331d70680010141ca591952b69b35bc" +builder-util-runtime@4.4.0, builder-util-runtime@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.4.0.tgz#1f486819df12a04abfa128fe082e7c54edda0ef7" dependencies: bluebird-lst "^1.0.5" debug "^3.1.0" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" sax "^1.2.4" -builder-util@5.11.1: - version "5.11.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.1.tgz#e1540935bc0efcb3948ae364a2f71e08d7bc82e0" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.5" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - debug "^3.1.0" - fs-extra-p "^4.6.0" - is-ci "^1.1.0" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.6" - stat-mode "^0.2.2" - temp-file "^3.1.2" - -builder-util@5.11.2: - version "5.11.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.2.tgz#2d4829f0743ce1b654e94586fade63fd6cfefae5" +builder-util@5.16.0, builder-util@^5.14.0, builder-util@~5.16.0: + version "5.16.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.16.0.tgz#8b9aabe15a1a5c4ffa8ebc511049248918f717df" dependencies: "7zip-bin" "~4.0.2" - app-builder-bin "1.9.7" + app-builder-bin "1.11.1" bluebird-lst "^1.0.5" - builder-util-runtime "^4.2.1" + builder-util-runtime "^4.4.0" chalk "^2.4.1" debug "^3.1.0" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" is-ci "^1.1.0" - js-yaml "^3.11.0" + js-yaml "^3.12.0" lazy-val "^1.0.3" semver "^5.5.0" source-map-support "^0.5.6" stat-mode "^0.2.2" - temp-file "^3.1.2" - -builder-util@^5.11.0, builder-util@^5.11.2: - version "5.11.4" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.4.tgz#24d72aa567ecfeacca72b0740b4ddbffaaef617c" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.11" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - debug "^3.1.0" - fs-extra-p "^4.6.0" - is-ci "^1.1.0" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.6" - stat-mode "^0.2.2" - temp-file "^3.1.2" + temp-file "^3.1.3" buildmail@4.0.1: version "4.0.1" @@ -1385,10 +1307,6 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" -cli-spinners@^1.0.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" - cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" @@ -1452,13 +1370,6 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" -coinstring@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/coinstring/-/coinstring-2.3.0.tgz#cdb63363a961502404a25afb82c2e26d5ff627a4" - dependencies: - bs58 "^2.0.1" - create-hash "^1.1.1" - collection-map@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c" @@ -1492,7 +1403,7 @@ color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" -colors@^1.1.2, colors@^1.3.0: +colors@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.0.tgz#5f20c9fef6945cb1134260aab33bfbdc8295e04e" @@ -1645,7 +1556,7 @@ create-error-class@^3.0.0: dependencies: capture-stack-trace "^1.0.0" -create-hash@^1.1.0, create-hash@^1.1.1, create-hash@^1.1.2: +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" dependencies: @@ -1762,7 +1673,7 @@ dateformat@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" -debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.5.1, debug@^2.6.3, debug@^2.6.8, debug@^2.6.9: +debug@2, 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" dependencies: @@ -1774,7 +1685,7 @@ debug@2.6.8: dependencies: ms "2.0.0" -debug@3.1.0, debug@^3.0.0, debug@^3.1.0, debug@~3.1.0: +debug@3.1.0, debug@^3.1.0, debug@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: @@ -1784,6 +1695,12 @@ decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" +decamelize@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7" + dependencies: + xregexp "4.0.0" + decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -1968,7 +1885,7 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" -detect-libc@^1.0.2, detect-libc@^1.0.3: +detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -1988,16 +1905,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dmg-builder@4.10.1: - version "4.10.1" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.10.1.tgz#5603daa1f93e23b6b3572549f188a62e16eb1ffb" +dmg-builder@4.14.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.14.0.tgz#6d19922a82cee78cc13557ab0cbc16047864002a" dependencies: bluebird-lst "^1.0.5" - builder-util "^5.11.0" - electron-builder-lib "~20.14.6" - fs-extra-p "^4.6.0" + builder-util "~5.16.0" + electron-builder-lib "~20.20.4" + fs-extra-p "^4.6.1" iconv-lite "^0.4.23" - js-yaml "^3.11.0" + js-yaml "^3.12.0" parse-color "^1.0.0" sanitize-filename "^1.6.1" @@ -2028,9 +1945,9 @@ dotenv-expand@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" -dotenv@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef" +dotenv@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935" double-ended-queue@^2.1.0-0: version "2.1.0-0" @@ -2103,84 +2020,54 @@ ejs@~2.5.6: version "2.5.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5" -electron-builder-lib@20.15.1: - version "20.15.1" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.15.1.tgz#d2675e71918f62561cf5ecae633dfe5f4219d0e3" +electron-builder-lib@20.20.4, electron-builder-lib@~20.20.4: + version "20.20.4" + resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.20.4.tgz#fd129ae85c5514f16f4f392218141ebe3dc8411d" dependencies: "7zip-bin" "~4.0.2" - app-builder-bin "1.9.7" + app-builder-bin "1.11.1" async-exit-hook "^2.0.1" bluebird-lst "^1.0.5" - builder-util "5.11.2" - builder-util-runtime "4.2.1" + builder-util "5.16.0" + builder-util-runtime "4.4.0" chromium-pickle-js "^0.2.0" debug "^3.1.0" ejs "^2.6.1" electron-osx-sign "0.4.10" - electron-publish "20.15.0" - fs-extra-p "^4.6.0" - hosted-git-info "^2.6.0" - is-ci "^1.1.0" - isbinaryfile "^3.0.2" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - minimatch "^3.0.4" - normalize-package-data "^2.4.0" - plist "^3.0.1" - read-config-file "3.0.1" - sanitize-filename "^1.6.1" - semver "^5.5.0" - stream-json "^0.6.1" - temp-file "^3.1.2" - -electron-builder-lib@~20.14.6: - version "20.14.7" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.14.7.tgz#db91977dd13b0a288e1da5629183807a9847de21" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.5" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.5" - builder-util "5.11.1" - builder-util-runtime "4.2.1" - chromium-pickle-js "^0.2.0" - debug "^3.1.0" - ejs "^2.6.1" - electron-osx-sign "0.4.10" - electron-publish "20.14.6" - fs-extra-p "^4.6.0" - hosted-git-info "^2.6.0" + electron-publish "20.22.0" + env-paths "^1.0.0" + fs-extra-p "^4.6.1" + hosted-git-info "^2.7.1" is-ci "^1.1.0" isbinaryfile "^3.0.2" - js-yaml "^3.11.0" + 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.0.1" + read-config-file "3.1.0" sanitize-filename "^1.6.1" semver "^5.5.0" - stream-json "^0.6.1" - temp-file "^3.1.2" + sumchecker "^2.0.2" + temp-file "^3.1.3" -electron-builder@^20.8.1: - version "20.15.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.15.1.tgz#078cda29bdb7240244e9bccf30740b1ea42deb44" +electron-builder@^20.17.2: + version "20.20.4" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.20.4.tgz#09d879c6551df801444a153dc7b159a304e1d55d" dependencies: bluebird-lst "^1.0.5" - builder-util "5.11.2" - builder-util-runtime "4.2.1" + builder-util "5.16.0" + builder-util-runtime "4.4.0" chalk "^2.4.1" - dmg-builder "4.10.1" - electron-builder-lib "20.15.1" - electron-download-tf "4.3.4" - fs-extra-p "^4.6.0" + dmg-builder "4.14.0" + electron-builder-lib "20.20.4" + fs-extra-p "^4.6.1" is-ci "^1.1.0" lazy-val "^1.0.3" - read-config-file "3.0.1" + read-config-file "3.1.0" sanitize-filename "^1.6.1" update-notifier "^2.5.0" - yargs "^11.0.0" + yargs "^12.0.1" electron-chromedriver@~1.8.0: version "1.8.0" @@ -2189,20 +2076,6 @@ electron-chromedriver@~1.8.0: electron-download "^4.1.0" extract-zip "^1.6.5" -electron-download-tf@4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/electron-download-tf/-/electron-download-tf-4.3.4.tgz#b03740b2885aa2ad3f8784fae74df427f66d5165" - 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-download@^3.0.1: version "3.3.0" resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-3.3.0.tgz#2cfd54d6966c019c4d49ad65fbe65cc9cdef68c8" @@ -2242,45 +2115,18 @@ electron-osx-sign@0.4.10: minimist "^1.2.0" plist "^2.1.0" -electron-publish@20.14.6: - version "20.14.6" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.14.6.tgz#ced15b0c08fdaef2fb25beba9f55f20d1c19e215" - dependencies: - bluebird-lst "^1.0.5" - builder-util "^5.11.0" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - fs-extra-p "^4.6.0" - lazy-val "^1.0.3" - mime "^2.3.1" - -electron-publish@20.15.0: - version "20.15.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.15.0.tgz#4dd96b2ce82b8856342a6d60dda571669a390d2d" +electron-publish@20.22.0: + version "20.22.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.22.0.tgz#352f04fc4821176e0c40a16d64b1c94026e2441f" dependencies: bluebird-lst "^1.0.5" - builder-util "^5.11.2" - builder-util-runtime "^4.2.1" + builder-util "^5.14.0" + builder-util-runtime "^4.4.0" chalk "^2.4.1" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" lazy-val "^1.0.3" mime "^2.3.1" -electron-rebuild@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.7.3.tgz#24ae06ad9dd61cb7e4d688961f49118c40a110eb" - dependencies: - colors "^1.1.2" - debug "^2.6.3" - detect-libc "^1.0.3" - fs-extra "^3.0.1" - node-abi "^2.0.0" - node-gyp "^3.6.0" - ora "^1.2.0" - rimraf "^2.6.1" - spawn-rx "^2.0.10" - yargs "^7.0.2" - electron-redux@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/electron-redux/-/electron-redux-1.3.1.tgz#650a76cdeb12358f57b5c7db744224d08999ae08" @@ -2624,7 +2470,7 @@ ethereumjs-tx@^1.3.3: ethereum-common "^0.0.18" ethereumjs-util "^5.0.0" -ethereumjs-util@^4.3.0, ethereumjs-util@^4.4.0: +ethereumjs-util@^4.3.0: version "4.5.0" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6" dependencies: @@ -2646,18 +2492,6 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.2: safe-buffer "^5.1.1" secp256k1 "^3.0.1" -ethereumjs-wallet@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz#82763b1697ee7a796be7155da9dfb49b2f98cfdb" - dependencies: - aes-js "^0.2.3" - bs58check "^1.0.8" - ethereumjs-util "^4.4.0" - hdkey "^0.7.0" - scrypt.js "^0.2.0" - utf8 "^2.1.1" - uuid "^2.0.1" - ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -2959,6 +2793,12 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + dependencies: + locate-path "^3.0.0" + findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -3046,14 +2886,6 @@ form-data@~2.0.0: combined-stream "^1.0.5" mime-types "^2.1.11" -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - form-data@~2.3.0, form-data@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" @@ -3080,12 +2912,12 @@ fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" -fs-extra-p@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.6.0.tgz#c7b7117f0dcf8a99c9b2ed589067c960abcf3ef9" +fs-extra-p@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/fs-extra-p/-/fs-extra-p-4.6.1.tgz#6156e0cc98097f415fcd17029578fc41c78b5092" dependencies: bluebird-lst "^1.0.5" - fs-extra "^6.0.0" + fs-extra "^6.0.1" fs-extra@2.0.0: version "2.0.0" @@ -3111,23 +2943,7 @@ fs-extra@^2.0.0, fs-extra@^2.1.2: graceful-fs "^4.1.2" jsonfile "^2.1.0" -fs-extra@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^3.0.0" - universalify "^0.1.0" - -fs-extra@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^6.0.0: +fs-extra@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" dependencies: @@ -3168,7 +2984,7 @@ fsevents@^1.1.2: nan "^2.9.2" node-pre-gyp "^0.10.0" -fstream@^1.0.0, fstream@^1.0.2, fstream@^1.0.8, fstream@~1.0.10: +fstream@^1.0.2, fstream@^1.0.8, fstream@~1.0.10: version "1.0.11" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" dependencies: @@ -3554,10 +3370,6 @@ gulplog@^1.0.0: dependencies: glogg "^1.0.0" -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -3571,13 +3383,6 @@ har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - har-validator@~5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" @@ -3692,13 +3497,6 @@ hawk@~6.0.2: hoek "4.x.x" sntp "2.x.x" -hdkey@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632" - dependencies: - coinstring "^2.0.0" - secp256k1 "^3.0.1" - he@1.1.1, he@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" @@ -3743,10 +3541,14 @@ homedir-polyfill@^1.0.1: dependencies: parse-passwd "^1.0.0" -hosted-git-info@^2.1.4, hosted-git-info@^2.6.0: +hosted-git-info@^2.1.4: version "2.6.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" +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" + http-errors@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" @@ -4300,7 +4102,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@^3.11.0, js-yaml@^3.9.1: +js-yaml@^3.12.0, js-yaml@^3.9.1: version "3.12.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" dependencies: @@ -4339,7 +4141,7 @@ json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" -json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: +json-stable-stringify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" dependencies: @@ -4373,12 +4175,6 @@ jsonfile@^2.1.0, jsonfile@^2.2.3: optionalDependencies: graceful-fs "^4.1.6" -jsonfile@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" - 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" @@ -4574,6 +4370,13 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + lodash-es@^4.2.1: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05" @@ -4625,7 +4428,7 @@ lodash._root@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" -lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: +lodash.assign@^4.0.3, lodash.assign@^4.0.6: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -4716,12 +4519,6 @@ log-rotate@^0.2.7: version "0.2.8" resolved "https://registry.yarnpkg.com/log-rotate/-/log-rotate-0.2.8.tgz#1003c89ece53b5fe8a28dbc4d70bcada9d61b8c5" -log-symbols@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - dependencies: - chalk "^2.0.1" - log4js@^2.4.1: version "2.8.0" resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.8.0.tgz#9f42fcc4fe82004dfd136604dd7bc1c35d61d6c5" @@ -5146,12 +4943,6 @@ next-tick@1: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" -node-abi@^2.0.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923" - dependencies: - semver "^5.4.1" - node-fetch@^1.0.1, node-fetch@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -5159,23 +4950,6 @@ node-fetch@^1.0.1, node-fetch@^1.7.3: encoding "^0.1.11" is-stream "^1.0.1" -node-gyp@^3.6.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.7.0.tgz#789478e8f6c45e277aa014f3e28f958f286f9203" - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request ">=2.9.0 <2.82.0" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - node-pre-gyp@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46" @@ -5255,12 +5029,6 @@ nodemailer@^2.5.0: nodemailer-smtp-transport "2.7.2" socks "1.1.9" -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -5314,7 +5082,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2: +npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: @@ -5323,7 +5091,7 @@ npm-run-path@^2.0.0: gauge "~2.7.3" set-blocking "~2.0.0" -nugget@^2.0.0, nugget@^2.0.1: +nugget@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0" dependencies: @@ -5474,15 +5242,6 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -ora@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5" - dependencies: - chalk "^2.1.0" - cli-cursor "^2.1.0" - cli-spinners "^1.0.1" - log-symbols "^2.1.0" - ordered-read-streams@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" @@ -5519,7 +5278,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@0, osenv@^0.1.4: +osenv@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" dependencies: @@ -5544,12 +5303,24 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" +p-limit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec" + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" dependencies: p-limit "^1.1.0" +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + dependencies: + p-limit "^2.0.0" + p-map@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" @@ -5564,6 +5335,10 @@ p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" +p-try@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" + pac-proxy-agent@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz#90d9f6730ab0f4d2607dcdcd4d3d641aa26c3896" @@ -5637,10 +5412,6 @@ parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" -parser-toolkit@>=0.0.3: - version "0.0.5" - resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01" - parseurl@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" @@ -5731,10 +5502,6 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -5983,10 +5750,6 @@ qs@~6.2.0: version "6.2.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe" -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - query-string@^5.0.1: version "5.1.1" resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" @@ -6038,7 +5801,7 @@ raw-body@2.3.3, raw-body@^2.2.0: iconv-lite "0.4.23" unpipe "1.0.0" -rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1: +rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: @@ -6047,17 +5810,17 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.0.1.tgz#307ed2e162fa54306d0ae6d41e9cdc829720d2a9" +read-config-file@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.1.0.tgz#d433283c76f32204d6995542e4a04723db9e8308" dependencies: - ajv "^6.4.0" + ajv "^6.5.2" ajv-keywords "^3.2.0" bluebird-lst "^1.0.5" - dotenv "^5.0.1" + dotenv "^6.0.0" dotenv-expand "^4.2.0" - fs-extra-p "^4.6.0" - js-yaml "^3.11.0" + fs-extra-p "^4.6.1" + js-yaml "^3.12.0" json5 "^1.0.1" lazy-val "^1.0.3" @@ -6367,33 +6130,6 @@ request@2.75.x: tough-cookie "~2.3.0" tunnel-agent "~0.4.1" -"request@>=2.9.0 <2.82.0": - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - request@^2.0.0, request@^2.45.0, request@^2.74.0, request@^2.79.0, request@^2.81.0, request@^2.85.0: version "2.87.0" resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" @@ -6576,12 +6312,6 @@ rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -rxjs@^5.1.1: - version "5.5.11" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87" - dependencies: - symbol-observable "1.0.1" - safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -6697,7 +6427,7 @@ sc-simple-broker@~2.1.0: dependencies: sc-channel "~1.2.0" -scrypt.js@0.2.0, scrypt.js@^0.2.0: +scrypt.js@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/scrypt.js/-/scrypt.js-0.2.0.tgz#af8d1465b71e9990110bedfc593b9479e03a8ada" dependencies: @@ -6751,14 +6481,10 @@ semver-greatest-satisfied-range@^1.1.0: dependencies: sver-compat "^1.5.0" -"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@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - send@0.16.2: version "0.16.2" resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" @@ -7093,14 +6819,6 @@ sparkles@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c" -spawn-rx@^2.0.10: - version "2.0.12" - resolved "https://registry.yarnpkg.com/spawn-rx/-/spawn-rx-2.0.12.tgz#b6285294499426089beea0c3c1ec32d7fc57a376" - dependencies: - debug "^2.5.1" - lodash.assign "^4.2.0" - rxjs "^5.1.1" - spawn-sync@^1.0.15: version "1.0.15" resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" @@ -7206,12 +6924,6 @@ stream-exhaust@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" -stream-json@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.6.1.tgz#c9413e7f42ba8eac4883be712220455f64dcea67" - dependencies: - parser-toolkit ">=0.0.3" - stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" @@ -7370,10 +7082,6 @@ swarm-js@0.1.37, swarm-js@^0.1.21: tar.gz "^1.0.5" xhr-request-promise "^0.1.2" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - symbol-observable@^1.0.2, symbol-observable@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -7411,7 +7119,7 @@ tar.gz@^1.0.5: mout "^0.11.0" tar "^2.1.1" -tar@^2.0.0, tar@^2.1.1: +tar@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -7431,13 +7139,13 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" -temp-file@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.2.tgz#54ba4084097558e8ff2ad1e4bd84841ef2804043" +temp-file@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.1.3.tgz#24c144994f033be1ccf6773280c8f7f1c91691a9" dependencies: async-exit-hook "^2.0.1" bluebird-lst "^1.0.5" - fs-extra-p "^4.6.0" + fs-extra-p "^4.6.1" lazy-val "^1.0.3" term-size@^1.2.0: @@ -7817,10 +7525,6 @@ utf8@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" -utf8@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" - util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -7841,11 +7545,7 @@ uuid@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" -uuid@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - -uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: +uuid@^3.0.1, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" @@ -8195,7 +7895,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.2.14, which@^1.2.4, which@^1.2.9: +which@^1.2.14, which@^1.2.4, which@^1.2.9: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: @@ -8340,6 +8040,10 @@ xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" +xregexp@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" + xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -8354,6 +8058,10 @@ y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" +"y18n@^3.2.1 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" @@ -8366,6 +8074,12 @@ yallist@^3.0.0, yallist@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" +yargs-parser@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + dependencies: + camelcase "^4.1.0" + yargs-parser@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" @@ -8385,19 +8099,13 @@ yargs-parser@^7.0.0: dependencies: camelcase "^4.1.0" -yargs-parser@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" - dependencies: - camelcase "^4.1.0" - -yargs@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b" +yargs@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2" dependencies: cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" + decamelize "^2.0.0" + find-up "^3.0.0" get-caller-file "^1.0.1" os-locale "^2.0.0" require-directory "^2.1.1" @@ -8405,8 +8113,8 @@ yargs@^11.0.0: set-blocking "^2.0.0" string-width "^2.0.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^9.0.2" + y18n "^3.2.1 || ^4.0.0" + yargs-parser "^10.1.0" yargs@^4.3.2, yargs@^4.7.1: version "4.8.1" @@ -8427,7 +8135,7 @@ yargs@^4.3.2, yargs@^4.7.1: y18n "^3.2.1" yargs-parser "^2.4.1" -yargs@^7.0.2, yargs@^7.1.0: +yargs@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" dependencies: