From de0f02d00a1106395602f7c8c71a9abeb272f5f4 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Mon, 25 Feb 2019 14:47:54 -0600 Subject: [PATCH] build: make DApp templates member packages of the monorepo Previously, templates were in a subdirectory of `packages/embark`. Reorganize them so that they are member packages of the monorepo. This allows them to cleanly depend on other members of the monorepo, e.g. `embarkjs-connector-web3`. It is desirable for the templates, in the context of the monorepo, to specify embark as a dependency, to take advantage of `npx embark test` (and it's a "forward looking" setup re: how we plan to evolve embark). However, if embark were to specify the template packages as dependencies a circular relationship would be introduced, which is [unsupported by Lerna][circular]. Therefore, revise the template generator so that all templates are resolved / fetched at runtime, i.e. `boilerplate`, `demo`, and `simple` are no longer "built-ins" *per se*. This change won't be apparent to embark's users, but it does mean that the template generator won't work (in a production install of embark) if it can't connect to the npm registry, i.e. when the user runs `embark demo` or `embark new [--simple]`. When embark is inside the monorepo, templates are resolved and copied from the yarn workspace rather than being fetched from the registry, which is convenient for development. Also, any template dependencies that are members of the monorepo are linked into the copied template's `node_modules` rather than being installed from the registry, again for convenience. During template generation, remove scripts and dependencies that pertain only to membership in the monorepo; for now, that involves removing embark as a dependency since we're not quite ready for that arrangement to be the default, i.e. outside of the monorepo. Refactor the root scripts so that more of them can consistently be used with Lerna's filter options, e.g. `--scope` and `--ignore`. "Combo" scripts that don't support filtering generally have a `:full` postfix. Flip `clean` and `reset` scripts at the root and in the member packages for consistency re: Lerna's notion of `clean` and embark's notion of `reset`. Have each package run its `reset` script when its `clean` script is invoked (and that's all for now), relying on `lerna clean` to delete packages' `node_modules` in view of how Lerna's topological sorting works. Lift the implementation of `embark reset` into a private package in `packages/embark-reset` and make it a bundled dependency of embark. Packages in `dapps/*` depend on `embark-reset` directly and make use of it with `npx embark-reset` (but only in monorepo context). This removes a "wart" where reboots could show errors when embark's sources aren't already built in `packages/embark/dist`. Users will not notice any difference since `embark reset` works as before, transparently making use of the `embark-reset` package. The only downside to having it be a bundled dependency of embark is that bundled deps have all of their `node_modules` included in the tarball built with `npm pack` (that's why having the templates as bundled dependencies of embark isn't a viable approach). However, `embark-reset` only has one dependency, `rimraf`, which is a tiny module, so the cost seems acceptable. As part of the reorganization, move `test_dapps` into `dapps/tests` and `packages/embark/templates` into `dapps/templates`. Keep the directory names short but revise the package names to facilitate simple filtering with `embark-dapp-*`. Consolidate `.yarnrc` and `.gitignore` and clean up some redundant ignore listings. Scripts run with `--scope embark-dapp-*` use `--concurrency=1` to avoid conflicts that could arise over network ports. The `ci:full` and `qa:full` scripts use `--concurrency=1` in all scopes, for two reasons: resource limitations on Travis and AppVeyor result in slower runs with concurrency >1, and if something fails in those contexts it's easier to see what went wrong when Lerna's output isn't interleaved from a bunch of scripts in `packages/*`. Bump the Lerna version. [circular]: https://github.com/lerna/lerna/issues/1198#issuecomment-442278902 --- .travis.yml | 2 +- appveyor.yml | 2 +- {test_dapps => dapps}/.gitignore | 5 +- {test_dapps => dapps}/.yarnrc | 0 .../templates/boilerplate}/.npmrc | 0 .../templates/boilerplate/app/css/.gitkeep | 0 .../templates/boilerplate/app/images/.gitkeep | 0 .../templates/boilerplate/app/index.html | 0 .../templates/boilerplate/app/js/.gitkeep | 0 .../templates/boilerplate/app/js/index.js | 0 dapps/templates/boilerplate/config/.npmignore | 2 + .../boilerplate/config/blockchain.js | 0 .../boilerplate/config/communication.js | 0 .../templates/boilerplate/config/contracts.js | 0 .../boilerplate/config/development/password | 0 .../boilerplate/config/namesystem.js | 0 .../templates/boilerplate/config/pipeline.js | 0 .../config/privatenet/genesis-parity.json | 0 .../config/privatenet/genesis.json | 0 .../boilerplate/config/privatenet/password | 0 .../templates/boilerplate/config/storage.js | 0 .../boilerplate/config/testnet/password | 0 .../templates/boilerplate/config/webserver.js | 0 .../templates/boilerplate/contracts/.gitkeep | 0 .../templates/boilerplate}/dot.gitignore | 3 +- .../templates/boilerplate/dot.npmrc | 0 .../templates/boilerplate/embark.json | 0 dapps/templates/boilerplate/package.json | 32 + .../boilerplate/test/contract_spec.js | 0 .../templates/demo}/.npmrc | 0 .../demo/app/components/blockchain.js | 0 .../templates/demo/app/components/ens.js | 0 .../templates/demo/app/components/storage.js | 0 .../templates/demo/app/components/whisper.js | 0 .../templates/demo/app/dapp.css | 0 .../templates/demo/app/dapp.js | 0 .../templates/demo/app/images}/.gitkeep | 0 .../templates/demo/app/index.html | 0 dapps/templates/demo/config/.npmignore | 2 + .../templates/demo/config/blockchain.js | 0 .../templates/demo/config/communication.js | 0 .../templates/demo/config/contracts.js | 0 .../demo/config/development/password | 0 .../templates/demo/config/namesystem.js | 0 .../templates/demo/config/pipeline.js | 0 .../config/privatenet/genesis-parity.json | 0 .../demo/config/privatenet/genesis.json | 0 .../templates/demo/config/privatenet/password | 0 .../templates/demo/config/storage.js | 0 .../templates/demo/config/testnet/password | 0 .../templates/demo/config/webserver.js | 0 .../demo/contracts/simple_storage.sol | 0 dapps/templates/demo/dot.gitignore | 8 + .../templates/demo/dot.npmrc | 0 .../templates/demo/embark.json | 0 dapps/templates/demo/package.json | 35 + .../demo/test/simple_storage_spec.js | 0 .../templates/simple}/.npmrc | 0 .../templates/simple/contracts.js | 0 .../templates/simple/contracts}/.gitkeep | 0 dapps/templates/simple/dot.gitignore | 8 + .../templates/simple/dot.npmrc | 0 .../templates/simple/embark.json | 0 dapps/templates/simple/package.json | 31 + .../templates/simple/test/contract_spec.js | 0 dapps/tests/app/.npmrc | 3 + .../tests/app}/README.md | 0 .../app}/another_folder/another_test.sol | 0 .../contracts/SimpleStorageWithHttpImport.sol | 0 .../app}/app/contracts/another_storage.sol | 0 .../app/app}/contracts/contract_args.sol | 0 .../app}/contracts/invalid_file.sol__tmp__ | 0 .../tests/app}/app/contracts/ownable.sol | 0 .../app}/app/contracts/simple_storage.sol | 0 .../app/contracts/simple_storage_test.sol | 0 .../app/app}/contracts/some_contract.sol | 0 .../tests/app}/app/contracts/test.sol | 0 .../tests/app/app}/contracts/test2.sol | 0 .../tests/app/app}/contracts/zlib2.sol | 0 .../tests/app/app/css/.gitkeep | 0 .../tests/app}/app/css/bootstrap-theme.css | 0 .../tests/app}/app/css/bootstrap.css | 0 .../tests/app}/app/css/main.css | 0 dapps/tests/app/app/images/.gitkeep | 0 .../tests/app}/app/images/image1.png | Bin .../app}/app/images/secondfolder/image2.jpg | Bin .../tests/app}/app/index.html | 0 dapps/tests/app/app/js/.gitkeep | 0 .../tests/app}/app/js/_vendor/async.min.js | 0 .../app}/app/js/_vendor/bootstrap.min.js | 0 .../tests/app}/app/js/_vendor/jquery.min.js | 0 .../tests/app}/app/js/app.js | 0 .../tests/app}/app/js/foo.css | 0 .../tests/app}/app/js/foo.js | 0 .../tests/app}/app/js/index.js | 0 .../tests/app}/app/js/test.js | 0 dapps/tests/app/app/js/token_test.js | 0 .../tests/app}/app/test.html | 0 .../tests/app}/app/test2.html | 0 .../tests/app}/app/test3.haml | 0 .../tests/app}/config/blockchain.json | 0 .../tests/app}/config/communication.json | 0 .../tests/app}/config/contracts.js | 0 .../tests/app}/config/namesystem.json | 0 .../tests/app/config}/privatenet/genesis.json | 0 .../tests/app/config}/privatenet/password | 0 .../tests/app/config}/rinkeby/password | 0 .../tests/app/config}/ropsten/password | 0 .../tests/app}/config/storage.json | 0 .../tests/app}/config/webserver.json | 0 .../tests/app}/contracts/token.sol | 0 .../test_app => dapps/tests/app}/embark.json | 2 +- .../tests/app}/embark.old_config.json | 2 +- .../test_app => dapps/tests/app}/package.json | 18 +- .../tests/app}/some_folder/test_contract.sol | 0 .../test_app => dapps/tests/app}/test.file | Bin .../tests/app}/test/another_storage_spec.js | 0 .../tests/app}/test/array_references_spec.js | 0 .../tests/app}/test/config_spec.js | 0 .../tests/app}/test/embarkJS_spec.js | 0 .../tests/app}/test/http_contract_test.js | 0 .../tests/app}/test/interface_spec.js | 0 .../tests/app}/test/lib_test_spec.js | 0 .../tests/app}/test/namesystem_spec.js | 0 .../tests/app}/test/plugin_storage_spec.js | 0 .../app}/test/simple_storage_deploy_spec.js | 0 .../tests/app}/test/simple_storage_spec.js | 0 .../tests/app}/test/token_spec.js | 0 dapps/tests/contracts/.npmrc | 3 + .../tests/contracts}/README.md | 0 .../tests/contracts}/blockchain.json | 0 .../tests/contracts}/contracts.json | 0 .../contracts}/contracts/another_storage.sol | 0 .../contracts}/contracts/contract_args.sol | 0 .../contracts/invalid_file.sol__tmp__ | 0 .../tests/contracts}/contracts/ownable.sol | 0 .../contracts}/contracts/simple_storage.sol | 0 .../contracts}/contracts/some_contract.sol | 0 .../tests/contracts}/contracts/test.sol | 0 .../tests/contracts}/contracts/test2.sol | 0 .../tests/contracts}/contracts/token.sol | 0 .../tests/contracts}/contracts/zlib2.sol | 0 .../tests/contracts}/embark.json | 0 .../tests/contracts}/ens.json | 0 dapps/tests/contracts/package.json | 17 + .../tests/contracts}/privatenet/genesis.json | 0 .../tests/contracts}/privatenet/password | 0 .../tests/contracts}/rinkeby/password | 0 .../tests/contracts}/ropsten/password | 0 .../contracts}/test/another_storage_spec.js | 0 .../contracts}/test/array_references_spec.js | 0 .../tests/contracts}/test/lib_test_spec.js | 0 .../tests/contracts}/test/ownable_test.sol | 0 .../contracts}/test/simple_storage_spec.js | 0 .../tests/contracts}/test/token_spec.js | 0 dapps/tests/service/.npmrc | 3 + .../contracts/pluginSimpleStorage.sol | 0 .../tests/service}/fileInPipeline.js | 0 .../tests/service}/index.js | 0 .../tests/service}/package.json | 5 +- package.json | 53 +- packages/embark-async-wrapper/package.json | 9 +- packages/embark-compiler/package.json | 4 +- packages/embark-graph/package.json | 4 +- packages/embark-reset/.npmrc | 4 + packages/embark-reset/bin.js | 5 + packages/embark-reset/index.js | 28 + packages/embark-reset/package.json | 21 + packages/embark-typings/package.json | 2 - packages/embark-ui/package.json | 4 +- packages/embark-vyper/package.json | 4 +- packages/embark/package.json | 9 +- packages/embark/scripts/templates-reset.js | 20 - packages/embark/src/cmd/cmd_controller.js | 13 +- .../src/lib/utils/template_generator.js | 155 ++- packages/embark/templates/.gitignore | 8 - .../embark/templates/boilerplate/package.json | 14 - packages/embark/templates/demo/package.json | 19 - packages/embark/templates/simple/package.json | 14 - packages/embarkjs-connector-web3/package.json | 26 +- packages/embarkjs/package.json | 4 +- scripts/release.js | 2 +- test_dapps/contracts_app/package.json | 19 - yarn.lock | 1186 +++++++++-------- 184 files changed, 1041 insertions(+), 769 deletions(-) rename {test_dapps => dapps}/.gitignore (73%) rename {test_dapps => dapps}/.yarnrc (100%) rename {test_dapps/contracts_app => dapps/templates/boilerplate}/.npmrc (100%) rename {packages/embark => dapps}/templates/boilerplate/app/css/.gitkeep (100%) rename {packages/embark => dapps}/templates/boilerplate/app/images/.gitkeep (100%) rename {packages/embark => dapps}/templates/boilerplate/app/index.html (100%) rename {packages/embark => dapps}/templates/boilerplate/app/js/.gitkeep (100%) rename {packages/embark => dapps}/templates/boilerplate/app/js/index.js (100%) create mode 100644 dapps/templates/boilerplate/config/.npmignore rename {packages/embark => dapps}/templates/boilerplate/config/blockchain.js (100%) rename {packages/embark => dapps}/templates/boilerplate/config/communication.js (100%) rename {packages/embark => dapps}/templates/boilerplate/config/contracts.js (100%) rename {packages/embark => dapps}/templates/boilerplate/config/development/password (100%) rename {packages/embark => dapps}/templates/boilerplate/config/namesystem.js (100%) rename {packages/embark => dapps}/templates/boilerplate/config/pipeline.js (100%) rename {packages/embark => dapps}/templates/boilerplate/config/privatenet/genesis-parity.json (100%) rename {packages/embark => dapps}/templates/boilerplate/config/privatenet/genesis.json (100%) rename {packages/embark => dapps}/templates/boilerplate/config/privatenet/password (100%) rename {packages/embark => dapps}/templates/boilerplate/config/storage.js (100%) rename {packages/embark => dapps}/templates/boilerplate/config/testnet/password (100%) rename {packages/embark => dapps}/templates/boilerplate/config/webserver.js (100%) rename {packages/embark => dapps}/templates/boilerplate/contracts/.gitkeep (100%) rename {packages/embark/templates => dapps/templates/boilerplate}/dot.gitignore (85%) rename packages/embark/templates/demo/app/images/.gitkeep => dapps/templates/boilerplate/dot.npmrc (100%) rename {packages/embark => dapps}/templates/boilerplate/embark.json (100%) create mode 100644 dapps/templates/boilerplate/package.json rename {packages/embark => dapps}/templates/boilerplate/test/contract_spec.js (100%) rename {test_dapps/embark-service => dapps/templates/demo}/.npmrc (100%) rename {packages/embark => dapps}/templates/demo/app/components/blockchain.js (100%) rename {packages/embark => dapps}/templates/demo/app/components/ens.js (100%) rename {packages/embark => dapps}/templates/demo/app/components/storage.js (100%) rename {packages/embark => dapps}/templates/demo/app/components/whisper.js (100%) rename {packages/embark => dapps}/templates/demo/app/dapp.css (100%) rename {packages/embark => dapps}/templates/demo/app/dapp.js (100%) rename {packages/embark/templates/simple/contracts => dapps/templates/demo/app/images}/.gitkeep (100%) rename {packages/embark => dapps}/templates/demo/app/index.html (100%) create mode 100644 dapps/templates/demo/config/.npmignore rename {packages/embark => dapps}/templates/demo/config/blockchain.js (100%) rename {packages/embark => dapps}/templates/demo/config/communication.js (100%) rename {packages/embark => dapps}/templates/demo/config/contracts.js (100%) rename {packages/embark => dapps}/templates/demo/config/development/password (100%) rename {packages/embark => dapps}/templates/demo/config/namesystem.js (100%) rename {packages/embark => dapps}/templates/demo/config/pipeline.js (100%) rename {packages/embark => dapps}/templates/demo/config/privatenet/genesis-parity.json (100%) rename {packages/embark => dapps}/templates/demo/config/privatenet/genesis.json (100%) rename {packages/embark => dapps}/templates/demo/config/privatenet/password (100%) rename {packages/embark => dapps}/templates/demo/config/storage.js (100%) rename {packages/embark => dapps}/templates/demo/config/testnet/password (100%) rename {packages/embark => dapps}/templates/demo/config/webserver.js (100%) rename {packages/embark => dapps}/templates/demo/contracts/simple_storage.sol (100%) create mode 100644 dapps/templates/demo/dot.gitignore rename test_dapps/test_app/app/css/.gitkeep => dapps/templates/demo/dot.npmrc (100%) rename {packages/embark => dapps}/templates/demo/embark.json (100%) create mode 100644 dapps/templates/demo/package.json rename {packages/embark => dapps}/templates/demo/test/simple_storage_spec.js (100%) rename {test_dapps/test_app => dapps/templates/simple}/.npmrc (100%) rename {packages/embark => dapps}/templates/simple/contracts.js (100%) rename {test_dapps/test_app/app/images => dapps/templates/simple/contracts}/.gitkeep (100%) create mode 100644 dapps/templates/simple/dot.gitignore rename test_dapps/test_app/app/js/.gitkeep => dapps/templates/simple/dot.npmrc (100%) rename {packages/embark => dapps}/templates/simple/embark.json (100%) create mode 100644 dapps/templates/simple/package.json rename {packages/embark => dapps}/templates/simple/test/contract_spec.js (100%) create mode 100644 dapps/tests/app/.npmrc rename {test_dapps/contracts_app => dapps/tests/app}/README.md (100%) rename {test_dapps/test_app => dapps/tests/app}/another_folder/another_test.sol (100%) rename {test_dapps/test_app => dapps/tests/app}/app/contracts/SimpleStorageWithHttpImport.sol (100%) rename {test_dapps/test_app => dapps/tests/app}/app/contracts/another_storage.sol (100%) rename {test_dapps/contracts_app => dapps/tests/app/app}/contracts/contract_args.sol (100%) rename {test_dapps/contracts_app => dapps/tests/app/app}/contracts/invalid_file.sol__tmp__ (100%) rename {test_dapps/test_app => dapps/tests/app}/app/contracts/ownable.sol (100%) rename {test_dapps/test_app => dapps/tests/app}/app/contracts/simple_storage.sol (100%) rename {test_dapps/test_app => dapps/tests/app}/app/contracts/simple_storage_test.sol (100%) rename {test_dapps/contracts_app => dapps/tests/app/app}/contracts/some_contract.sol (100%) rename {test_dapps/test_app => dapps/tests/app}/app/contracts/test.sol (100%) rename {test_dapps/contracts_app => dapps/tests/app/app}/contracts/test2.sol (100%) rename {test_dapps/contracts_app => dapps/tests/app/app}/contracts/zlib2.sol (100%) rename test_dapps/test_app/app/js/token_test.js => dapps/tests/app/app/css/.gitkeep (100%) rename {test_dapps/test_app => dapps/tests/app}/app/css/bootstrap-theme.css (100%) rename {test_dapps/test_app => dapps/tests/app}/app/css/bootstrap.css (100%) rename {test_dapps/test_app => dapps/tests/app}/app/css/main.css (100%) create mode 100644 dapps/tests/app/app/images/.gitkeep rename {test_dapps/test_app => dapps/tests/app}/app/images/image1.png (100%) rename {test_dapps/test_app => dapps/tests/app}/app/images/secondfolder/image2.jpg (100%) rename {test_dapps/test_app => dapps/tests/app}/app/index.html (100%) create mode 100644 dapps/tests/app/app/js/.gitkeep rename {test_dapps/test_app => dapps/tests/app}/app/js/_vendor/async.min.js (100%) rename {test_dapps/test_app => dapps/tests/app}/app/js/_vendor/bootstrap.min.js (100%) rename {test_dapps/test_app => dapps/tests/app}/app/js/_vendor/jquery.min.js (100%) rename {test_dapps/test_app => dapps/tests/app}/app/js/app.js (100%) rename {test_dapps/test_app => dapps/tests/app}/app/js/foo.css (100%) rename {test_dapps/test_app => dapps/tests/app}/app/js/foo.js (100%) rename {test_dapps/test_app => dapps/tests/app}/app/js/index.js (100%) rename {test_dapps/test_app => dapps/tests/app}/app/js/test.js (100%) create mode 100644 dapps/tests/app/app/js/token_test.js rename {test_dapps/test_app => dapps/tests/app}/app/test.html (100%) rename {test_dapps/test_app => dapps/tests/app}/app/test2.html (100%) rename {test_dapps/test_app => dapps/tests/app}/app/test3.haml (100%) rename {test_dapps/test_app => dapps/tests/app}/config/blockchain.json (100%) rename {test_dapps/test_app => dapps/tests/app}/config/communication.json (100%) rename {test_dapps/test_app => dapps/tests/app}/config/contracts.js (100%) rename {test_dapps/test_app => dapps/tests/app}/config/namesystem.json (100%) rename {test_dapps/contracts_app => dapps/tests/app/config}/privatenet/genesis.json (100%) rename {test_dapps/contracts_app => dapps/tests/app/config}/privatenet/password (100%) rename {test_dapps/contracts_app => dapps/tests/app/config}/rinkeby/password (100%) rename {test_dapps/contracts_app => dapps/tests/app/config}/ropsten/password (100%) rename {test_dapps/test_app => dapps/tests/app}/config/storage.json (100%) rename {test_dapps/test_app => dapps/tests/app}/config/webserver.json (100%) rename {test_dapps/test_app => dapps/tests/app}/contracts/token.sol (100%) rename {test_dapps/test_app => dapps/tests/app}/embark.json (95%) rename {test_dapps/test_app => dapps/tests/app}/embark.old_config.json (96%) rename {test_dapps/test_app => dapps/tests/app}/package.json (53%) rename {test_dapps/test_app => dapps/tests/app}/some_folder/test_contract.sol (100%) rename {test_dapps/test_app => dapps/tests/app}/test.file (100%) rename {test_dapps/test_app => dapps/tests/app}/test/another_storage_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/array_references_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/config_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/embarkJS_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/http_contract_test.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/interface_spec.js (100%) rename {test_dapps/contracts_app => dapps/tests/app}/test/lib_test_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/namesystem_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/plugin_storage_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/simple_storage_deploy_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/simple_storage_spec.js (100%) rename {test_dapps/test_app => dapps/tests/app}/test/token_spec.js (100%) create mode 100644 dapps/tests/contracts/.npmrc rename {test_dapps/test_app => dapps/tests/contracts}/README.md (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/blockchain.json (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/contracts.json (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/contracts/another_storage.sol (100%) rename {test_dapps/test_app/app => dapps/tests/contracts}/contracts/contract_args.sol (100%) rename {test_dapps/test_app/app => dapps/tests/contracts}/contracts/invalid_file.sol__tmp__ (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/contracts/ownable.sol (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/contracts/simple_storage.sol (100%) rename {test_dapps/test_app/app => dapps/tests/contracts}/contracts/some_contract.sol (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/contracts/test.sol (100%) rename {test_dapps/test_app/app => dapps/tests/contracts}/contracts/test2.sol (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/contracts/token.sol (100%) rename {test_dapps/test_app/app => dapps/tests/contracts}/contracts/zlib2.sol (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/embark.json (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/ens.json (100%) create mode 100644 dapps/tests/contracts/package.json rename {test_dapps/test_app/config => dapps/tests/contracts}/privatenet/genesis.json (100%) rename {test_dapps/test_app/config => dapps/tests/contracts}/privatenet/password (100%) rename {test_dapps/test_app/config => dapps/tests/contracts}/rinkeby/password (100%) rename {test_dapps/test_app/config => dapps/tests/contracts}/ropsten/password (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/test/another_storage_spec.js (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/test/array_references_spec.js (100%) rename {test_dapps/test_app => dapps/tests/contracts}/test/lib_test_spec.js (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/test/ownable_test.sol (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/test/simple_storage_spec.js (100%) rename {test_dapps/contracts_app => dapps/tests/contracts}/test/token_spec.js (100%) create mode 100644 dapps/tests/service/.npmrc rename {test_dapps/embark-service => dapps/tests/service}/contracts/pluginSimpleStorage.sol (100%) rename {test_dapps/embark-service => dapps/tests/service}/fileInPipeline.js (100%) rename {test_dapps/embark-service => dapps/tests/service}/index.js (100%) rename {test_dapps/embark-service => dapps/tests/service}/package.json (57%) create mode 100644 packages/embark-reset/.npmrc create mode 100755 packages/embark-reset/bin.js create mode 100644 packages/embark-reset/index.js create mode 100644 packages/embark-reset/package.json delete mode 100644 packages/embark/scripts/templates-reset.js delete mode 100644 packages/embark/templates/.gitignore delete mode 100644 packages/embark/templates/boilerplate/package.json delete mode 100644 packages/embark/templates/demo/package.json delete mode 100644 packages/embark/templates/simple/package.json delete mode 100644 test_dapps/contracts_app/package.json diff --git a/.travis.yml b/.travis.yml index 7fbb07fbe..08f496eeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,4 +32,4 @@ before_install: install: - echo embark installation managed by package.json script 'ci' script: - - npm run ci + - npm run ci:full diff --git a/appveyor.yml b/appveyor.yml index 37de652b1..4418f1b54 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,5 +29,5 @@ install: - yarn --version - echo embark installation managed by package.json script 'ci' test_script: - - npm run ci + - npm run ci:full build: off diff --git a/test_dapps/.gitignore b/dapps/.gitignore similarity index 73% rename from test_dapps/.gitignore rename to dapps/.gitignore index 5c6f39419..8379126bb 100644 --- a/test_dapps/.gitignore +++ b/dapps/.gitignore @@ -1,8 +1,5 @@ **/.embark **/chains.json -**/config/production/password **/config/livenet/password -**/coverage -**/dist +**/config/production/password **/embarkArtifacts -**/node_modules diff --git a/test_dapps/.yarnrc b/dapps/.yarnrc similarity index 100% rename from test_dapps/.yarnrc rename to dapps/.yarnrc diff --git a/test_dapps/contracts_app/.npmrc b/dapps/templates/boilerplate/.npmrc similarity index 100% rename from test_dapps/contracts_app/.npmrc rename to dapps/templates/boilerplate/.npmrc diff --git a/packages/embark/templates/boilerplate/app/css/.gitkeep b/dapps/templates/boilerplate/app/css/.gitkeep similarity index 100% rename from packages/embark/templates/boilerplate/app/css/.gitkeep rename to dapps/templates/boilerplate/app/css/.gitkeep diff --git a/packages/embark/templates/boilerplate/app/images/.gitkeep b/dapps/templates/boilerplate/app/images/.gitkeep similarity index 100% rename from packages/embark/templates/boilerplate/app/images/.gitkeep rename to dapps/templates/boilerplate/app/images/.gitkeep diff --git a/packages/embark/templates/boilerplate/app/index.html b/dapps/templates/boilerplate/app/index.html similarity index 100% rename from packages/embark/templates/boilerplate/app/index.html rename to dapps/templates/boilerplate/app/index.html diff --git a/packages/embark/templates/boilerplate/app/js/.gitkeep b/dapps/templates/boilerplate/app/js/.gitkeep similarity index 100% rename from packages/embark/templates/boilerplate/app/js/.gitkeep rename to dapps/templates/boilerplate/app/js/.gitkeep diff --git a/packages/embark/templates/boilerplate/app/js/index.js b/dapps/templates/boilerplate/app/js/index.js similarity index 100% rename from packages/embark/templates/boilerplate/app/js/index.js rename to dapps/templates/boilerplate/app/js/index.js diff --git a/dapps/templates/boilerplate/config/.npmignore b/dapps/templates/boilerplate/config/.npmignore new file mode 100644 index 000000000..9c627daf5 --- /dev/null +++ b/dapps/templates/boilerplate/config/.npmignore @@ -0,0 +1,2 @@ +livenet/password +production/password diff --git a/packages/embark/templates/boilerplate/config/blockchain.js b/dapps/templates/boilerplate/config/blockchain.js similarity index 100% rename from packages/embark/templates/boilerplate/config/blockchain.js rename to dapps/templates/boilerplate/config/blockchain.js diff --git a/packages/embark/templates/boilerplate/config/communication.js b/dapps/templates/boilerplate/config/communication.js similarity index 100% rename from packages/embark/templates/boilerplate/config/communication.js rename to dapps/templates/boilerplate/config/communication.js diff --git a/packages/embark/templates/boilerplate/config/contracts.js b/dapps/templates/boilerplate/config/contracts.js similarity index 100% rename from packages/embark/templates/boilerplate/config/contracts.js rename to dapps/templates/boilerplate/config/contracts.js diff --git a/packages/embark/templates/boilerplate/config/development/password b/dapps/templates/boilerplate/config/development/password similarity index 100% rename from packages/embark/templates/boilerplate/config/development/password rename to dapps/templates/boilerplate/config/development/password diff --git a/packages/embark/templates/boilerplate/config/namesystem.js b/dapps/templates/boilerplate/config/namesystem.js similarity index 100% rename from packages/embark/templates/boilerplate/config/namesystem.js rename to dapps/templates/boilerplate/config/namesystem.js diff --git a/packages/embark/templates/boilerplate/config/pipeline.js b/dapps/templates/boilerplate/config/pipeline.js similarity index 100% rename from packages/embark/templates/boilerplate/config/pipeline.js rename to dapps/templates/boilerplate/config/pipeline.js diff --git a/packages/embark/templates/boilerplate/config/privatenet/genesis-parity.json b/dapps/templates/boilerplate/config/privatenet/genesis-parity.json similarity index 100% rename from packages/embark/templates/boilerplate/config/privatenet/genesis-parity.json rename to dapps/templates/boilerplate/config/privatenet/genesis-parity.json diff --git a/packages/embark/templates/boilerplate/config/privatenet/genesis.json b/dapps/templates/boilerplate/config/privatenet/genesis.json similarity index 100% rename from packages/embark/templates/boilerplate/config/privatenet/genesis.json rename to dapps/templates/boilerplate/config/privatenet/genesis.json diff --git a/packages/embark/templates/boilerplate/config/privatenet/password b/dapps/templates/boilerplate/config/privatenet/password similarity index 100% rename from packages/embark/templates/boilerplate/config/privatenet/password rename to dapps/templates/boilerplate/config/privatenet/password diff --git a/packages/embark/templates/boilerplate/config/storage.js b/dapps/templates/boilerplate/config/storage.js similarity index 100% rename from packages/embark/templates/boilerplate/config/storage.js rename to dapps/templates/boilerplate/config/storage.js diff --git a/packages/embark/templates/boilerplate/config/testnet/password b/dapps/templates/boilerplate/config/testnet/password similarity index 100% rename from packages/embark/templates/boilerplate/config/testnet/password rename to dapps/templates/boilerplate/config/testnet/password diff --git a/packages/embark/templates/boilerplate/config/webserver.js b/dapps/templates/boilerplate/config/webserver.js similarity index 100% rename from packages/embark/templates/boilerplate/config/webserver.js rename to dapps/templates/boilerplate/config/webserver.js diff --git a/packages/embark/templates/boilerplate/contracts/.gitkeep b/dapps/templates/boilerplate/contracts/.gitkeep similarity index 100% rename from packages/embark/templates/boilerplate/contracts/.gitkeep rename to dapps/templates/boilerplate/contracts/.gitkeep diff --git a/packages/embark/templates/dot.gitignore b/dapps/templates/boilerplate/dot.gitignore similarity index 85% rename from packages/embark/templates/dot.gitignore rename to dapps/templates/boilerplate/dot.gitignore index 72a305ede..879d4ba37 100644 --- a/packages/embark/templates/dot.gitignore +++ b/dapps/templates/boilerplate/dot.gitignore @@ -1,7 +1,8 @@ .embark chains.json -config/production/password config/livenet/password +config/production/password coverage dist +embarkArtifacts node_modules diff --git a/packages/embark/templates/demo/app/images/.gitkeep b/dapps/templates/boilerplate/dot.npmrc similarity index 100% rename from packages/embark/templates/demo/app/images/.gitkeep rename to dapps/templates/boilerplate/dot.npmrc diff --git a/packages/embark/templates/boilerplate/embark.json b/dapps/templates/boilerplate/embark.json similarity index 100% rename from packages/embark/templates/boilerplate/embark.json rename to dapps/templates/boilerplate/embark.json diff --git a/dapps/templates/boilerplate/package.json b/dapps/templates/boilerplate/package.json new file mode 100644 index 000000000..5b818677d --- /dev/null +++ b/dapps/templates/boilerplate/package.json @@ -0,0 +1,32 @@ +{ + "name": "embark-dapp-template-boilerplate", + "version": "4.0.0-beta.0", + "description": "", + "files": [ + "app", + "config", + "contracts", + "dot.gitignore", + "dot.npmrc", + "embark.json", + "test" + ], + "scripts": { + "ci": "npm run qa", + "clean": "npm run reset", + "package": "npm pack", + "qa": "npm-run-all test package", + "reset": "npx embark-reset && npx rimraf embark-*.tgz package", + "test": "npx embark test" + }, + "keywords": [], + "author": "", + "license": "MIT", + "devDependencies": { + "embark": "^4.0.0-beta.0", + "embark-reset": "^4.0.0-beta.0", + "embarkjs-connector-web3": "^4.0.0-beta.0", + "npm-run-all": "4.1.5", + "rimraf": "2.6.3" + } +} diff --git a/packages/embark/templates/boilerplate/test/contract_spec.js b/dapps/templates/boilerplate/test/contract_spec.js similarity index 100% rename from packages/embark/templates/boilerplate/test/contract_spec.js rename to dapps/templates/boilerplate/test/contract_spec.js diff --git a/test_dapps/embark-service/.npmrc b/dapps/templates/demo/.npmrc similarity index 100% rename from test_dapps/embark-service/.npmrc rename to dapps/templates/demo/.npmrc diff --git a/packages/embark/templates/demo/app/components/blockchain.js b/dapps/templates/demo/app/components/blockchain.js similarity index 100% rename from packages/embark/templates/demo/app/components/blockchain.js rename to dapps/templates/demo/app/components/blockchain.js diff --git a/packages/embark/templates/demo/app/components/ens.js b/dapps/templates/demo/app/components/ens.js similarity index 100% rename from packages/embark/templates/demo/app/components/ens.js rename to dapps/templates/demo/app/components/ens.js diff --git a/packages/embark/templates/demo/app/components/storage.js b/dapps/templates/demo/app/components/storage.js similarity index 100% rename from packages/embark/templates/demo/app/components/storage.js rename to dapps/templates/demo/app/components/storage.js diff --git a/packages/embark/templates/demo/app/components/whisper.js b/dapps/templates/demo/app/components/whisper.js similarity index 100% rename from packages/embark/templates/demo/app/components/whisper.js rename to dapps/templates/demo/app/components/whisper.js diff --git a/packages/embark/templates/demo/app/dapp.css b/dapps/templates/demo/app/dapp.css similarity index 100% rename from packages/embark/templates/demo/app/dapp.css rename to dapps/templates/demo/app/dapp.css diff --git a/packages/embark/templates/demo/app/dapp.js b/dapps/templates/demo/app/dapp.js similarity index 100% rename from packages/embark/templates/demo/app/dapp.js rename to dapps/templates/demo/app/dapp.js diff --git a/packages/embark/templates/simple/contracts/.gitkeep b/dapps/templates/demo/app/images/.gitkeep similarity index 100% rename from packages/embark/templates/simple/contracts/.gitkeep rename to dapps/templates/demo/app/images/.gitkeep diff --git a/packages/embark/templates/demo/app/index.html b/dapps/templates/demo/app/index.html similarity index 100% rename from packages/embark/templates/demo/app/index.html rename to dapps/templates/demo/app/index.html diff --git a/dapps/templates/demo/config/.npmignore b/dapps/templates/demo/config/.npmignore new file mode 100644 index 000000000..9c627daf5 --- /dev/null +++ b/dapps/templates/demo/config/.npmignore @@ -0,0 +1,2 @@ +livenet/password +production/password diff --git a/packages/embark/templates/demo/config/blockchain.js b/dapps/templates/demo/config/blockchain.js similarity index 100% rename from packages/embark/templates/demo/config/blockchain.js rename to dapps/templates/demo/config/blockchain.js diff --git a/packages/embark/templates/demo/config/communication.js b/dapps/templates/demo/config/communication.js similarity index 100% rename from packages/embark/templates/demo/config/communication.js rename to dapps/templates/demo/config/communication.js diff --git a/packages/embark/templates/demo/config/contracts.js b/dapps/templates/demo/config/contracts.js similarity index 100% rename from packages/embark/templates/demo/config/contracts.js rename to dapps/templates/demo/config/contracts.js diff --git a/packages/embark/templates/demo/config/development/password b/dapps/templates/demo/config/development/password similarity index 100% rename from packages/embark/templates/demo/config/development/password rename to dapps/templates/demo/config/development/password diff --git a/packages/embark/templates/demo/config/namesystem.js b/dapps/templates/demo/config/namesystem.js similarity index 100% rename from packages/embark/templates/demo/config/namesystem.js rename to dapps/templates/demo/config/namesystem.js diff --git a/packages/embark/templates/demo/config/pipeline.js b/dapps/templates/demo/config/pipeline.js similarity index 100% rename from packages/embark/templates/demo/config/pipeline.js rename to dapps/templates/demo/config/pipeline.js diff --git a/packages/embark/templates/demo/config/privatenet/genesis-parity.json b/dapps/templates/demo/config/privatenet/genesis-parity.json similarity index 100% rename from packages/embark/templates/demo/config/privatenet/genesis-parity.json rename to dapps/templates/demo/config/privatenet/genesis-parity.json diff --git a/packages/embark/templates/demo/config/privatenet/genesis.json b/dapps/templates/demo/config/privatenet/genesis.json similarity index 100% rename from packages/embark/templates/demo/config/privatenet/genesis.json rename to dapps/templates/demo/config/privatenet/genesis.json diff --git a/packages/embark/templates/demo/config/privatenet/password b/dapps/templates/demo/config/privatenet/password similarity index 100% rename from packages/embark/templates/demo/config/privatenet/password rename to dapps/templates/demo/config/privatenet/password diff --git a/packages/embark/templates/demo/config/storage.js b/dapps/templates/demo/config/storage.js similarity index 100% rename from packages/embark/templates/demo/config/storage.js rename to dapps/templates/demo/config/storage.js diff --git a/packages/embark/templates/demo/config/testnet/password b/dapps/templates/demo/config/testnet/password similarity index 100% rename from packages/embark/templates/demo/config/testnet/password rename to dapps/templates/demo/config/testnet/password diff --git a/packages/embark/templates/demo/config/webserver.js b/dapps/templates/demo/config/webserver.js similarity index 100% rename from packages/embark/templates/demo/config/webserver.js rename to dapps/templates/demo/config/webserver.js diff --git a/packages/embark/templates/demo/contracts/simple_storage.sol b/dapps/templates/demo/contracts/simple_storage.sol similarity index 100% rename from packages/embark/templates/demo/contracts/simple_storage.sol rename to dapps/templates/demo/contracts/simple_storage.sol diff --git a/dapps/templates/demo/dot.gitignore b/dapps/templates/demo/dot.gitignore new file mode 100644 index 000000000..879d4ba37 --- /dev/null +++ b/dapps/templates/demo/dot.gitignore @@ -0,0 +1,8 @@ +.embark +chains.json +config/livenet/password +config/production/password +coverage +dist +embarkArtifacts +node_modules diff --git a/test_dapps/test_app/app/css/.gitkeep b/dapps/templates/demo/dot.npmrc similarity index 100% rename from test_dapps/test_app/app/css/.gitkeep rename to dapps/templates/demo/dot.npmrc diff --git a/packages/embark/templates/demo/embark.json b/dapps/templates/demo/embark.json similarity index 100% rename from packages/embark/templates/demo/embark.json rename to dapps/templates/demo/embark.json diff --git a/dapps/templates/demo/package.json b/dapps/templates/demo/package.json new file mode 100644 index 000000000..dd566755b --- /dev/null +++ b/dapps/templates/demo/package.json @@ -0,0 +1,35 @@ +{ + "name": "embark-dapp-template-demo", + "version": "4.0.0-beta.0", + "description": "Demo DApp for embark", + "files": [ + "app", + "config", + "contracts", + "dot.gitignore", + "dot.npmrc", + "embark.json", + "test" + ], + "scripts": { + "ci": "npm run qa", + "clean": "npm run reset", + "package": "npm pack", + "qa": "npm-run-all test package", + "reset": "npx embark-reset && npx rimraf embark-*.tgz package", + "test": "npx embark test" + }, + "keywords": [], + "author": "", + "license": "MIT", + "devDependencies": { + "embark": "^4.0.0-beta.0", + "embark-reset": "^4.0.0-beta.0", + "embarkjs-connector-web3": "^4.0.0-beta.0", + "npm-run-all": "4.1.5", + "react": "16.7.0", + "react-bootstrap": "0.32.4", + "react-dom": "16.7.0", + "rimraf": "2.6.3" + } +} diff --git a/packages/embark/templates/demo/test/simple_storage_spec.js b/dapps/templates/demo/test/simple_storage_spec.js similarity index 100% rename from packages/embark/templates/demo/test/simple_storage_spec.js rename to dapps/templates/demo/test/simple_storage_spec.js diff --git a/test_dapps/test_app/.npmrc b/dapps/templates/simple/.npmrc similarity index 100% rename from test_dapps/test_app/.npmrc rename to dapps/templates/simple/.npmrc diff --git a/packages/embark/templates/simple/contracts.js b/dapps/templates/simple/contracts.js similarity index 100% rename from packages/embark/templates/simple/contracts.js rename to dapps/templates/simple/contracts.js diff --git a/test_dapps/test_app/app/images/.gitkeep b/dapps/templates/simple/contracts/.gitkeep similarity index 100% rename from test_dapps/test_app/app/images/.gitkeep rename to dapps/templates/simple/contracts/.gitkeep diff --git a/dapps/templates/simple/dot.gitignore b/dapps/templates/simple/dot.gitignore new file mode 100644 index 000000000..879d4ba37 --- /dev/null +++ b/dapps/templates/simple/dot.gitignore @@ -0,0 +1,8 @@ +.embark +chains.json +config/livenet/password +config/production/password +coverage +dist +embarkArtifacts +node_modules diff --git a/test_dapps/test_app/app/js/.gitkeep b/dapps/templates/simple/dot.npmrc similarity index 100% rename from test_dapps/test_app/app/js/.gitkeep rename to dapps/templates/simple/dot.npmrc diff --git a/packages/embark/templates/simple/embark.json b/dapps/templates/simple/embark.json similarity index 100% rename from packages/embark/templates/simple/embark.json rename to dapps/templates/simple/embark.json diff --git a/dapps/templates/simple/package.json b/dapps/templates/simple/package.json new file mode 100644 index 000000000..8f9288fcd --- /dev/null +++ b/dapps/templates/simple/package.json @@ -0,0 +1,31 @@ +{ + "name": "embark-dapp-template-simple", + "version": "4.0.0-beta.0", + "description": "", + "files": [ + "contracts", + "contracts.js", + "dot.gitignore", + "dot.npmrc", + "embark.json", + "test" + ], + "scripts": { + "ci": "npm run qa", + "clean": "npm run reset", + "package": "npm pack", + "qa": "npm-run-all test package", + "reset": "npx embark-reset && npx rimraf embark-*.tgz package", + "test": "npx embark test" + }, + "keywords": [], + "author": "", + "license": "MIT", + "devDependencies": { + "embark": "^4.0.0-beta.0", + "embark-reset": "^4.0.0-beta.0", + "embarkjs-connector-web3": "^4.0.0-beta.0", + "npm-run-all": "4.1.5", + "rimraf": "2.6.3" + } +} diff --git a/packages/embark/templates/simple/test/contract_spec.js b/dapps/templates/simple/test/contract_spec.js similarity index 100% rename from packages/embark/templates/simple/test/contract_spec.js rename to dapps/templates/simple/test/contract_spec.js diff --git a/dapps/tests/app/.npmrc b/dapps/tests/app/.npmrc new file mode 100644 index 000000000..697976692 --- /dev/null +++ b/dapps/tests/app/.npmrc @@ -0,0 +1,3 @@ +package-lock = false +save-exact = true +scripts-prepend-node-path = true diff --git a/test_dapps/contracts_app/README.md b/dapps/tests/app/README.md similarity index 100% rename from test_dapps/contracts_app/README.md rename to dapps/tests/app/README.md diff --git a/test_dapps/test_app/another_folder/another_test.sol b/dapps/tests/app/another_folder/another_test.sol similarity index 100% rename from test_dapps/test_app/another_folder/another_test.sol rename to dapps/tests/app/another_folder/another_test.sol diff --git a/test_dapps/test_app/app/contracts/SimpleStorageWithHttpImport.sol b/dapps/tests/app/app/contracts/SimpleStorageWithHttpImport.sol similarity index 100% rename from test_dapps/test_app/app/contracts/SimpleStorageWithHttpImport.sol rename to dapps/tests/app/app/contracts/SimpleStorageWithHttpImport.sol diff --git a/test_dapps/test_app/app/contracts/another_storage.sol b/dapps/tests/app/app/contracts/another_storage.sol similarity index 100% rename from test_dapps/test_app/app/contracts/another_storage.sol rename to dapps/tests/app/app/contracts/another_storage.sol diff --git a/test_dapps/contracts_app/contracts/contract_args.sol b/dapps/tests/app/app/contracts/contract_args.sol similarity index 100% rename from test_dapps/contracts_app/contracts/contract_args.sol rename to dapps/tests/app/app/contracts/contract_args.sol diff --git a/test_dapps/contracts_app/contracts/invalid_file.sol__tmp__ b/dapps/tests/app/app/contracts/invalid_file.sol__tmp__ similarity index 100% rename from test_dapps/contracts_app/contracts/invalid_file.sol__tmp__ rename to dapps/tests/app/app/contracts/invalid_file.sol__tmp__ diff --git a/test_dapps/test_app/app/contracts/ownable.sol b/dapps/tests/app/app/contracts/ownable.sol similarity index 100% rename from test_dapps/test_app/app/contracts/ownable.sol rename to dapps/tests/app/app/contracts/ownable.sol diff --git a/test_dapps/test_app/app/contracts/simple_storage.sol b/dapps/tests/app/app/contracts/simple_storage.sol similarity index 100% rename from test_dapps/test_app/app/contracts/simple_storage.sol rename to dapps/tests/app/app/contracts/simple_storage.sol diff --git a/test_dapps/test_app/app/contracts/simple_storage_test.sol b/dapps/tests/app/app/contracts/simple_storage_test.sol similarity index 100% rename from test_dapps/test_app/app/contracts/simple_storage_test.sol rename to dapps/tests/app/app/contracts/simple_storage_test.sol diff --git a/test_dapps/contracts_app/contracts/some_contract.sol b/dapps/tests/app/app/contracts/some_contract.sol similarity index 100% rename from test_dapps/contracts_app/contracts/some_contract.sol rename to dapps/tests/app/app/contracts/some_contract.sol diff --git a/test_dapps/test_app/app/contracts/test.sol b/dapps/tests/app/app/contracts/test.sol similarity index 100% rename from test_dapps/test_app/app/contracts/test.sol rename to dapps/tests/app/app/contracts/test.sol diff --git a/test_dapps/contracts_app/contracts/test2.sol b/dapps/tests/app/app/contracts/test2.sol similarity index 100% rename from test_dapps/contracts_app/contracts/test2.sol rename to dapps/tests/app/app/contracts/test2.sol diff --git a/test_dapps/contracts_app/contracts/zlib2.sol b/dapps/tests/app/app/contracts/zlib2.sol similarity index 100% rename from test_dapps/contracts_app/contracts/zlib2.sol rename to dapps/tests/app/app/contracts/zlib2.sol diff --git a/test_dapps/test_app/app/js/token_test.js b/dapps/tests/app/app/css/.gitkeep similarity index 100% rename from test_dapps/test_app/app/js/token_test.js rename to dapps/tests/app/app/css/.gitkeep diff --git a/test_dapps/test_app/app/css/bootstrap-theme.css b/dapps/tests/app/app/css/bootstrap-theme.css similarity index 100% rename from test_dapps/test_app/app/css/bootstrap-theme.css rename to dapps/tests/app/app/css/bootstrap-theme.css diff --git a/test_dapps/test_app/app/css/bootstrap.css b/dapps/tests/app/app/css/bootstrap.css similarity index 100% rename from test_dapps/test_app/app/css/bootstrap.css rename to dapps/tests/app/app/css/bootstrap.css diff --git a/test_dapps/test_app/app/css/main.css b/dapps/tests/app/app/css/main.css similarity index 100% rename from test_dapps/test_app/app/css/main.css rename to dapps/tests/app/app/css/main.css diff --git a/dapps/tests/app/app/images/.gitkeep b/dapps/tests/app/app/images/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/test_dapps/test_app/app/images/image1.png b/dapps/tests/app/app/images/image1.png similarity index 100% rename from test_dapps/test_app/app/images/image1.png rename to dapps/tests/app/app/images/image1.png diff --git a/test_dapps/test_app/app/images/secondfolder/image2.jpg b/dapps/tests/app/app/images/secondfolder/image2.jpg similarity index 100% rename from test_dapps/test_app/app/images/secondfolder/image2.jpg rename to dapps/tests/app/app/images/secondfolder/image2.jpg diff --git a/test_dapps/test_app/app/index.html b/dapps/tests/app/app/index.html similarity index 100% rename from test_dapps/test_app/app/index.html rename to dapps/tests/app/app/index.html diff --git a/dapps/tests/app/app/js/.gitkeep b/dapps/tests/app/app/js/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/test_dapps/test_app/app/js/_vendor/async.min.js b/dapps/tests/app/app/js/_vendor/async.min.js similarity index 100% rename from test_dapps/test_app/app/js/_vendor/async.min.js rename to dapps/tests/app/app/js/_vendor/async.min.js diff --git a/test_dapps/test_app/app/js/_vendor/bootstrap.min.js b/dapps/tests/app/app/js/_vendor/bootstrap.min.js similarity index 100% rename from test_dapps/test_app/app/js/_vendor/bootstrap.min.js rename to dapps/tests/app/app/js/_vendor/bootstrap.min.js diff --git a/test_dapps/test_app/app/js/_vendor/jquery.min.js b/dapps/tests/app/app/js/_vendor/jquery.min.js similarity index 100% rename from test_dapps/test_app/app/js/_vendor/jquery.min.js rename to dapps/tests/app/app/js/_vendor/jquery.min.js diff --git a/test_dapps/test_app/app/js/app.js b/dapps/tests/app/app/js/app.js similarity index 100% rename from test_dapps/test_app/app/js/app.js rename to dapps/tests/app/app/js/app.js diff --git a/test_dapps/test_app/app/js/foo.css b/dapps/tests/app/app/js/foo.css similarity index 100% rename from test_dapps/test_app/app/js/foo.css rename to dapps/tests/app/app/js/foo.css diff --git a/test_dapps/test_app/app/js/foo.js b/dapps/tests/app/app/js/foo.js similarity index 100% rename from test_dapps/test_app/app/js/foo.js rename to dapps/tests/app/app/js/foo.js diff --git a/test_dapps/test_app/app/js/index.js b/dapps/tests/app/app/js/index.js similarity index 100% rename from test_dapps/test_app/app/js/index.js rename to dapps/tests/app/app/js/index.js diff --git a/test_dapps/test_app/app/js/test.js b/dapps/tests/app/app/js/test.js similarity index 100% rename from test_dapps/test_app/app/js/test.js rename to dapps/tests/app/app/js/test.js diff --git a/dapps/tests/app/app/js/token_test.js b/dapps/tests/app/app/js/token_test.js new file mode 100644 index 000000000..e69de29bb diff --git a/test_dapps/test_app/app/test.html b/dapps/tests/app/app/test.html similarity index 100% rename from test_dapps/test_app/app/test.html rename to dapps/tests/app/app/test.html diff --git a/test_dapps/test_app/app/test2.html b/dapps/tests/app/app/test2.html similarity index 100% rename from test_dapps/test_app/app/test2.html rename to dapps/tests/app/app/test2.html diff --git a/test_dapps/test_app/app/test3.haml b/dapps/tests/app/app/test3.haml similarity index 100% rename from test_dapps/test_app/app/test3.haml rename to dapps/tests/app/app/test3.haml diff --git a/test_dapps/test_app/config/blockchain.json b/dapps/tests/app/config/blockchain.json similarity index 100% rename from test_dapps/test_app/config/blockchain.json rename to dapps/tests/app/config/blockchain.json diff --git a/test_dapps/test_app/config/communication.json b/dapps/tests/app/config/communication.json similarity index 100% rename from test_dapps/test_app/config/communication.json rename to dapps/tests/app/config/communication.json diff --git a/test_dapps/test_app/config/contracts.js b/dapps/tests/app/config/contracts.js similarity index 100% rename from test_dapps/test_app/config/contracts.js rename to dapps/tests/app/config/contracts.js diff --git a/test_dapps/test_app/config/namesystem.json b/dapps/tests/app/config/namesystem.json similarity index 100% rename from test_dapps/test_app/config/namesystem.json rename to dapps/tests/app/config/namesystem.json diff --git a/test_dapps/contracts_app/privatenet/genesis.json b/dapps/tests/app/config/privatenet/genesis.json similarity index 100% rename from test_dapps/contracts_app/privatenet/genesis.json rename to dapps/tests/app/config/privatenet/genesis.json diff --git a/test_dapps/contracts_app/privatenet/password b/dapps/tests/app/config/privatenet/password similarity index 100% rename from test_dapps/contracts_app/privatenet/password rename to dapps/tests/app/config/privatenet/password diff --git a/test_dapps/contracts_app/rinkeby/password b/dapps/tests/app/config/rinkeby/password similarity index 100% rename from test_dapps/contracts_app/rinkeby/password rename to dapps/tests/app/config/rinkeby/password diff --git a/test_dapps/contracts_app/ropsten/password b/dapps/tests/app/config/ropsten/password similarity index 100% rename from test_dapps/contracts_app/ropsten/password rename to dapps/tests/app/config/ropsten/password diff --git a/test_dapps/test_app/config/storage.json b/dapps/tests/app/config/storage.json similarity index 100% rename from test_dapps/test_app/config/storage.json rename to dapps/tests/app/config/storage.json diff --git a/test_dapps/test_app/config/webserver.json b/dapps/tests/app/config/webserver.json similarity index 100% rename from test_dapps/test_app/config/webserver.json rename to dapps/tests/app/config/webserver.json diff --git a/test_dapps/test_app/contracts/token.sol b/dapps/tests/app/contracts/token.sol similarity index 100% rename from test_dapps/test_app/contracts/token.sol rename to dapps/tests/app/contracts/token.sol diff --git a/test_dapps/test_app/embark.json b/dapps/tests/app/embark.json similarity index 95% rename from test_dapps/test_app/embark.json rename to dapps/tests/app/embark.json index cedca271c..595ce7e7d 100644 --- a/test_dapps/test_app/embark.json +++ b/dapps/tests/app/embark.json @@ -20,7 +20,7 @@ "ipfs-api": "17.2.7" }, "plugins": { - "embark-service": {}, + "embark-dapp-test-service": {}, "embarkjs-connector-web3": {} }, "options": { diff --git a/test_dapps/test_app/embark.old_config.json b/dapps/tests/app/embark.old_config.json similarity index 96% rename from test_dapps/test_app/embark.old_config.json rename to dapps/tests/app/embark.old_config.json index 57b46ad28..65e811991 100644 --- a/test_dapps/test_app/embark.old_config.json +++ b/dapps/tests/app/embark.old_config.json @@ -23,6 +23,6 @@ "config": "config/", "plugins": { "embark-babel": {"files": ["**/*.js", "**/*.jsx", "!**/_vendor/*.js"]}, - "embark-service": {} + "embark-dapp-test-service": {} } } diff --git a/test_dapps/test_app/package.json b/dapps/tests/app/package.json similarity index 53% rename from test_dapps/test_app/package.json rename to dapps/tests/app/package.json index 44a4bf818..a76137641 100644 --- a/test_dapps/test_app/package.json +++ b/dapps/tests/app/package.json @@ -2,28 +2,26 @@ "devDependencies": { "@babel/code-frame": "7.0.0", "bootstrap": "3.4.0", - "embark": "4.0.0-beta.0", - "embark-service": "4.0.0-beta.0", + "embark": "^4.0.0-beta.0", + "embark-dapp-test-service": "^4.0.0-beta.0", + "embark-reset": "^4.0.0-beta.0", + "embarkjs-connector-web3": "^4.0.0-beta.0", "fs-extra": "7.0.1", "haml": "0.4.3", "jquery": "3.3.1", "react": "16.7.0", "react-bootstrap": "0.32.4", "react-dom": "16.7.0", - "rimraf": "2.6.3", "zeppelin-solidity": "1.12.0" }, - "dependencies": { - "embarkjs-connector-web3": "4.0.0-beta.0" - }, - "name": "test_app", + "name": "embark-dapp-test-app", "private": true, "scripts": { "ci": "npm run qa", - "clean": "./node_modules/.bin/embark reset || exit 0", + "clean": "npm run reset", "qa": "npm run test", - "reset": "npm run clean && npx rimraf node_modules", - "test": "./node_modules/.bin/embark test" + "reset": "npx embark-reset", + "test": "npx embark test" }, "version": "4.0.0-beta.0" } diff --git a/test_dapps/test_app/some_folder/test_contract.sol b/dapps/tests/app/some_folder/test_contract.sol similarity index 100% rename from test_dapps/test_app/some_folder/test_contract.sol rename to dapps/tests/app/some_folder/test_contract.sol diff --git a/test_dapps/test_app/test.file b/dapps/tests/app/test.file similarity index 100% rename from test_dapps/test_app/test.file rename to dapps/tests/app/test.file diff --git a/test_dapps/test_app/test/another_storage_spec.js b/dapps/tests/app/test/another_storage_spec.js similarity index 100% rename from test_dapps/test_app/test/another_storage_spec.js rename to dapps/tests/app/test/another_storage_spec.js diff --git a/test_dapps/test_app/test/array_references_spec.js b/dapps/tests/app/test/array_references_spec.js similarity index 100% rename from test_dapps/test_app/test/array_references_spec.js rename to dapps/tests/app/test/array_references_spec.js diff --git a/test_dapps/test_app/test/config_spec.js b/dapps/tests/app/test/config_spec.js similarity index 100% rename from test_dapps/test_app/test/config_spec.js rename to dapps/tests/app/test/config_spec.js diff --git a/test_dapps/test_app/test/embarkJS_spec.js b/dapps/tests/app/test/embarkJS_spec.js similarity index 100% rename from test_dapps/test_app/test/embarkJS_spec.js rename to dapps/tests/app/test/embarkJS_spec.js diff --git a/test_dapps/test_app/test/http_contract_test.js b/dapps/tests/app/test/http_contract_test.js similarity index 100% rename from test_dapps/test_app/test/http_contract_test.js rename to dapps/tests/app/test/http_contract_test.js diff --git a/test_dapps/test_app/test/interface_spec.js b/dapps/tests/app/test/interface_spec.js similarity index 100% rename from test_dapps/test_app/test/interface_spec.js rename to dapps/tests/app/test/interface_spec.js diff --git a/test_dapps/contracts_app/test/lib_test_spec.js b/dapps/tests/app/test/lib_test_spec.js similarity index 100% rename from test_dapps/contracts_app/test/lib_test_spec.js rename to dapps/tests/app/test/lib_test_spec.js diff --git a/test_dapps/test_app/test/namesystem_spec.js b/dapps/tests/app/test/namesystem_spec.js similarity index 100% rename from test_dapps/test_app/test/namesystem_spec.js rename to dapps/tests/app/test/namesystem_spec.js diff --git a/test_dapps/test_app/test/plugin_storage_spec.js b/dapps/tests/app/test/plugin_storage_spec.js similarity index 100% rename from test_dapps/test_app/test/plugin_storage_spec.js rename to dapps/tests/app/test/plugin_storage_spec.js diff --git a/test_dapps/test_app/test/simple_storage_deploy_spec.js b/dapps/tests/app/test/simple_storage_deploy_spec.js similarity index 100% rename from test_dapps/test_app/test/simple_storage_deploy_spec.js rename to dapps/tests/app/test/simple_storage_deploy_spec.js diff --git a/test_dapps/test_app/test/simple_storage_spec.js b/dapps/tests/app/test/simple_storage_spec.js similarity index 100% rename from test_dapps/test_app/test/simple_storage_spec.js rename to dapps/tests/app/test/simple_storage_spec.js diff --git a/test_dapps/test_app/test/token_spec.js b/dapps/tests/app/test/token_spec.js similarity index 100% rename from test_dapps/test_app/test/token_spec.js rename to dapps/tests/app/test/token_spec.js diff --git a/dapps/tests/contracts/.npmrc b/dapps/tests/contracts/.npmrc new file mode 100644 index 000000000..697976692 --- /dev/null +++ b/dapps/tests/contracts/.npmrc @@ -0,0 +1,3 @@ +package-lock = false +save-exact = true +scripts-prepend-node-path = true diff --git a/test_dapps/test_app/README.md b/dapps/tests/contracts/README.md similarity index 100% rename from test_dapps/test_app/README.md rename to dapps/tests/contracts/README.md diff --git a/test_dapps/contracts_app/blockchain.json b/dapps/tests/contracts/blockchain.json similarity index 100% rename from test_dapps/contracts_app/blockchain.json rename to dapps/tests/contracts/blockchain.json diff --git a/test_dapps/contracts_app/contracts.json b/dapps/tests/contracts/contracts.json similarity index 100% rename from test_dapps/contracts_app/contracts.json rename to dapps/tests/contracts/contracts.json diff --git a/test_dapps/contracts_app/contracts/another_storage.sol b/dapps/tests/contracts/contracts/another_storage.sol similarity index 100% rename from test_dapps/contracts_app/contracts/another_storage.sol rename to dapps/tests/contracts/contracts/another_storage.sol diff --git a/test_dapps/test_app/app/contracts/contract_args.sol b/dapps/tests/contracts/contracts/contract_args.sol similarity index 100% rename from test_dapps/test_app/app/contracts/contract_args.sol rename to dapps/tests/contracts/contracts/contract_args.sol diff --git a/test_dapps/test_app/app/contracts/invalid_file.sol__tmp__ b/dapps/tests/contracts/contracts/invalid_file.sol__tmp__ similarity index 100% rename from test_dapps/test_app/app/contracts/invalid_file.sol__tmp__ rename to dapps/tests/contracts/contracts/invalid_file.sol__tmp__ diff --git a/test_dapps/contracts_app/contracts/ownable.sol b/dapps/tests/contracts/contracts/ownable.sol similarity index 100% rename from test_dapps/contracts_app/contracts/ownable.sol rename to dapps/tests/contracts/contracts/ownable.sol diff --git a/test_dapps/contracts_app/contracts/simple_storage.sol b/dapps/tests/contracts/contracts/simple_storage.sol similarity index 100% rename from test_dapps/contracts_app/contracts/simple_storage.sol rename to dapps/tests/contracts/contracts/simple_storage.sol diff --git a/test_dapps/test_app/app/contracts/some_contract.sol b/dapps/tests/contracts/contracts/some_contract.sol similarity index 100% rename from test_dapps/test_app/app/contracts/some_contract.sol rename to dapps/tests/contracts/contracts/some_contract.sol diff --git a/test_dapps/contracts_app/contracts/test.sol b/dapps/tests/contracts/contracts/test.sol similarity index 100% rename from test_dapps/contracts_app/contracts/test.sol rename to dapps/tests/contracts/contracts/test.sol diff --git a/test_dapps/test_app/app/contracts/test2.sol b/dapps/tests/contracts/contracts/test2.sol similarity index 100% rename from test_dapps/test_app/app/contracts/test2.sol rename to dapps/tests/contracts/contracts/test2.sol diff --git a/test_dapps/contracts_app/contracts/token.sol b/dapps/tests/contracts/contracts/token.sol similarity index 100% rename from test_dapps/contracts_app/contracts/token.sol rename to dapps/tests/contracts/contracts/token.sol diff --git a/test_dapps/test_app/app/contracts/zlib2.sol b/dapps/tests/contracts/contracts/zlib2.sol similarity index 100% rename from test_dapps/test_app/app/contracts/zlib2.sol rename to dapps/tests/contracts/contracts/zlib2.sol diff --git a/test_dapps/contracts_app/embark.json b/dapps/tests/contracts/embark.json similarity index 100% rename from test_dapps/contracts_app/embark.json rename to dapps/tests/contracts/embark.json diff --git a/test_dapps/contracts_app/ens.json b/dapps/tests/contracts/ens.json similarity index 100% rename from test_dapps/contracts_app/ens.json rename to dapps/tests/contracts/ens.json diff --git a/dapps/tests/contracts/package.json b/dapps/tests/contracts/package.json new file mode 100644 index 000000000..4321ee59f --- /dev/null +++ b/dapps/tests/contracts/package.json @@ -0,0 +1,17 @@ +{ + "devDependencies": { + "embark": "^4.0.0-beta.0", + "embark-reset": "^4.0.0-beta.0", + "embarkjs-connector-web3": "^4.0.0-beta.0" + }, + "name": "embark-dapp-test-contracts", + "private": true, + "scripts": { + "ci": "npm run qa", + "clean": "npm run reset", + "qa": "npm run test", + "reset": "npx embark-reset", + "test": "npx embark test" + }, + "version": "4.0.0-beta.0" +} diff --git a/test_dapps/test_app/config/privatenet/genesis.json b/dapps/tests/contracts/privatenet/genesis.json similarity index 100% rename from test_dapps/test_app/config/privatenet/genesis.json rename to dapps/tests/contracts/privatenet/genesis.json diff --git a/test_dapps/test_app/config/privatenet/password b/dapps/tests/contracts/privatenet/password similarity index 100% rename from test_dapps/test_app/config/privatenet/password rename to dapps/tests/contracts/privatenet/password diff --git a/test_dapps/test_app/config/rinkeby/password b/dapps/tests/contracts/rinkeby/password similarity index 100% rename from test_dapps/test_app/config/rinkeby/password rename to dapps/tests/contracts/rinkeby/password diff --git a/test_dapps/test_app/config/ropsten/password b/dapps/tests/contracts/ropsten/password similarity index 100% rename from test_dapps/test_app/config/ropsten/password rename to dapps/tests/contracts/ropsten/password diff --git a/test_dapps/contracts_app/test/another_storage_spec.js b/dapps/tests/contracts/test/another_storage_spec.js similarity index 100% rename from test_dapps/contracts_app/test/another_storage_spec.js rename to dapps/tests/contracts/test/another_storage_spec.js diff --git a/test_dapps/contracts_app/test/array_references_spec.js b/dapps/tests/contracts/test/array_references_spec.js similarity index 100% rename from test_dapps/contracts_app/test/array_references_spec.js rename to dapps/tests/contracts/test/array_references_spec.js diff --git a/test_dapps/test_app/test/lib_test_spec.js b/dapps/tests/contracts/test/lib_test_spec.js similarity index 100% rename from test_dapps/test_app/test/lib_test_spec.js rename to dapps/tests/contracts/test/lib_test_spec.js diff --git a/test_dapps/contracts_app/test/ownable_test.sol b/dapps/tests/contracts/test/ownable_test.sol similarity index 100% rename from test_dapps/contracts_app/test/ownable_test.sol rename to dapps/tests/contracts/test/ownable_test.sol diff --git a/test_dapps/contracts_app/test/simple_storage_spec.js b/dapps/tests/contracts/test/simple_storage_spec.js similarity index 100% rename from test_dapps/contracts_app/test/simple_storage_spec.js rename to dapps/tests/contracts/test/simple_storage_spec.js diff --git a/test_dapps/contracts_app/test/token_spec.js b/dapps/tests/contracts/test/token_spec.js similarity index 100% rename from test_dapps/contracts_app/test/token_spec.js rename to dapps/tests/contracts/test/token_spec.js diff --git a/dapps/tests/service/.npmrc b/dapps/tests/service/.npmrc new file mode 100644 index 000000000..697976692 --- /dev/null +++ b/dapps/tests/service/.npmrc @@ -0,0 +1,3 @@ +package-lock = false +save-exact = true +scripts-prepend-node-path = true diff --git a/test_dapps/embark-service/contracts/pluginSimpleStorage.sol b/dapps/tests/service/contracts/pluginSimpleStorage.sol similarity index 100% rename from test_dapps/embark-service/contracts/pluginSimpleStorage.sol rename to dapps/tests/service/contracts/pluginSimpleStorage.sol diff --git a/test_dapps/embark-service/fileInPipeline.js b/dapps/tests/service/fileInPipeline.js similarity index 100% rename from test_dapps/embark-service/fileInPipeline.js rename to dapps/tests/service/fileInPipeline.js diff --git a/test_dapps/embark-service/index.js b/dapps/tests/service/index.js similarity index 100% rename from test_dapps/embark-service/index.js rename to dapps/tests/service/index.js diff --git a/test_dapps/embark-service/package.json b/dapps/tests/service/package.json similarity index 57% rename from test_dapps/embark-service/package.json rename to dapps/tests/service/package.json index 72bab0b35..ee67c8e2a 100644 --- a/test_dapps/embark-service/package.json +++ b/dapps/tests/service/package.json @@ -3,10 +3,7 @@ "haml": "0.4.3" }, "main": "index.js", - "name": "embark-service", + "name": "embark-dapp-test-service", "private": true, - "scripts": { - "reset": "npx rimraf node_modules" - }, "version": "4.0.0-beta.0" } diff --git a/package.json b/package.json index ab34099d8..24470811f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "babel-plugin-dynamic-import-node": "2.2.0", "babel-plugin-macros": "2.4.5", "chalk": "2.4.2", - "lerna": "3.10.7", + "lerna": "3.13.1", "lodash.clonedeep": "4.5.0", "minimist": "1.2.0", "npm-run-all": "4.1.5", @@ -28,40 +28,53 @@ "scripts": { "build": "lerna run --stream build", "build:no-ui": "npm run build -- --ignore embark-ui", - "ci": "yarn install && npm-run-all cwtree ci_ cwtree", - "ci_": "lerna run --concurrency=1 --stream ci", - "clean": "npx lerna run --parallel clean", + "ci": "lerna run --ignore embark-dapp-* --stream ci", + "ci:dapps": "lerna run --concurrency=1 --scope embark-dapp-* --stream ci", + "ci:full": "npm-run-all cwtree \"ci -- --concurrency={1}\" ci:dapps cwtree -- 1", + "clean": "npx lerna run --stream clean", + "clean:full": "npx npm-run-all clean clean:top", + "clean:top": "npx rimraf node_modules", "cwtree": "node scripts/check-working-tree", "globalize": "node scripts/globalize", "lint": "lerna run --parallel lint", "package": "lerna run --parallel package", - "preqa": "yarn install && npm-run-all cwtree build:no-ui", - "qa": "npm-run-all cwtree reboot:full cwtree qa_ cwtree", - "qa_": "lerna run --concurrency=1 --stream qa", - "reboot": "npm run reset && yarn install", - "reboot:full": "npm run reset:full && yarn install", + "postclean": "npx lerna clean --yes", + "postreboot": "yarn install", + "postreboot:full": "yarn install", + "preci:full": "yarn install", + "preqa:full": "yarn install", + "qa": "lerna run --ignore embark-dapp-* --stream qa", + "qa:dapps": "lerna run --concurrency=1 --scope embark-dapp-* --stream qa", + "qa:full": "npm-run-all cwtree reboot:full cwtree \"qa -- --concurrency={1}\" qa:dapps cwtree -- 1", + "reboot": "npm run clean", + "reboot:full": "npm run clean:full", "release": "node scripts/release", - "reset": "npx lerna run --parallel reset", - "reset:full": "npx npm-run-all reset reset:top", - "reset:top": "npx rimraf node_modules", + "reset": "npx lerna run --stream reset", "start": "lerna run --parallel start", - "test": "lerna run --concurrency=1 --stream test", - "test:full": "npm-run-all lint typecheck test", + "test": "lerna run --ignore embark-dapp-* --stream test", + "test:dapps": "lerna run --concurrency=1 --scope embark-dapp-* --stream test", + "test:full": "npm-run-all test test:dapps", "typecheck": "lerna run --parallel typecheck", "watch": "lerna run --parallel watch" }, "workspaces": { "packages": [ - "packages/*", - "test_dapps/*" + "dapps/templates/*", + "dapps/tests/*", + "packages/*" ], "nohoist": [ + "embark/embark-reset", "embark/embark-test-contract-0", "embark/embark-test-contract-1", - "test_app/embark-service", - "test_app/zeppelin-solidity", - "test_app/embarkjs-connector-web3", - "contracts_app/embarkjs-connector-web3" + "embark-dapp-template-boilerplate/embarkjs-connector-web3", + "embark-dapp-template-demo/embarkjs-connector-web3", + "embark-dapp-template-simple/embarkjs-connector-web3", + "embark-dapp-test-app/embark-dapp-test-service", + "embark-dapp-test-app/embarkjs-connector-web3", + "embark-dapp-test-app/zeppelin-solidity", + "embark-dapp-test-contracts/embarkjs-connector-web3", + "embark-reset/rimraf" ] } } diff --git a/packages/embark-async-wrapper/package.json b/packages/embark-async-wrapper/package.json index f06aa8df1..e529b5385 100644 --- a/packages/embark-async-wrapper/package.json +++ b/packages/embark-async-wrapper/package.json @@ -20,18 +20,18 @@ "scripts": { "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", "ci": "npm run qa", - "clean": "npx rimraf dist embark-*.tgz package", + "clean": "npm run reset", "lint": "npm-run-all lint:*", "lint:js": "eslint src/", "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", "package": "npm pack", "qa": "npm-run-all lint build package", - "reset": "npm run clean && npx rimraf node_modules", + "reset": "npx rimraf dist embark-*.tgz package", "start": "npm run watch", - "typecheck": "tsc", + "// typecheck": "tsc", "watch": "run-p watch:*", "watch:build": "npm run build -- --verbose --watch", - "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../.eslintrc.json" @@ -56,4 +56,3 @@ "yarn": ">=1.12.3" } } - diff --git a/packages/embark-compiler/package.json b/packages/embark-compiler/package.json index 9e42d5ab6..1db3a04f8 100644 --- a/packages/embark-compiler/package.json +++ b/packages/embark-compiler/package.json @@ -20,12 +20,12 @@ "scripts": { "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", "ci": "npm run qa", - "clean": "npx rimraf dist embark-*.tgz package", + "clean": "npm run reset", "lint": "npm-run-all lint:*", "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", "package": "npm pack", "qa": "npm-run-all lint typecheck build package", - "reset": "npm run clean && npx rimraf node_modules", + "reset": "npx rimraf dist embark-*.tgz package", "start": "npm run watch", "typecheck": "tsc", "watch": "run-p watch:*", diff --git a/packages/embark-graph/package.json b/packages/embark-graph/package.json index 2a390f28d..9bbf13f7b 100644 --- a/packages/embark-graph/package.json +++ b/packages/embark-graph/package.json @@ -23,14 +23,14 @@ "scripts": { "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", "ci": "npm run qa", - "clean": "npx rimraf dist embark-*.tgz package", + "clean": "npm run reset", "lint": "npm-run-all lint:*", "lint:js": "eslint src/", "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", "package": "npm pack", "// qa": "npm-run-all lint typecheck build package", "qa": "npm-run-all lint build package", - "reset": "npm run clean && npx rimraf node_modules", + "reset": "npx rimraf dist embark-*.tgz package", "start": "npm run watch", "// typecheck": "tsc", "watch": "run-p watch:*", diff --git a/packages/embark-reset/.npmrc b/packages/embark-reset/.npmrc new file mode 100644 index 000000000..e031d3432 --- /dev/null +++ b/packages/embark-reset/.npmrc @@ -0,0 +1,4 @@ +engine-strict = true +package-lock = false +save-exact = true +scripts-prepend-node-path = true diff --git a/packages/embark-reset/bin.js b/packages/embark-reset/bin.js new file mode 100755 index 000000000..1b239c75c --- /dev/null +++ b/packages/embark-reset/bin.js @@ -0,0 +1,5 @@ +#!/usr/bin/env node + +/* global module require */ + +require('./').reset(); diff --git a/packages/embark-reset/index.js b/packages/embark-reset/index.js new file mode 100644 index 000000000..ccddaedd9 --- /dev/null +++ b/packages/embark-reset/index.js @@ -0,0 +1,28 @@ +/* global exports process require */ + +const {join} = require('path'); +const {promisify} = require('util'); +const rimraf = promisify(require('rimraf')); + +const dappPath = process.env.DAPP_PATH || process.cwd(); + +const green = (text) => '\x1b[32m' + text + '\x1b[0m'; + +exports.paths = new Set([ + '.embark', + 'chains.json', + 'coverage', + 'dist', + 'embarkArtifacts', + 'node_modules/.cache' +]); + +exports.reset = async ({ + doneMessage = green('reset done!'), + removePaths = exports.paths +} = {}) => { + await Promise.all( + [...removePaths].map(relative => rimraf(join(dappPath, relative))) + ); + console.log(doneMessage); +}; diff --git a/packages/embark-reset/package.json b/packages/embark-reset/package.json new file mode 100644 index 000000000..c0044002e --- /dev/null +++ b/packages/embark-reset/package.json @@ -0,0 +1,21 @@ +{ + "name": "embark-reset", + "private": true, + "version": "4.0.0-beta.0", + "author": "Iuri Matias ", + "contributors": [], + "description": "DApp reset utlity for embark", + "homepage": "https://embark.status.im/", + "license": "MIT", + "repository": "github:embark-framework/embark", + "bin": "./bin.js", + "main": "index.js", + "dependencies": { + "rimraf": "2.6.3" + }, + "engines": { + "node": ">=8.12.0", + "npm": ">=6.4.1", + "yarn": ">=1.12.3" + } +} diff --git a/packages/embark-typings/package.json b/packages/embark-typings/package.json index 2747ed6b8..b4c185690 100644 --- a/packages/embark-typings/package.json +++ b/packages/embark-typings/package.json @@ -23,7 +23,6 @@ "ci": "npm run qa", "lint": "tslint -c tslint.json index.d.ts \"src/**/*.ts\"", "qa": "npm-run-all lint typecheck", - "reset": "npx rimraf node_modules", "start": "npm run watch", "typecheck": "tsc", "watch": "npm run typecheck -- --preserveWatchOutput --watch" @@ -31,7 +30,6 @@ "devDependencies": { "@types/web3": "1.0.12", "npm-run-all": "4.1.5", - "rimraf": "2.6.3", "tslint": "5.11.0", "typescript": "3.3.1" }, diff --git a/packages/embark-ui/package.json b/packages/embark-ui/package.json index 24897e0c3..c1fd4f6f7 100644 --- a/packages/embark-ui/package.json +++ b/packages/embark-ui/package.json @@ -20,11 +20,11 @@ "build": "node scripts/build.js", "build-storybook": "build-storybook -s public", "ci": "npm-run-all lint package", - "clean": "npx rimraf build embark-*.tgz package", + "clean": "npm run reset", "lint": "eslint src/", "package": "npm pack", "qa": "npm-run-all lint build package", - "reset": "npm run clean && npx rimraf node_modules", + "reset": "npx rimraf build embark-*.tgz package", "start": "node scripts/start.js", "storybook": "start-storybook -p 9009 -s public", "test_": "node scripts/test.js" diff --git a/packages/embark-vyper/package.json b/packages/embark-vyper/package.json index 00b14e7d0..b5940b193 100644 --- a/packages/embark-vyper/package.json +++ b/packages/embark-vyper/package.json @@ -20,14 +20,14 @@ "scripts": { "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", "ci": "npm run qa", - "clean": "npx rimraf dist embark-*.tgz package", + "clean": "npm run reset", "lint": "npm-run-all lint:*", "lint:js": "eslint src/", "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", "package": "npm pack", "// qa": "npm-run-all lint typecheck build package", "qa": "npm-run-all lint build package", - "reset": "npm run clean && npx rimraf node_modules", + "reset": "npx rimraf dist embark-*.tgz package", "start": "npm run watch", "// typecheck": "tsc", "watch": "run-p watch:*", diff --git a/packages/embark/package.json b/packages/embark/package.json index 5da67060f..8c1606736 100644 --- a/packages/embark/package.json +++ b/packages/embark/package.json @@ -24,14 +24,13 @@ "build": "cross-env BABEL_ENV=node babel src --copy-files --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", "ci": "npm-run-all qa ci:*", "ci:coverage-report": "nyc report --reporter=text-lcov | coveralls || exit 0", - "clean": "npx npm-run-all clean:* && npx rimraf .nyc_output coverage dist embark-*.tgz package", - "clean:templates": "node scripts/templates-reset", + "clean": "npm run reset", "lint": "npm-run-all lint:*", "lint:js": "eslint bin/embark src/bin/ src/lib/", "lint:ts": "tslint -c tslint.json \"src/**/*.ts\"", "package": "npm pack", "qa": "npm-run-all lint typecheck build test package", - "reset": "npm run clean && npx rimraf node_modules templates/**/node_modules", + "reset": "npx rimraf .nyc_output coverage dist embark-*.tgz package", "start": "npm run watch", "test": "node scripts/test.js", "typecheck": "tsc", @@ -77,6 +76,7 @@ "deep-equal": "1.0.1", "ejs": "2.6.1", "embark-compiler": "^4.0.0-beta.0", + "embark-reset": "^4.0.0-beta.0", "embark-ui": "^4.0.0-beta.0", "embark-vyper": "^4.0.0-beta.0", "embarkjs": "^4.0.0-beta.0", @@ -204,6 +204,9 @@ "tslint": "5.11.0", "typescript": "3.3.1" }, + "bundledDependencies": [ + "embark-reset" + ], "engines": { "node": ">=8.12.0", "npm": ">=6.4.1", diff --git a/packages/embark/scripts/templates-reset.js b/packages/embark/scripts/templates-reset.js deleted file mode 100644 index f0d1de315..000000000 --- a/packages/embark/scripts/templates-reset.js +++ /dev/null @@ -1,20 +0,0 @@ -/* global __dirname process require */ - -const {execSync} = require('child_process'); -const fs = require('fs'); -const glob = require('glob'); -const path = require('path'); - -try { - const templates = glob.sync(path.join(__dirname, '../templates/*')); - const dirs = templates.filter(match => fs.lstatSync(match).isDirectory()); - process.env.EMBARK_NO_SHIM='t'; - dirs.forEach(dir => { - execSync( - `echo ${dir} && node ${path.join(__dirname, '../bin/embark')} reset || exit 0`, - {cwd: dir, stdio: 'inherit'} - ); - }); -} catch (e) { - process.exit(1); -} diff --git a/packages/embark/src/cmd/cmd_controller.js b/packages/embark/src/cmd/cmd_controller.js index b97fa42de..524bec046 100644 --- a/packages/embark/src/cmd/cmd_controller.js +++ b/packages/embark/src/cmd/cmd_controller.js @@ -1,6 +1,7 @@ let async = require('async'); const constants = require('../lib/constants'); const Logger = require('../lib/core/logger'); +const {reset: embarkReset} = require('embark-reset'); require('colors'); @@ -406,15 +407,9 @@ class EmbarkController { } - reset() { - var fs = require('../lib/core/fs.js'); - fs.removeSync('chains.json'); - fs.removeSync('.embark/'); - fs.removeSync('node_modules/.cache'); - fs.removeSync('dist/'); - fs.removeSync('embarkArtifacts/'); - fs.removeSync('coverage/'); - console.log(__("reset done!").green); + async reset() { + const doneMessage = __("reset done!").green; + await embarkReset({doneMessage}); } ejectWebpack() { diff --git a/packages/embark/src/lib/utils/template_generator.js b/packages/embark/src/lib/utils/template_generator.js index 1607c24ef..e3aafaeab 100644 --- a/packages/embark/src/lib/utils/template_generator.js +++ b/packages/embark/src/lib/utils/template_generator.js @@ -1,8 +1,10 @@ +const findUp = require('find-up'); const fs = require('../core/fs.js'); const hostedGitInfo = require('hosted-git-info'); const utils = require('./utils.js'); const semver = require('semver'); const {promisify} = require('util'); +const {execSync} = require('child_process'); const REPLACEMENTS = { 'git@github.com/': 'git@github.com:', @@ -46,7 +48,6 @@ class TemplateGenerator { async downloadAndGenerate(uri, destinationFolder, name) { const fspath = utils.joinPath(destinationFolder, name); this.checkPathExists(fspath); - const self = this; let ext; try { ext = await this.getExternalProject(uri); @@ -73,52 +74,148 @@ class TemplateGenerator { } catch (e) { return this.downloadFailed(); } - utils.extractZip(tmpFilePath, fspath, { - map: file => { - let fixed_path = file.path.split('/'); - fixed_path.shift(); // remove first directory - file.path = utils.joinPath(...fixed_path); - return file; - } - }, () => { - self.installTemplate(fspath, name, true); + this.extract(tmpFilePath, fspath, () => { + this.installTemplate(fspath, name, true); }); } + extract(filePath, destinationFolder, cb = () => {}) { + utils.extractZip( + filePath, + destinationFolder, + { + map: file => { + let fixed_path = file.path.split('/'); + fixed_path.shift(); // remove first directory + file.path = utils.joinPath(...fixed_path); + return file; + } + }, + cb + ); + } + generate(destinationFolder, name) { const fspath = utils.joinPath(destinationFolder, name); this.checkPathExists(fspath); - console.log(__('Initializing Embark template...').green); - let templatePath = fs.embarkPath(utils.joinPath('templates', this.templateName)); - fs.copySync(templatePath, fspath); - this.installTemplate( - fspath, - name, - (this.templateName === 'boilerplate' || this.templateName === 'demo'), - () => { - if (name === 'embark_demo') { - console.log('-------------------'.yellow); - console.log(__('Next steps:').green); - console.log(('-> ' + ('cd ' + fspath).bold.cyan).green); - console.log('-> '.green + 'embark run'.bold.cyan); - console.log(__('For more info go to http://embark.status.im').green); + console.log(__('Initializing Embark template...').green); + + const templatePkg = `embark-dapp-template-${this.templateName}`; + let templateSpecifier; + if (this.monorepoRootPath) { + templateSpecifier = utils.joinPath( + this.monorepoRootPath, 'dapps/templates', this.templateName + ); + } else { + const version = fs.readJSONSync(fs.embarkPath('package.json')).version; + templateSpecifier = `${templatePkg}@^${version}`; + } + + const tmpDir = require('fs-extra').mkdtempSync( + utils.joinPath(require('os').tmpdir(), `${this.templateName}-`) + ); + + execSync(`npm pack ${templateSpecifier}`, {cwd: tmpDir, stdio: 'ignore'}); + const packed = utils.filesMatchingPattern( + [utils.joinPath(tmpDir, '*.tgz')] + )[0]; + + this.extract(packed, fspath, () => { + this.installTemplate( + fspath, + name, + true, + () => { + if (name === 'embark_demo') { + console.log('-------------------'.yellow); + console.log(__('Next steps:').green); + console.log(('-> ' + ('cd ' + fspath).bold.cyan).green); + console.log('-> '.green + 'embark run'.bold.cyan); + console.log(__('For more info go to http://embark.status.im').green); + } + } + ); + }); + } + + get monorepoRootPath() { + if (this._monorepoRootPath === undefined) { + let monorepoRootPath = null; + const maybeMonorepoRootPath = fs.existsSync( + fs.embarkPath('../../packages/embark') + ); + if (maybeMonorepoRootPath) { + const lernaJsonPath = findUp.sync('lerna.json', {cwd: fs.embarkPath()}); + if (lernaJsonPath) { + monorepoRootPath = utils.dirname(lernaJsonPath); } } - ); + this._monorepoRootPath = monorepoRootPath; + } + return this._monorepoRootPath; } installTemplate(templatePath, name, installPackages, cb) { utils.cd(templatePath); - utils.sed('package.json', '%APP_NAME%', name); + + const pkgJson = fs.readJSONSync('./package.json'); + pkgJson.name = name; + if (!(/demo/).test(name)) { + pkgJson.version = '0.0.1'; + } + delete pkgJson.files; + if (!pkgJson.scripts) pkgJson.scripts = {}; + delete pkgJson.scripts.ci; + delete pkgJson.scripts.clean; + delete pkgJson.scripts.package; + delete pkgJson.scripts.qa; + delete pkgJson.scripts.reset; + pkgJson.scripts.test = 'embark test'; + if (pkgJson.devDependencies) { + delete pkgJson.devDependencies['embark']; + delete pkgJson.devDependencies['embark-reset']; + delete pkgJson.devDependencies['npm-run-all']; + delete pkgJson.devDependencies['rimraf']; + } + fs.writeFileSync('package.json', JSON.stringify(pkgJson, null, 2)); + if (fs.existsSync('dot.gitignore')) { - fs.moveSync('dot.gitignore', '.gitignore'); - } else if (!fs.existsSync('.gitignore')) { - fs.copySync(fs.embarkPath('templates/dot.gitignore'), '.gitignore'); + fs.moveSync('dot.gitignore', '.gitignore', {overwrite: true}); + } + if (fs.existsSync('dot.npmrc')) { + fs.moveSync('dot.npmrc', '.npmrc', {overwrite: true}); } if (installPackages) { console.log(__('Installing packages...').green); + if (this.monorepoRootPath) { + let links = []; + execSync( + 'npx lerna list --long --parseable', + {cwd: this.monorepoRootPath, + stdio: ['ignore', 'pipe', 'ignore']} + ) + .toString() + .trim() + .split('\n') + .forEach(line => { + const [pkgDir, pkgName] = line.split(':'); + if ((pkgJson.dependencies && pkgJson.dependencies[pkgName]) || + (pkgJson.devDependencies && pkgJson.devDependencies[pkgName])) { + links.push(pkgName); + const cmd = 'yarn unlink && yarn link || yarn link'; + console.log(`cd ${pkgDir}; ${cmd}`.yellow); + execSync(cmd, {cwd: pkgDir, stdio: 'ignore'}); + } + }); + if (links.length) { + const cmd = `yarn link ${links.join(' ')}`; + console.log(`cd ${templatePath}; ${cmd}`.yellow); + execSync(cmd, {stdio: 'ignore'}); + } + } + utils.runCmd('npm install', {exitOnError: false}, (err) => { if (err) { console.error(__('Could not install dependencies. Try running `npm install` inside the project directory.').red); diff --git a/packages/embark/templates/.gitignore b/packages/embark/templates/.gitignore deleted file mode 100644 index 24c6e72da..000000000 --- a/packages/embark/templates/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -**/.embark -**/config/production/password -**/config/livenet/password -**/coverage -**/dist -**/embarkArtifacts -**/node_modules -**/package-lock.json diff --git a/packages/embark/templates/boilerplate/package.json b/packages/embark/templates/boilerplate/package.json deleted file mode 100644 index ecced3351..000000000 --- a/packages/embark/templates/boilerplate/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "%APP_NAME%", - "version": "0.0.1", - "description": "", - "scripts": { - "test": "embark test" - }, - "keywords": [], - "author": "", - "license": "MIT", - "dependencies": { - "embarkjs-connector-web3": "4.0.0-beta.0" - } -} diff --git a/packages/embark/templates/demo/package.json b/packages/embark/templates/demo/package.json deleted file mode 100644 index 07c0f45b7..000000000 --- a/packages/embark/templates/demo/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "embark_demo", - "version": "0.0.1", - "description": "", - "scripts": { - "test": "embark test" - }, - "keywords": [], - "author": "", - "license": "MIT", - "devDependencies": { - "react": "16.7.0", - "react-bootstrap": "0.32.4", - "react-dom": "16.7.0" - }, - "dependencies": { - "embarkjs-connector-web3": "4.0.0-beta.0" - } -} diff --git a/packages/embark/templates/simple/package.json b/packages/embark/templates/simple/package.json deleted file mode 100644 index ecced3351..000000000 --- a/packages/embark/templates/simple/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "%APP_NAME%", - "version": "0.0.1", - "description": "", - "scripts": { - "test": "embark test" - }, - "keywords": [], - "author": "", - "license": "MIT", - "dependencies": { - "embarkjs-connector-web3": "4.0.0-beta.0" - } -} diff --git a/packages/embarkjs-connector-web3/package.json b/packages/embarkjs-connector-web3/package.json index 0dc1d1f2d..0f363653f 100644 --- a/packages/embarkjs-connector-web3/package.json +++ b/packages/embarkjs-connector-web3/package.json @@ -1,15 +1,10 @@ { "name": "embarkjs-connector-web3", "version": "4.0.0-beta.0", + "author": "Jonathan Rainville", + "contributors": [], "description": "Web3.js Connector for EmbarkJS", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 0" - }, - "repository": { - "type": "git", - "url": "embark/packages/embarkjs-connector-web3" - }, + "homepage": "https://embark.status.im/", "keywords": [ "embark", "web3", @@ -17,6 +12,17 @@ "ethereum", "smart-contract" ], - "author": "Jonathan Rainville", - "license": "ISC" + "license": "MIT", + "repository": "github:embark-framework/embark", + "main": "index.js", + "scripts": { + "ci": "npm run qa", + "clean": "npm run reset", + "package": "npm pack", + "qa": "npm run package", + "reset": "npx rimraf embark-*.tgz package" + }, + "devDependencies": { + "rimraf": "2.6.3" + } } diff --git a/packages/embarkjs/package.json b/packages/embarkjs/package.json index b78cbe654..af1d0e4f5 100644 --- a/packages/embarkjs/package.json +++ b/packages/embarkjs/package.json @@ -35,10 +35,10 @@ "build:node:async": "cross-env BABEL_ENV=node:async babel src/node --out-dir dist --root-mode upward --source-maps", "build:node:test": "cross-env BABEL_ENV=node:test babel test --out-dir build-test --root-mode upward --source-maps", "ci": "npm run qa", - "clean": "npx rimraf build-test dist embarkjs-*.tgz package", + "clean": "npm run reset", "package": "npm pack", "qa": "npm-run-all build test package", - "reset": "npm run clean && npx rimraf node_modules", + "reset": "npx rimraf build-test dist embarkjs-*.tgz package", "start": "npm run watch", "test": "mocha \"build-test/**/*.js\" --exit --no-timeouts --require source-map-support/register", "watch": "run-p \"build:** -- --verbose --watch\"" diff --git a/scripts/release.js b/scripts/release.js index 359bba034..a42c14aa4 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -154,7 +154,7 @@ const runCommand = (cmd, inherit = true, display) => { ); try { - runCommand(`npm run qa`); + runCommand(`npm run qa:full`); logSuccess(`All steps succeeded in the QA suite.`); } catch (e) { logError(`A step failed in the QA suite. Please check the error above.`); diff --git a/test_dapps/contracts_app/package.json b/test_dapps/contracts_app/package.json deleted file mode 100644 index 5412bb4db..000000000 --- a/test_dapps/contracts_app/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "devDependencies": { - "embark": "4.0.0-beta.0", - "rimraf": "2.6.3" - }, - "dependencies": { - "embarkjs-connector-web3": "4.0.0-beta.0" - }, - "name": "contracts_app", - "private": true, - "scripts": { - "ci": "npm run qa", - "clean": "./node_modules/.bin/embark reset || exit 0", - "qa": "npm run test", - "reset": "npm run clean && npx rimraf node_modules", - "test": "./node_modules/.bin/embark test" - }, - "version": "4.0.0-beta.0" -} diff --git a/yarn.lock b/yarn.lock index f2a57bbf5..de8f4a02c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1494,52 +1494,54 @@ resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8" integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw== -"@lerna/add@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.10.6.tgz#6f2c6b26eb905c40fef4180f3ffa34ad9dbb860b" - integrity sha512-FxQ5Bmyb5fF+3BQiNffM6cTeGCrl4uaAuGvxFIWF6Pgz6U14tUc1e16xgKDvVb1CurzJgIV5sLOT5xmCOqv1kA== +"@lerna/add@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.13.1.tgz#2cd7838857edb3b43ed73e3c21f69a20beb9b702" + integrity sha512-cXk42YbuhzEnADCK8Qte5laC9Qo03eJLVnr0qKY85jQUM/T4URe3IIUemqpg0CpVATrB+Vz+iNdeqw9ng1iALw== dependencies: - "@lerna/bootstrap" "3.10.6" - "@lerna/command" "3.10.6" - "@lerna/filter-options" "3.10.6" - "@lerna/npm-conf" "3.7.0" - "@lerna/validation-error" "3.6.0" + "@lerna/bootstrap" "3.13.1" + "@lerna/command" "3.13.1" + "@lerna/filter-options" "3.13.0" + "@lerna/npm-conf" "3.13.0" + "@lerna/validation-error" "3.13.0" dedent "^0.7.0" - libnpm "^2.0.1" + npm-package-arg "^6.1.0" p-map "^1.2.0" + pacote "^9.5.0" semver "^5.5.0" -"@lerna/batch-packages@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.10.6.tgz#2d6dfc9be13ea4da49244dd84bfcd46c3d62f4d0" - integrity sha512-sInr3ZQJFMh9Zq+ZUoVjX8R67j9ViRkVy0uEMsOfG+jZlXj1lRPRMPRiRgU0jXSYEwCdwuAB5pTd9tTx0VCJUw== +"@lerna/batch-packages@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.13.0.tgz#697fde5be28822af9d9dca2f750250b90a89a000" + integrity sha512-TgLBTZ7ZlqilGnzJ3xh1KdAHcySfHytgNRTdG9YomfriTU6kVfp1HrXxKJYVGs7ClPUNt2CTFEOkw0tMBronjw== dependencies: - "@lerna/package-graph" "3.10.6" - "@lerna/validation-error" "3.6.0" - libnpm "^2.0.1" + "@lerna/package-graph" "3.13.0" + "@lerna/validation-error" "3.13.0" + npmlog "^4.1.2" -"@lerna/bootstrap@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.10.6.tgz#d250baa9cfe9026c4f78e6cf7c9761a90b24e363" - integrity sha512-qbGjAxRpV/eiI9CboUIpsPPGpSogs8mN2/iDaAUBTaWVFVz/YyU64nui84Gll0kbdaHOyPput+kk2S8NCSCCdg== +"@lerna/bootstrap@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.13.1.tgz#f2edd7c8093c8b139e78b0ca5f845f23efd01f08" + integrity sha512-mKdi5Ds5f82PZwEFyB9/W60I3iELobi1i87sTeVrbJh/um7GvqpSPy7kG/JPxyOdMpB2njX6LiJgw+7b6BEPWw== dependencies: - "@lerna/batch-packages" "3.10.6" - "@lerna/command" "3.10.6" - "@lerna/filter-options" "3.10.6" - "@lerna/has-npm-version" "3.10.0" - "@lerna/npm-install" "3.10.0" - "@lerna/package-graph" "3.10.6" - "@lerna/pulse-till-done" "3.7.1" - "@lerna/rimraf-dir" "3.10.0" - "@lerna/run-lifecycle" "3.10.5" - "@lerna/run-parallel-batches" "3.0.0" - "@lerna/symlink-binary" "3.10.0" - "@lerna/symlink-dependencies" "3.10.0" - "@lerna/validation-error" "3.6.0" + "@lerna/batch-packages" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/filter-options" "3.13.0" + "@lerna/has-npm-version" "3.13.0" + "@lerna/npm-install" "3.13.0" + "@lerna/package-graph" "3.13.0" + "@lerna/pulse-till-done" "3.13.0" + "@lerna/rimraf-dir" "3.13.0" + "@lerna/run-lifecycle" "3.13.0" + "@lerna/run-parallel-batches" "3.13.0" + "@lerna/symlink-binary" "3.13.0" + "@lerna/symlink-dependencies" "3.13.0" + "@lerna/validation-error" "3.13.0" dedent "^0.7.0" get-port "^3.2.0" - libnpm "^2.0.1" multimatch "^2.1.0" + npm-package-arg "^6.1.0" + npmlog "^4.1.2" p-finally "^1.0.0" p-map "^1.2.0" p-map-series "^1.0.0" @@ -1547,124 +1549,127 @@ read-package-tree "^5.1.6" semver "^5.5.0" -"@lerna/changed@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.10.6.tgz#48fed2e6c890b39a71f1dac29e42a6f853956d71" - integrity sha512-nZDVq/sKdhgoAg1BVnpqjqUUz5+zedG+AnU+6mjEN2f23YVtRCsW55N4I9eEdW2pxXUaCY85Hj/HPSA74BYaFg== +"@lerna/changed@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.13.1.tgz#dc92476aad43c932fe741969bbd0bcf6146a4c52" + integrity sha512-BRXitEJGOkoudbxEewW7WhjkLxFD+tTk4PrYpHLyCBk63pNTWtQLRE6dc1hqwh4emwyGncoyW6RgXfLgMZgryw== dependencies: - "@lerna/collect-updates" "3.10.1" - "@lerna/command" "3.10.6" - "@lerna/listable" "3.10.6" - "@lerna/output" "3.6.0" - "@lerna/version" "3.10.6" + "@lerna/collect-updates" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/listable" "3.13.0" + "@lerna/output" "3.13.0" + "@lerna/version" "3.13.1" -"@lerna/check-working-tree@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.10.0.tgz#5ed9f2c5c942bee92afcd8cb5361be44ed0251e3" - integrity sha512-NdIPhDgEtGHfeGjB9F0oAoPLywgMpjnJhLLwTNQkelDHo2xNAVpG8kV+A2UJ+cU5UXCZA4RZFxKNmw86rO+Drw== +"@lerna/check-working-tree@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.13.0.tgz#1ddcd4d9b1aceb65efaaa4cd1333a66706d67c9c" + integrity sha512-dsdO15NXX5To+Q53SYeCrBEpiqv4m5VkaPZxbGQZNwoRen1MloXuqxSymJANQn+ZLEqarv5V56gydebeROPH5A== dependencies: - "@lerna/describe-ref" "3.10.0" - "@lerna/validation-error" "3.6.0" + "@lerna/describe-ref" "3.13.0" + "@lerna/validation-error" "3.13.0" -"@lerna/child-process@3.3.0": - version "3.3.0" - resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.3.0.tgz#71184a763105b6c8ece27f43f166498d90fe680f" - integrity sha512-q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g== +"@lerna/child-process@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.13.0.tgz#84e35adf3217a6983edd28080657b9596a052674" + integrity sha512-0iDS8y2jiEucD4fJHEzKoc8aQJgm7s+hG+0RmDNtfT0MM3n17pZnf5JOMtS1FJp+SEXOjMKQndyyaDIPFsnp6A== dependencies: chalk "^2.3.1" execa "^1.0.0" strong-log-transformer "^2.0.0" -"@lerna/clean@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.10.6.tgz#31e4a12a722e57ca7adc0c9bc30ba70d55572bb8" - integrity sha512-MuL8HOwnyvVtr6GOiAN/Ofjbx+BJdCrtjrM1Uuh8FFnbnZTPVf+0MPxL2jVzPMo0PmoIrX3fvlwvzKNk/lH0Ug== +"@lerna/clean@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.13.1.tgz#9a7432efceccd720a51da5c76f849fc59c5a14ce" + integrity sha512-myGIaXv7RUO2qCFZXvx8SJeI+eN6y9SUD5zZ4/LvNogbOiEIlujC5lUAqK65rAHayQ9ltSa/yK6Xv510xhZXZQ== dependencies: - "@lerna/command" "3.10.6" - "@lerna/filter-options" "3.10.6" - "@lerna/prompt" "3.6.0" - "@lerna/pulse-till-done" "3.7.1" - "@lerna/rimraf-dir" "3.10.0" + "@lerna/command" "3.13.1" + "@lerna/filter-options" "3.13.0" + "@lerna/prompt" "3.13.0" + "@lerna/pulse-till-done" "3.13.0" + "@lerna/rimraf-dir" "3.13.0" p-map "^1.2.0" p-map-series "^1.0.0" p-waterfall "^1.0.0" -"@lerna/cli@3.10.7": - version "3.10.7" - resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.10.7.tgz#2f88ae4a3c53fa4d3a4f61b5f447bbbcc69546e2" - integrity sha512-yuoz/24mIfYit3neKqoE5NVs42Rj9A6A6SlkNPDfsy3v/Vh7SgYkU3cwiGyvwBGzIdhqL4/SWYo8H7YJLs0C+g== +"@lerna/cli@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.13.0.tgz#3d7b357fdd7818423e9681a7b7f2abd106c8a266" + integrity sha512-HgFGlyCZbYaYrjOr3w/EsY18PdvtsTmDfpUQe8HwDjXlPeCCUgliZjXLOVBxSjiOvPeOSwvopwIHKWQmYbwywg== dependencies: - "@lerna/global-options" "3.10.6" + "@lerna/global-options" "3.13.0" dedent "^0.7.0" - libnpm "^2.0.1" + npmlog "^4.1.2" yargs "^12.0.1" -"@lerna/collect-updates@3.10.1": - version "3.10.1" - resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.10.1.tgz#3ad60aa31826c0c0cfdf8bf41e58e6c5c86aeb3a" - integrity sha512-vb0wEJ8k63G+2CR/ud1WeVHNJ21Fs6Ew6lbdGZXnF4ZvaFWxWJZpoHeWwzjhMdJ75QdTzUaIhTG1hnH9faQNMw== +"@lerna/collect-updates@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.13.0.tgz#f0828d84ff959ff153d006765659ffc4d68cdefc" + integrity sha512-uR3u6uTzrS1p46tHQ/mlHog/nRJGBqskTHYYJbgirujxm6FqNh7Do+I1Q/7zSee407G4lzsNxZdm8IL927HemQ== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/describe-ref" "3.10.0" - libnpm "^2.0.1" + "@lerna/child-process" "3.13.0" + "@lerna/describe-ref" "3.13.0" minimatch "^3.0.4" + npmlog "^4.1.2" slash "^1.0.0" -"@lerna/command@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.10.6.tgz#709bd1c66220da67f65dbe1fc88bb7ba5bb85446" - integrity sha512-jPZswMZXOpAaIuSF5hrz+eaWQzbDrvwbrkCoRJKfiAHx7URAkE6MQe9DeAnqrTKMqwfg0RciSrZLc8kWYfrzCQ== +"@lerna/command@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.13.1.tgz#b60dda2c0d9ffbb6030d61ddf7cceedc1e8f7e6e" + integrity sha512-SYWezxX+iheWvzRoHCrbs8v5zHPaxAx3kWvZhqi70vuGsdOVAWmaG4IvHLn11ztS+Vpd5PM+ztBWSbnykpLFKQ== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/package-graph" "3.10.6" - "@lerna/project" "3.10.0" - "@lerna/validation-error" "3.6.0" - "@lerna/write-log-file" "3.6.0" + "@lerna/child-process" "3.13.0" + "@lerna/package-graph" "3.13.0" + "@lerna/project" "3.13.1" + "@lerna/validation-error" "3.13.0" + "@lerna/write-log-file" "3.13.0" dedent "^0.7.0" execa "^1.0.0" is-ci "^1.0.10" - libnpm "^2.0.1" lodash "^4.17.5" + npmlog "^4.1.2" -"@lerna/conventional-commits@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.10.0.tgz#284cc16bd3c387f841ff6bec42bcadaa2d13d8e4" - integrity sha512-8FvO0eR8g/tEgkb6eRVYaD39TsqMKsOXp17EV48jciciEqcrF/d1Ypu6ilK1GDp6R/1m2mbjt/b52a/qrO+xaw== +"@lerna/conventional-commits@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.13.0.tgz#877aa225ca34cca61c31ea02a5a6296af74e1144" + integrity sha512-BeAgcNXuocmLhPxnmKU2Vy8YkPd/Uo+vu2i/p3JGsUldzrPC8iF3IDxH7fuXpEFN2Nfogu7KHachd4tchtOppA== dependencies: - "@lerna/validation-error" "3.6.0" - conventional-changelog-angular "^5.0.2" - conventional-changelog-core "^3.1.5" + "@lerna/validation-error" "3.13.0" + conventional-changelog-angular "^5.0.3" + conventional-changelog-core "^3.1.6" conventional-recommended-bump "^4.0.4" fs-extra "^7.0.0" get-stream "^4.0.0" - libnpm "^2.0.1" + npm-package-arg "^6.1.0" + npmlog "^4.1.2" + pify "^3.0.0" semver "^5.5.0" -"@lerna/create-symlink@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.6.0.tgz#f1815cde2fc9d8d2315dfea44ee880f2f1bc65f1" - integrity sha512-YG3lTb6zylvmGqKU+QYA3ylSnoLn+FyLH5XZmUsD0i85R884+EyJJeHx/zUk+yrL2ZwHS4RBUgJfC24fqzgPoA== +"@lerna/create-symlink@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.13.0.tgz#e01133082fe040779712c960683cb3a272b67809" + integrity sha512-PTvg3jAAJSAtLFoZDsuTMv1wTOC3XYIdtg54k7uxIHsP8Ztpt+vlilY/Cni0THAqEMHvfiToel76Xdta4TU21Q== dependencies: cmd-shim "^2.0.2" fs-extra "^7.0.0" - libnpm "^2.0.1" + npmlog "^4.1.2" -"@lerna/create@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.10.6.tgz#85c7398cad912516c0ac6054a5c0c4145ab6cadb" - integrity sha512-OddQtGBHM2/eJONggLWoTE6275XGbnJ6dIVF+fLsKS93o4GC6g+qcc6Y7lUWHm5bfpeOwNOVKwj0tvqBZ6MgoA== +"@lerna/create@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.13.1.tgz#2c1284cfdc59f0d2b88286d78bc797f4ab330f79" + integrity sha512-pLENMXgTkQuvKxAopjKeoLOv9fVUCnpTUD7aLrY5d95/1xqSZlnsOcQfUYcpMf3GpOvHc8ILmI5OXkPqjAf54g== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/command" "3.10.6" - "@lerna/npm-conf" "3.7.0" - "@lerna/validation-error" "3.6.0" - camelcase "^4.1.0" + "@lerna/child-process" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/npm-conf" "3.13.0" + "@lerna/validation-error" "3.13.0" + camelcase "^5.0.0" dedent "^0.7.0" fs-extra "^7.0.0" globby "^8.0.1" init-package-json "^1.10.3" - libnpm "^2.0.1" + npm-package-arg "^6.1.0" p-reduce "^1.0.0" + pacote "^9.5.0" pify "^3.0.0" semver "^5.5.0" slash "^1.0.0" @@ -1672,404 +1677,427 @@ validate-npm-package-name "^3.0.0" whatwg-url "^7.0.0" -"@lerna/describe-ref@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.10.0.tgz#266380feece6013ab9674f52bd35bf0be5b0460d" - integrity sha512-fouh3FQS07QxJJp/mW8LkGnH0xMRAzpBlejtZaiRwfDkW2kd6EuHaj8I/2/p21Wsprcvuu4dqmyia2YS1xFb/w== +"@lerna/describe-ref@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.13.0.tgz#fb4c3863fd6bcccad67ce7b183887a5fc1942bb6" + integrity sha512-UJefF5mLxLae9I2Sbz5RLYGbqbikRuMqdgTam0MS5OhXnyuuKYBUpwBshCURNb1dPBXTQhSwc7+oUhORx8ojCg== dependencies: - "@lerna/child-process" "3.3.0" - libnpm "^2.0.1" + "@lerna/child-process" "3.13.0" + npmlog "^4.1.2" -"@lerna/diff@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.10.6.tgz#b4c5a50d8c7e79619376e2c913ec1c627dfd0cdf" - integrity sha512-0MqFhosjrqsIdXiKIu7t3CiJELqiU9mkjFBhYPB7JruAzpPwjMXJnC6/Ur5/7LXJYYVpqGQwZI9ZaZlOYJhhrw== +"@lerna/diff@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.13.1.tgz#5c734321b0f6c46a3c87f55c99afef3b01d46520" + integrity sha512-cKqmpONO57mdvxtp8e+l5+tjtmF04+7E+O0QEcLcNUAjC6UR2OSM77nwRCXDukou/1h72JtWs0jjcdYLwAmApg== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/command" "3.10.6" - "@lerna/validation-error" "3.6.0" - libnpm "^2.0.1" + "@lerna/child-process" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/validation-error" "3.13.0" + npmlog "^4.1.2" -"@lerna/exec@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.10.6.tgz#5564b614b7e39c1f034f5e0736c9e020945f2f12" - integrity sha512-cdHqaRBMYceJu8rZLO8b4ZeR27O+xKPHgzi13OOOfBJQjrTuacjMWyHgmpy8jWc/0f7QnTl4VsHks7VJ3UK+vw== +"@lerna/exec@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.13.1.tgz#4439e90fb0877ec38a6ef933c86580d43eeaf81b" + integrity sha512-I34wEP9lrAqqM7tTXLDxv/6454WFzrnXDWpNDbiKQiZs6SIrOOjmm6I4FiQsx+rU3o9d+HkC6tcUJRN5mlJUgA== dependencies: - "@lerna/batch-packages" "3.10.6" - "@lerna/child-process" "3.3.0" - "@lerna/command" "3.10.6" - "@lerna/filter-options" "3.10.6" - "@lerna/run-parallel-batches" "3.0.0" - "@lerna/validation-error" "3.6.0" + "@lerna/batch-packages" "3.13.0" + "@lerna/child-process" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/filter-options" "3.13.0" + "@lerna/run-parallel-batches" "3.13.0" + "@lerna/validation-error" "3.13.0" -"@lerna/filter-options@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.10.6.tgz#e05a8b8de6efc16c47c83f0ac58291008efba4b8" - integrity sha512-r/dQbqN+RGFKZNn+DyWehswFmAkny/fkdMB2sRM2YVe7zRTtSl95YxD9DtdYnpJTG/jbOVICS/L5QJakrI6SSw== +"@lerna/filter-options@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.13.0.tgz#976e3d8b9fcd47001ab981d276565c1e9f767868" + integrity sha512-SRp7DCo9zrf+7NkQxZMkeyO1GRN6GICoB9UcBAbXhLbWisT37Cx5/6+jh49gYB63d/0/WYHSEPMlheUrpv1Srw== dependencies: - "@lerna/collect-updates" "3.10.1" - "@lerna/filter-packages" "3.10.0" + "@lerna/collect-updates" "3.13.0" + "@lerna/filter-packages" "3.13.0" dedent "^0.7.0" -"@lerna/filter-packages@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.10.0.tgz#75f9a08184fc4046da2057e0218253cd6f493f05" - integrity sha512-3Acdj+jbany6LnQSuImU4ttcK5ULHSVug8Gh/EvwTewKCDpHAuoI3eyuzZOnSBdMvDOjE03uIESQK0dNNsn6Ow== +"@lerna/filter-packages@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.13.0.tgz#f5371249e7e1a15928e5e88c544a242e0162c21c" + integrity sha512-RWiZWyGy3Mp7GRVBn//CacSnE3Kw82PxE4+H6bQ3pDUw/9atXn7NRX+gkBVQIYeKamh7HyumJtyOKq3Pp9BADQ== dependencies: - "@lerna/validation-error" "3.6.0" - libnpm "^2.0.1" + "@lerna/validation-error" "3.13.0" multimatch "^2.1.0" + npmlog "^4.1.2" -"@lerna/get-npm-exec-opts@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.6.0.tgz#ea595eb28d1f34ba61a92ee8391f374282b4b76e" - integrity sha512-ruH6KuLlt75aCObXfUIdVJqmfVq7sgWGq5mXa05vc1MEqxTIiU23YiJdWzofQOOUOACaZkzZ4K4Nu7wXEg4Xgg== +"@lerna/get-npm-exec-opts@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz#d1b552cb0088199fc3e7e126f914e39a08df9ea5" + integrity sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw== dependencies: - libnpm "^2.0.1" + npmlog "^4.1.2" -"@lerna/get-packed@3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.7.0.tgz#549c7738f7be5e3b1433e82ed9cda9123bcd1ed5" - integrity sha512-yuFtjsUZIHjeIvIYQ/QuytC+FQcHwo3peB+yGBST2uWCLUCR5rx6knoQcPzbxdFDCuUb5IFccFGd3B1fHFg3RQ== +"@lerna/get-packed@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.13.0.tgz#335e40d77f3c1855aa248587d3e0b2d8f4b06e16" + integrity sha512-EgSim24sjIjqQDC57bgXD9l22/HCS93uQBbGpkzEOzxAVzEgpZVm7Fm1t8BVlRcT2P2zwGnRadIvxTbpQuDPTg== dependencies: fs-extra "^7.0.0" ssri "^6.0.1" tar "^4.4.8" -"@lerna/global-options@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.10.6.tgz#c491a64b0be47eca4ffc875011958a5ee70a9a3e" - integrity sha512-k5Xkq1M/uREFC2R9uwN5gcvIgjj4iOXo0YyeEXCMWBiW3j2GL9xN4d1MmAIcrYlAzVYh6kLlWaFWl/rNIneHIw== - -"@lerna/has-npm-version@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.10.0.tgz#d3a73c0fedd2f2e9c6fbe166c41809131dc939d2" - integrity sha512-N4RRYxGeivuaKgPDzrhkQOQs1Sg4tOnxnEe3akfqu1wDA4Ng5V6Y2uW3DbkAjFL3aNJhWF5Vbf7sBsGtfgDQ8w== +"@lerna/github-client@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.13.1.tgz#cb9bf9f01685a0cee0fac63f287f6c3673e45aa3" + integrity sha512-iPLUp8FFoAKGURksYEYZzfuo9TRA+NepVlseRXFaWlmy36dCQN20AciINpoXiXGoHcEUHXUKHQvY3ARFdMlf3w== dependencies: - "@lerna/child-process" "3.3.0" + "@lerna/child-process" "3.13.0" + "@octokit/plugin-enterprise-rest" "^2.1.1" + "@octokit/rest" "^16.16.0" + git-url-parse "^11.1.2" + npmlog "^4.1.2" + +"@lerna/global-options@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1" + integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ== + +"@lerna/has-npm-version@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.13.0.tgz#6e1f7e9336cce3e029066f0175f06dd9d51ad09f" + integrity sha512-Oqu7DGLnrMENPm+bPFGOHnqxK8lCnuYr6bk3g/CoNn8/U0qgFvHcq6Iv8/Z04TsvleX+3/RgauSD2kMfRmbypg== + dependencies: + "@lerna/child-process" "3.13.0" semver "^5.5.0" -"@lerna/import@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.10.6.tgz#36b65854857e8ab5dfd98a1caea4d365ecc06578" - integrity sha512-LlGxhfDhovoNoBJLF3PYd3j/G2GFTnfLh0V38+hBQ6lomMNJbjkACfiLVomQxPWWpYLk0GTlpWYR8YGv6L7Ifw== +"@lerna/import@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.13.1.tgz#69d641341a38b79bd379129da1c717d51dd728c7" + integrity sha512-A1Vk1siYx1XkRl6w+zkaA0iptV5TIynVlHPR9S7NY0XAfhykjztYVvwtxarlh6+VcNrO9We6if0+FXCrfDEoIg== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/command" "3.10.6" - "@lerna/prompt" "3.6.0" - "@lerna/pulse-till-done" "3.7.1" - "@lerna/validation-error" "3.6.0" + "@lerna/child-process" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/prompt" "3.13.0" + "@lerna/pulse-till-done" "3.13.0" + "@lerna/validation-error" "3.13.0" dedent "^0.7.0" fs-extra "^7.0.0" p-map-series "^1.0.0" -"@lerna/init@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.10.6.tgz#b5c5166b2ddf00ea0f2742a1f53f59221478cf9a" - integrity sha512-RIlEx+ofWLYRNjxCkkV3G0XQPM+/KA5RXRDb5wKQLYO1f+tZAaHoUh8fHDIvxGf/ohY/OIjYYGSsU+ysimfwiQ== +"@lerna/init@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.13.1.tgz#0392c822abb3d63a75be4916c5e761cfa7b34dda" + integrity sha512-M59WACqim8WkH5FQEGOCEZ89NDxCKBfFTx4ZD5ig3LkGyJ8RdcJq5KEfpW/aESuRE9JrZLzVr0IjKbZSxzwEMA== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/command" "3.10.6" + "@lerna/child-process" "3.13.0" + "@lerna/command" "3.13.1" fs-extra "^7.0.0" p-map "^1.2.0" write-json-file "^2.3.0" -"@lerna/link@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.10.6.tgz#4201cabbfc27bebaf1a400f8cfbd238f285dd3c7" - integrity sha512-dwD6qftRWitgLDYbqtDrgO7c8uF5C0fHVew5M6gU5m9tBJidqd7cDwHv/bXboLEI63U7tt5y6LY+wEpYUFsBRw== +"@lerna/link@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.13.1.tgz#7d8ed4774bfa198d1780f790a14abb8722a3aad1" + integrity sha512-N3h3Fj1dcea+1RaAoAdy4g2m3fvU7m89HoUn5X/Zcw5n2kPoK8kTO+NfhNAatfRV8VtMXst8vbNrWQQtfm0FFw== dependencies: - "@lerna/command" "3.10.6" - "@lerna/package-graph" "3.10.6" - "@lerna/symlink-dependencies" "3.10.0" + "@lerna/command" "3.13.1" + "@lerna/package-graph" "3.13.0" + "@lerna/symlink-dependencies" "3.13.0" p-map "^1.2.0" slash "^1.0.0" -"@lerna/list@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.10.6.tgz#7c43c09301ea01528f4dab3b22666f021e8ba9a5" - integrity sha512-3ElQBj2dOB4uUkpsjC1bxdeZwEzRBuV1pBBs5E1LncwsZf7D9D99Z32fuZsDaCHpEMgHAD4/j8juI3/7m5dkaQ== +"@lerna/list@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.13.1.tgz#f9513ed143e52156c10ada4070f903c5847dcd10" + integrity sha512-635iRbdgd9gNvYLLIbYdQCQLr+HioM5FGJLFS0g3DPGygr6iDR8KS47hzCRGH91LU9NcM1mD1RoT/AChF+QbiA== dependencies: - "@lerna/command" "3.10.6" - "@lerna/filter-options" "3.10.6" - "@lerna/listable" "3.10.6" - "@lerna/output" "3.6.0" + "@lerna/command" "3.13.1" + "@lerna/filter-options" "3.13.0" + "@lerna/listable" "3.13.0" + "@lerna/output" "3.13.0" -"@lerna/listable@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.10.6.tgz#cea92de89d9f293c6d63e00be662bed03f85c496" - integrity sha512-F7ZuvesSgeuMiJf99eOum5p1MQGQStykcmHH1ek+LQRMiGGF1o3PkBxPvHTZBADGOFarek8bFA5TVmRAMX7NIw== +"@lerna/listable@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.13.0.tgz#babc18442c590b549cf0966d20d75fea066598d4" + integrity sha512-liYJ/WBUYP4N4MnSVZuLUgfa/jy3BZ02/1Om7xUY09xGVSuNVNEeB8uZUMSC+nHqFHIsMPZ8QK9HnmZb1E/eTA== dependencies: - "@lerna/batch-packages" "3.10.6" + "@lerna/batch-packages" "3.13.0" chalk "^2.3.1" columnify "^1.5.4" -"@lerna/log-packed@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.6.0.tgz#bed96c2bdd47f076d9957d0c6069b2edc1518145" - integrity sha512-T/J41zMkzpWB5nbiTRS5PmYTFn74mJXe6RQA2qhkdLi0UqnTp97Pux1loz3jsJf2yJtiQUnyMM7KuKIAge0Vlw== +"@lerna/log-packed@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.13.0.tgz#497b5f692a8d0e3f669125da97b0dadfd9e480f3" + integrity sha512-Rmjrcz+6aM6AEcEVWmurbo8+AnHOvYtDpoeMMJh9IZ9SmZr2ClXzmD7wSvjTQc8BwOaiWjjC/ukcT0UYA2m7wg== dependencies: byte-size "^4.0.3" columnify "^1.5.4" has-unicode "^2.0.1" - libnpm "^2.0.1" + npmlog "^4.1.2" -"@lerna/npm-conf@3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.7.0.tgz#f101d4fdf07cefcf1161bcfaf3c0f105b420a450" - integrity sha512-+WSMDfPKcKzMfqq283ydz9RRpOU6p9wfx0wy4hVSUY/6YUpsyuk8SShjcRtY8zTM5AOrxvFBuuV90H4YpZ5+Ng== +"@lerna/npm-conf@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.13.0.tgz#6b434ed75ff757e8c14381b9bbfe5d5ddec134a7" + integrity sha512-Jg2kANsGnhg+fbPEzE0X9nX5oviEAvWj0nYyOkcE+cgWuT7W0zpnPXC4hA4C5IPQGhwhhh0IxhWNNHtjTuw53g== dependencies: config-chain "^1.1.11" pify "^3.0.0" -"@lerna/npm-dist-tag@3.8.5": - version "3.8.5" - resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.8.5.tgz#5ce22a72576badc8cb6baf85550043d63e66ea44" - integrity sha512-VO57yKTB4NC2LZuTd4w0LmlRpoFm/gejQ1gqqLGzSJuSZaBXmieElFovzl21S07cqiy7FNVdz75x7/a6WCZ6XA== +"@lerna/npm-dist-tag@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.13.0.tgz#49ecbe0e82cbe4ad4a8ea6de112982bf6c4e6cd4" + integrity sha512-mcuhw34JhSRFrbPn0vedbvgBTvveG52bR2lVE3M3tfE8gmR/cKS/EJFO4AUhfRKGCTFn9rjaSEzlFGYV87pemQ== dependencies: figgy-pudding "^3.5.1" - libnpm "^2.0.1" + npm-package-arg "^6.1.0" + npm-registry-fetch "^3.9.0" + npmlog "^4.1.2" -"@lerna/npm-install@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.10.0.tgz#fcd6688a3a2cd0e702a03c54c22eb7ae8b3dacb0" - integrity sha512-/6/XyLY9/4jaMPBOVYUr4wZxQURIfwoELY0qCQ8gZ5zv4cOiFiiCUxZ0i4fxqFtD7nJ084zq1DsZW0aH0CIWYw== +"@lerna/npm-install@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.13.0.tgz#88f4cc39f4f737c8a8721256b915ea1bcc6a7227" + integrity sha512-qNyfts//isYQxore6fsPorNYJmPVKZ6tOThSH97tP0aV91zGMtrYRqlAoUnDwDdAjHPYEM16hNujg2wRmsqqIw== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/get-npm-exec-opts" "3.6.0" + "@lerna/child-process" "3.13.0" + "@lerna/get-npm-exec-opts" "3.13.0" fs-extra "^7.0.0" - libnpm "^2.0.1" + npm-package-arg "^6.1.0" + npmlog "^4.1.2" signal-exit "^3.0.2" write-pkg "^3.1.0" -"@lerna/npm-publish@3.10.7": - version "3.10.7" - resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.10.7.tgz#9326b747b905a7f0e69d4be3f557859c3e359649" - integrity sha512-oU3/Q+eHC1fRjh7bk6Nn4tRD1OLR6XZVs3v+UWMWMrF4hVSV61pxcP5tpeI1n4gDQjSgh7seI4EzKVJe/WfraA== +"@lerna/npm-publish@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.13.0.tgz#5c74808376e778865ffdc5885fe83935e15e60c3" + integrity sha512-y4WO0XTaf9gNRkI7as6P2ItVDOxmYHwYto357fjybcnfXgMqEA94c3GJ++jU41j0A9vnmYC6/XxpTd9sVmH9tA== dependencies: - "@lerna/run-lifecycle" "3.10.5" + "@lerna/run-lifecycle" "3.13.0" figgy-pudding "^3.5.1" fs-extra "^7.0.0" - libnpm "^2.0.1" + libnpmpublish "^1.1.1" + npmlog "^4.1.2" + pify "^3.0.0" + read-package-json "^2.0.13" -"@lerna/npm-run-script@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.10.0.tgz#49a9204eddea136da15a8d8d9eba2c3175b77ddd" - integrity sha512-c21tBXLF1Wje4tx/Td9jKIMrlZo/8QQiyyadjdKpwyyo7orSMsVNXGyJwvZ4JVVDcwC3GPU6HQvkt63v7rcyaw== +"@lerna/npm-run-script@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.13.0.tgz#e5997f045402b9948bdc066033ebb36bf94fc9e4" + integrity sha512-hiL3/VeVp+NFatBjkGN8mUdX24EfZx9rQlSie0CMgtjc7iZrtd0jCguLomSCRHYjJuvqgbp+LLYo7nHVykfkaQ== dependencies: - "@lerna/child-process" "3.3.0" - "@lerna/get-npm-exec-opts" "3.6.0" - libnpm "^2.0.1" + "@lerna/child-process" "3.13.0" + "@lerna/get-npm-exec-opts" "3.13.0" + npmlog "^4.1.2" -"@lerna/output@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.6.0.tgz#a69384bc685cf3b21aa1bfc697eb2b9db3333d0b" - integrity sha512-9sjQouf6p7VQtVCRnzoTGlZyURd48i3ha3WBHC/UBJnHZFuXMqWVPKNuvnMf2kRXDyoQD+2mNywpmEJg5jOnRg== +"@lerna/output@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989" + integrity sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg== dependencies: - libnpm "^2.0.1" + npmlog "^4.1.2" -"@lerna/pack-directory@3.10.5": - version "3.10.5" - resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.10.5.tgz#9bdabceacb74e1f54e47bae925e193978f2aae51" - integrity sha512-Ulj24L9XdgjJIxBr6ZjRJEoBULVH3c10lqunUdW41bswXhzhirRtQIxv0+5shngNjDwgMmJfOBcuCVKPSez4tg== +"@lerna/pack-directory@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.13.1.tgz#5ad4d0945f86a648f565e24d53c1e01bb3a912d1" + integrity sha512-kXnyqrkQbCIZOf1054N88+8h0ItC7tUN5v9ca/aWpx298gsURpxUx/1TIKqijL5TOnHMyIkj0YJmnH/PyBVLKA== dependencies: - "@lerna/get-packed" "3.7.0" - "@lerna/package" "3.7.2" - "@lerna/run-lifecycle" "3.10.5" + "@lerna/get-packed" "3.13.0" + "@lerna/package" "3.13.0" + "@lerna/run-lifecycle" "3.13.0" figgy-pudding "^3.5.1" - libnpm "^2.0.1" - npm-packlist "^1.1.12" + npm-packlist "^1.4.1" + npmlog "^4.1.2" tar "^4.4.8" temp-write "^3.4.0" -"@lerna/package-graph@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.10.6.tgz#8940d1ed7003100117cb1b618f7690585c00db81" - integrity sha512-mpIOJbhi+xLqT9BcUrLVD4We8WUdousQf/QndbEWl8DWAW1ethtRHVsCm9ufdBB3F9nj4PH/hqnDWWwqE+rS4w== +"@lerna/package-graph@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.13.0.tgz#607062f8d2ce22b15f8d4a0623f384736e67f760" + integrity sha512-3mRF1zuqFE1HEFmMMAIggXy+f+9cvHhW/jzaPEVyrPNLKsyfJQtpTNzeI04nfRvbAh+Gd2aNksvaW/w3xGJnnw== dependencies: - "@lerna/validation-error" "3.6.0" - libnpm "^2.0.1" + "@lerna/validation-error" "3.13.0" + npm-package-arg "^6.1.0" semver "^5.5.0" -"@lerna/package@3.7.2": - version "3.7.2" - resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.7.2.tgz#03c69fd7fb965c372c8c969165a2f7d6dfe2dfcb" - integrity sha512-8A5hN2CekM1a0Ix4VUO/g+REo+MsnXb8lnQ0bGjr1YGWzSL5NxYJ0Z9+0pwTfDpvRDYlFYO0rMVwBUW44b4dUw== +"@lerna/package@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.13.0.tgz#4baeebc49a57fc9b31062cc59f5ee38384429fc8" + integrity sha512-kSKO0RJQy093BufCQnkhf1jB4kZnBvL7kK5Ewolhk5gwejN+Jofjd8DGRVUDUJfQ0CkW1o6GbUeZvs8w8VIZDg== dependencies: - libnpm "^2.0.1" load-json-file "^4.0.0" + npm-package-arg "^6.1.0" write-pkg "^3.1.0" -"@lerna/project@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.10.0.tgz#98272bf2eb93e9b21850edae568d696bf7fdebda" - integrity sha512-9QRl8aGHuyU4zVEELQmNPnJTlS7XHqX7w9I9isCXdnilKc2R0MyvUs21lj6Yyt6xTuQnqD158TR9tbS4QufYQQ== +"@lerna/project@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.13.1.tgz#bce890f60187bd950bcf36c04b5260642e295e79" + integrity sha512-/GoCrpsCCTyb9sizk1+pMBrIYchtb+F1uCOn3cjn9yenyG/MfYEnlfrbV5k/UDud0Ei75YBLbmwCbigHkAKazQ== dependencies: - "@lerna/package" "3.7.2" - "@lerna/validation-error" "3.6.0" - cosmiconfig "^5.0.2" + "@lerna/package" "3.13.0" + "@lerna/validation-error" "3.13.0" + cosmiconfig "^5.1.0" dedent "^0.7.0" dot-prop "^4.2.0" glob-parent "^3.1.0" globby "^8.0.1" - libnpm "^2.0.1" load-json-file "^4.0.0" + npmlog "^4.1.2" p-map "^1.2.0" resolve-from "^4.0.0" write-json-file "^2.3.0" -"@lerna/prompt@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.6.0.tgz#b17cc464dec9d830619723e879dc747367378217" - integrity sha512-nyAjPMolJ/ZRAAVcXrUH89C4n1SiWvLh4xWNvWYKLcf3PI5yges35sDFP/HYrM4+cEbkNFuJCRq6CxaET4PRsg== +"@lerna/prompt@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.13.0.tgz#53571462bb3f5399cc1ca6d335a411fe093426a5" + integrity sha512-P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA== dependencies: inquirer "^6.2.0" - libnpm "^2.0.1" + npmlog "^4.1.2" -"@lerna/publish@3.10.7": - version "3.10.7" - resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.10.7.tgz#8c5a3268398152e1f7993ff7bb6722a0363797af" - integrity sha512-Qd8pml2l9s6GIvNX1pTnia+Ddjsm9LF3pRRoOQeugAdv2IJNf45c/83AAEyE9M2ShG5VjgxEITNW4Lg49zipjQ== +"@lerna/publish@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.13.1.tgz#217e401dcb5824cdd6d36555a36303fb7520c514" + integrity sha512-KhCJ9UDx76HWCF03i5TD7z5lX+2yklHh5SyO8eDaLptgdLDQ0Z78lfGj3JhewHU2l46FztmqxL/ss0IkWHDL+g== dependencies: - "@lerna/batch-packages" "3.10.6" - "@lerna/check-working-tree" "3.10.0" - "@lerna/child-process" "3.3.0" - "@lerna/collect-updates" "3.10.1" - "@lerna/command" "3.10.6" - "@lerna/describe-ref" "3.10.0" - "@lerna/log-packed" "3.6.0" - "@lerna/npm-conf" "3.7.0" - "@lerna/npm-dist-tag" "3.8.5" - "@lerna/npm-publish" "3.10.7" - "@lerna/output" "3.6.0" - "@lerna/pack-directory" "3.10.5" - "@lerna/prompt" "3.6.0" - "@lerna/pulse-till-done" "3.7.1" - "@lerna/run-lifecycle" "3.10.5" - "@lerna/run-parallel-batches" "3.0.0" - "@lerna/validation-error" "3.6.0" - "@lerna/version" "3.10.6" + "@lerna/batch-packages" "3.13.0" + "@lerna/check-working-tree" "3.13.0" + "@lerna/child-process" "3.13.0" + "@lerna/collect-updates" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/describe-ref" "3.13.0" + "@lerna/log-packed" "3.13.0" + "@lerna/npm-conf" "3.13.0" + "@lerna/npm-dist-tag" "3.13.0" + "@lerna/npm-publish" "3.13.0" + "@lerna/output" "3.13.0" + "@lerna/pack-directory" "3.13.1" + "@lerna/prompt" "3.13.0" + "@lerna/pulse-till-done" "3.13.0" + "@lerna/run-lifecycle" "3.13.0" + "@lerna/run-parallel-batches" "3.13.0" + "@lerna/validation-error" "3.13.0" + "@lerna/version" "3.13.1" figgy-pudding "^3.5.1" fs-extra "^7.0.0" - libnpm "^2.0.1" + libnpmaccess "^3.0.1" + npm-package-arg "^6.1.0" + npm-registry-fetch "^3.9.0" + npmlog "^4.1.2" p-finally "^1.0.0" p-map "^1.2.0" p-pipe "^1.2.0" p-reduce "^1.0.0" + pacote "^9.5.0" semver "^5.5.0" -"@lerna/pulse-till-done@3.7.1": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.7.1.tgz#a9e55380fa18f6896a3e5b23621a4227adfb8f85" - integrity sha512-MzpesZeW3Mc+CiAq4zUt9qTXI9uEBBKrubYHE36voQTSkHvu/Rox6YOvfUr+U7P6k8frFPeCgGpfMDTLhiqe6w== +"@lerna/pulse-till-done@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz#c8e9ce5bafaf10d930a67d7ed0ccb5d958fe0110" + integrity sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA== dependencies: - libnpm "^2.0.1" + npmlog "^4.1.2" -"@lerna/resolve-symlink@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.6.0.tgz#985344796b704ff32afa923901e795e80741b86e" - integrity sha512-TVOAEqHJSQVhNDMFCwEUZPaOETqHDQV1TQWQfC8ZlOqyaUQ7veZUbg0yfG7RPNzlSpvF0ZaGFeR0YhYDAW03GA== +"@lerna/resolve-symlink@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.13.0.tgz#3e6809ef53b63fe914814bfa071cd68012e22fbb" + integrity sha512-Lc0USSFxwDxUs5JvIisS8JegjA6SHSAWJCMvi2osZx6wVRkEDlWG2B1JAfXUzCMNfHoZX0/XX9iYZ+4JIpjAtg== dependencies: fs-extra "^7.0.0" - libnpm "^2.0.1" + npmlog "^4.1.2" read-cmd-shim "^1.0.1" -"@lerna/rimraf-dir@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.10.0.tgz#2d9435054ab7bbc5519db0a2654c5d8cacd27f98" - integrity sha512-RSKSfxPURc58ERCD/PuzorR86lWEvIWNclXYGvIYM76yNGrWiDF44pGHQvB4J+Lxa5M+52ZtZC/eOC7A7YCH4g== +"@lerna/rimraf-dir@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.13.0.tgz#bb1006104b4aabcb6985624273254648f872b278" + integrity sha512-kte+pMemulre8cmPqljxIYjCmdLByz8DgHBHXB49kz2EiPf8JJ+hJFt0PzEubEyJZ2YE2EVAx5Tv5+NfGNUQyQ== dependencies: - "@lerna/child-process" "3.3.0" - libnpm "^2.0.1" + "@lerna/child-process" "3.13.0" + npmlog "^4.1.2" path-exists "^3.0.0" rimraf "^2.6.2" -"@lerna/run-lifecycle@3.10.5": - version "3.10.5" - resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.10.5.tgz#ea4422bb70c0f8d4382ecb2a626c8ba0ca88550b" - integrity sha512-YPmXviaxVlhcKM6IkDTIpTq24mxOuMCilo+MTr1RLoafgB9ZTmP2AHRiFt/sy14wOsq2Zqr0wJyj8KFlDYLTkA== +"@lerna/run-lifecycle@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.13.0.tgz#d8835ee83425edee40f687a55f81b502354d3261" + integrity sha512-oyiaL1biZdjpmjh6X/5C4w07wNFyiwXSSHH5GQB4Ay4BPwgq9oNhCcxRoi0UVZlZ1YwzSW8sTwLgj8emkIo3Yg== dependencies: - "@lerna/npm-conf" "3.7.0" + "@lerna/npm-conf" "3.13.0" figgy-pudding "^3.5.1" - libnpm "^2.0.1" + npm-lifecycle "^2.1.0" + npmlog "^4.1.2" -"@lerna/run-parallel-batches@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.0.0.tgz#468704934084c74991d3124d80607857d4dfa840" - integrity sha512-Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw== +"@lerna/run-parallel-batches@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.13.0.tgz#0276bb4e7cd0995297db82d134ca2bd08d63e311" + integrity sha512-bICFBR+cYVF1FFW+Tlm0EhWDioTUTM6dOiVziDEGE1UZha1dFkMYqzqdSf4bQzfLS31UW/KBd/2z8jy2OIjEjg== dependencies: p-map "^1.2.0" p-map-series "^1.0.0" -"@lerna/run@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.10.6.tgz#4c159a719b0ec010409dfe8f9535c9a3c3f3e06a" - integrity sha512-KS2lWbu/8WUUscQPi9U8sPO6yYpzf/0GmODjpruR1nRi1u/tuncdjTiG+hjGAeFC1BD7YktT9Za6imIpE8RXmA== +"@lerna/run@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.13.1.tgz#87e174c1d271894ddd29adc315c068fb7b1b0117" + integrity sha512-nv1oj7bsqppWm1M4ifN+/IIbVu9F4RixrbQD2okqDGYne4RQPAXyb5cEZuAzY/wyGTWWiVaZ1zpj5ogPWvH0bw== dependencies: - "@lerna/batch-packages" "3.10.6" - "@lerna/command" "3.10.6" - "@lerna/filter-options" "3.10.6" - "@lerna/npm-run-script" "3.10.0" - "@lerna/output" "3.6.0" - "@lerna/run-parallel-batches" "3.0.0" - "@lerna/timer" "3.5.0" - "@lerna/validation-error" "3.6.0" + "@lerna/batch-packages" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/filter-options" "3.13.0" + "@lerna/npm-run-script" "3.13.0" + "@lerna/output" "3.13.0" + "@lerna/run-parallel-batches" "3.13.0" + "@lerna/timer" "3.13.0" + "@lerna/validation-error" "3.13.0" p-map "^1.2.0" -"@lerna/symlink-binary@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.10.0.tgz#5acdde86dfd50c9270d7d2a93bade203cff41b3d" - integrity sha512-6mQsG+iVjBo8cD8s24O+YgFrwDyUGfUQbK4ryalAXFHI817Zd4xlI3tjg3W99whCt6rt6D0s1fpf8eslMN6dSw== +"@lerna/symlink-binary@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.13.0.tgz#36a9415d468afcb8105750296902f6f000a9680d" + integrity sha512-obc4Y6jxywkdaCe+DB0uTxYqP0IQ8mFWvN+k/YMbwH4G2h7M7lCBWgPy8e7xw/50+1II9tT2sxgx+jMus1sTJg== dependencies: - "@lerna/create-symlink" "3.6.0" - "@lerna/package" "3.7.2" + "@lerna/create-symlink" "3.13.0" + "@lerna/package" "3.13.0" fs-extra "^7.0.0" p-map "^1.2.0" -"@lerna/symlink-dependencies@3.10.0": - version "3.10.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.10.0.tgz#a20226e8e97af6a6bc4b416bfc28c0c5e3ba9ddd" - integrity sha512-vGpg5ydwGgQCuWNX5y7CRL38mGpuLhf1GRq9wMm7IGwnctEsdSNqvvE+LDgqtwEZASu5+vffYUkL0VlFXl8uWA== +"@lerna/symlink-dependencies@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.13.0.tgz#76c23ecabda7824db98a0561364f122b457509cf" + integrity sha512-7CyN5WYEPkbPLbqHBIQg/YiimBzb5cIGQB0E9IkLs3+racq2vmUNQZn38LOaazQacAA83seB+zWSxlI6H+eXSg== dependencies: - "@lerna/create-symlink" "3.6.0" - "@lerna/resolve-symlink" "3.6.0" - "@lerna/symlink-binary" "3.10.0" + "@lerna/create-symlink" "3.13.0" + "@lerna/resolve-symlink" "3.13.0" + "@lerna/symlink-binary" "3.13.0" fs-extra "^7.0.0" p-finally "^1.0.0" p-map "^1.2.0" p-map-series "^1.0.0" -"@lerna/timer@3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.5.0.tgz#8dee6acf002c55de64678c66ef37ca52143f1b9b" - integrity sha512-TAb99hqQN6E3JBGtG9iyZNPq1/DbmqgBOeNrKtdJsGvIeX/NGLgUDWMrj2h04V4O+jpBFmSf6HIld6triKmxCA== +"@lerna/timer@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.13.0.tgz#bcd0904551db16e08364d6c18e5e2160fc870781" + integrity sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw== -"@lerna/validation-error@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.6.0.tgz#550cf66bb2ef88edc02e36017b575a7a9100d5d8" - integrity sha512-MWltncGO5VgMS0QedTlZCjFUMF/evRjDMMHrtVorkIB2Cp5xy0rkKa8iDBG43qpUWeG1giwi58yUlETBcWfILw== +"@lerna/validation-error@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.13.0.tgz#c86b8f07c5ab9539f775bd8a54976e926f3759c3" + integrity sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA== dependencies: - libnpm "^2.0.1" + npmlog "^4.1.2" -"@lerna/version@3.10.6": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.10.6.tgz#c31c2bb1aabbdc851407534155567b5cdf48e0fb" - integrity sha512-77peW2ROlHHl1e/tHBUmhpb8tsO6CIdlx34XapZhUuIVykrkOuqVFFxqMecrGG8SJe0e3l1G+Fah7bJTQcG0kw== +"@lerna/version@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.13.1.tgz#5e919d13abb13a663dcc7922bb40931f12fb137b" + integrity sha512-WpfKc5jZBBOJ6bFS4atPJEbHSiywQ/Gcd+vrwaEGyQHWHQZnPTvhqLuq3q9fIb9sbuhH5pSY6eehhuBrKqTnjg== dependencies: - "@lerna/batch-packages" "3.10.6" - "@lerna/check-working-tree" "3.10.0" - "@lerna/child-process" "3.3.0" - "@lerna/collect-updates" "3.10.1" - "@lerna/command" "3.10.6" - "@lerna/conventional-commits" "3.10.0" - "@lerna/output" "3.6.0" - "@lerna/prompt" "3.6.0" - "@lerna/run-lifecycle" "3.10.5" - "@lerna/validation-error" "3.6.0" + "@lerna/batch-packages" "3.13.0" + "@lerna/check-working-tree" "3.13.0" + "@lerna/child-process" "3.13.0" + "@lerna/collect-updates" "3.13.0" + "@lerna/command" "3.13.1" + "@lerna/conventional-commits" "3.13.0" + "@lerna/github-client" "3.13.1" + "@lerna/output" "3.13.0" + "@lerna/prompt" "3.13.0" + "@lerna/run-lifecycle" "3.13.0" + "@lerna/validation-error" "3.13.0" chalk "^2.3.1" dedent "^0.7.0" - libnpm "^2.0.1" minimatch "^3.0.4" + npmlog "^4.1.2" p-map "^1.2.0" p-pipe "^1.2.0" p-reduce "^1.0.0" @@ -2078,12 +2106,12 @@ slash "^1.0.0" temp-write "^3.4.0" -"@lerna/write-log-file@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.6.0.tgz#b8d5a7efc84fa93cbd67d724d11120343b2a849a" - integrity sha512-OkLK99V6sYXsJsYg+O9wtiFS3z6eUPaiz2e6cXJt80mfIIdI1t2dnmyua0Ib5cZWExQvx2z6Y32Wlf0MnsoNsA== +"@lerna/write-log-file@3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.13.0.tgz#b78d9e4cfc1349a8be64d91324c4c8199e822a26" + integrity sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A== dependencies: - libnpm "^2.0.1" + npmlog "^4.1.2" write-file-atomic "^2.3.0" "@mrmlnc/readdir-enhanced@^2.2.1": @@ -2099,6 +2127,46 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@octokit/endpoint@^3.1.1": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-3.1.3.tgz#f6e9c2521b83b74367600e474b24efec2b0471c4" + integrity sha512-vAWzeoj9Lzpl3V3YkWKhGzmDUoMfKpyxJhpq74/ohMvmLXDoEuAGnApy/7TRi3OmnjyX2Lr+e9UGGAD0919ohA== + dependencies: + deepmerge "3.2.0" + is-plain-object "^2.0.4" + universal-user-agent "^2.0.1" + url-template "^2.0.8" + +"@octokit/plugin-enterprise-rest@^2.1.1": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.1.2.tgz#259bd5ac00825a8a482ff6584ae9aed60acd0b41" + integrity sha512-EWKrEqhSgzqWXI9DuEsEI691PNJppm/a4zW62//te27I8pYI5zSNVR3wtNUk0NWPlvs7054YzGZochwbUbhI8A== + +"@octokit/request@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-2.3.0.tgz#da2672308bcf0b9376ef66f51bddbe5eb87cc00a" + integrity sha512-5YRqYNZOAaL7+nt7w3Scp6Sz4P2g7wKFP9npx1xdExMomk8/M/ICXVLYVam2wzxeY0cIc6wcKpjC5KI4jiNbGw== + dependencies: + "@octokit/endpoint" "^3.1.1" + is-plain-object "^2.0.4" + node-fetch "^2.3.0" + universal-user-agent "^2.0.1" + +"@octokit/rest@^16.16.0": + version "16.16.0" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.16.0.tgz#b686407d34c756c3463f8a7b1e42aa035a504306" + integrity sha512-Q6L5OwQJrdJ188gLVmUHLKNXBoeCU0DynKPYW8iZQQoGNGws2hkP/CePVNlzzDgmjuv7o8dCrJgecvDcIHccTA== + dependencies: + "@octokit/request" "2.3.0" + before-after-hook "^1.2.0" + btoa-lite "^1.0.0" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + lodash.uniq "^4.5.0" + octokit-pagination-methods "^1.1.0" + universal-user-agent "^2.0.0" + url-template "^2.0.8" + "@reactivex/rxjs@6.4.0": version "6.4.0" resolved "https://registry.yarnpkg.com/@reactivex/rxjs/-/rxjs-6.4.0.tgz#92a6813163beef132294a40e750f6054b7a74f0e" @@ -3604,12 +3672,12 @@ append-transform@^1.0.0: dependencies: default-require-extensions "^2.0.0" -aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2: +aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -"aproba@^1.1.2 || 2", aproba@^2.0.0: +aproba@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== @@ -5220,6 +5288,11 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +before-after-hook@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.3.2.tgz#7bfbf844ad670aa7a96b5a4e4e15bd74b08ed66b" + integrity sha512-zyPgY5dgbf99c0uGUjhY4w+mxqEGxPKg9RQDl34VvrVh2bM31lFN+mwR1ZHepq/KA3VCPk1gwJZL6IIJqjLy2w== + bfj@6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz#05a3b7784fbd72cfa3c22e56002ef99336516c48" @@ -5244,17 +5317,6 @@ bignumber.js@^2.3.0: version "2.0.7" resolved "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" -bin-links@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757" - integrity sha512-8eEHVgYP03nILphilltWjeIjMbKyJo3wvp9K816pHbhP301ismzw15mxAAEVQ/USUwcP++1uNrbERbp8lOA6Fg== - dependencies: - bluebird "^3.5.0" - cmd-shim "^2.0.2" - gentle-fs "^2.0.0" - graceful-fs "^4.1.11" - write-file-atomic "^2.3.0" - binary-extensions@^1.0.0: version "1.12.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" @@ -5645,6 +5707,11 @@ bser@^2.0.0: dependencies: node-int64 "^0.4.0" +btoa-lite@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337" + integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc= + 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" @@ -6712,20 +6779,20 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -conventional-changelog-angular@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.2.tgz#39d945635e03b6d0c9d4078b1df74e06163dc66a" - integrity sha512-yx7m7lVrXmt4nKWQgWZqxSALEiAKZhOAcbxdUaU9575mB0CzXVbgrgpfSnSP7OqWDUTYGD0YVJ0MSRdyOPgAwA== +conventional-changelog-angular@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0" + integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA== dependencies: compare-func "^1.3.1" q "^1.5.1" -conventional-changelog-core@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.5.tgz#c2edf928539308b54fe1b90a2fc731abc021852c" - integrity sha512-iwqAotS4zk0wA4S84YY1JCUG7X3LxaRjJxuUo6GI4dZuIy243j5nOg/Ora35ExT4DOiw5dQbMMQvw2SUjh6moQ== +conventional-changelog-core@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.1.6.tgz#ac1731a461c50d150d29c1ad4f33143293bcd32f" + integrity sha512-5teTAZOtJ4HLR6384h50nPAaKdDr+IaU0rnD2Gg2C3MS7hKsEPH8pZxrDNqam9eOSPQg9tET6uZY79zzgSz+ig== dependencies: - conventional-changelog-writer "^4.0.2" + conventional-changelog-writer "^4.0.3" conventional-commits-parser "^3.0.1" dateformat "^3.0.0" get-pkg-repo "^1.0.0" @@ -6744,15 +6811,15 @@ conventional-changelog-preset-loader@^2.0.2: resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0" integrity sha512-pBY+qnUoJPXAXXqVGwQaVmcye05xi6z231QM98wHWamGAmu/ghkBprQAwmF5bdmyobdVxiLhPY3PrCfSeUNzRQ== -conventional-changelog-writer@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.2.tgz#eb493ed84269e7a663da36e49af51c54639c9a67" - integrity sha512-d8/FQY/fix2xXEBUhOo8u3DCbyEw3UOQgYHxLsPDw+wHUDma/GQGAGsGtoH876WyNs32fViHmTOUrgRKVLvBug== +conventional-changelog-writer@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.3.tgz#916a2b302d0bb5ef18efd236a034c13fb273cde1" + integrity sha512-bIlpSiQtQZ1+nDVHEEh798Erj2jhN/wEjyw9sfxY9es6h7pREE5BNJjfv0hXGH/FTrAsEpHUq4xzK99eePpwuA== dependencies: compare-func "^1.3.1" conventional-commits-filter "^2.0.1" dateformat "^3.0.0" - handlebars "^4.0.2" + handlebars "^4.1.0" json-stringify-safe "^5.0.1" lodash "^4.2.1" meow "^4.0.0" @@ -6892,7 +6959,7 @@ cosmiconfig@^4.0.0: parse-json "^4.0.0" require-from-string "^2.0.1" -cosmiconfig@^5.0.0, cosmiconfig@^5.0.2, cosmiconfig@^5.0.5, cosmiconfig@^5.0.6, cosmiconfig@^5.0.7: +cosmiconfig@^5.0.0, cosmiconfig@^5.0.5, cosmiconfig@^5.0.6, cosmiconfig@^5.0.7: version "5.0.7" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04" integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA== @@ -6902,6 +6969,17 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.0.2, cosmiconfig@^5.0.5, cosmiconfig@^5.0.6, js-yaml "^3.9.0" parse-json "^4.0.0" +cosmiconfig@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf" + integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.9.0" + lodash.get "^4.4.2" + parse-json "^4.0.0" + coveralls@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.2.tgz#f5a0bcd90ca4e64e088b710fa8dda640aea4884f" @@ -7564,6 +7642,11 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= +deepmerge@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e" + integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow== + default-gateway@^2.6.0: version "2.7.2" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f" @@ -9778,11 +9861,6 @@ find-cache-dir@^2.0.0: make-dir "^1.0.0" pkg-dir "^3.0.0" -find-npm-prefix@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf" - integrity sha512-KEftzJ+H90x6pcKtdXZEPsQse8/y/UnvzRKrOSQFprnrGaFuJ62fVkP34Iu2IYuMvyauCyoLTNkJZgrrGA2wkA== - find-up@2.1.0, find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -10051,15 +10129,6 @@ fs-readdir-recursive@^1.1.0: resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== -fs-vacuum@^1.2.10: - version "1.2.10" - resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36" - integrity sha1-t2Kb7AekAxolSP35n17PHMizHjY= - dependencies: - graceful-fs "^4.1.2" - path-is-inside "^1.0.1" - rimraf "^2.5.2" - fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" @@ -10199,20 +10268,6 @@ genfun@^5.0.0: resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== -gentle-fs@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.0.1.tgz#585cfd612bfc5cd52471fdb42537f016a5ce3687" - integrity sha512-cEng5+3fuARewXktTEGbwsktcldA+YsnUEaXZwcK/3pjSE1X9ObnTs+/8rYf8s+RnIcQm2D5x3rwpN7Zom8Bew== - dependencies: - aproba "^1.1.2" - fs-vacuum "^1.2.10" - graceful-fs "^4.1.11" - iferr "^0.1.5" - mkdirp "^0.5.1" - path-is-inside "^1.0.2" - read-cmd-shim "^1.0.1" - slide "^1.1.6" - get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -10308,6 +10363,21 @@ git-semver-tags@^2.0.2: meow "^4.0.0" semver "^5.5.0" +git-up@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0" + integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw== + dependencies: + is-ssh "^1.3.0" + parse-url "^5.0.0" + +git-url-parse@^11.1.2: + version "11.1.2" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67" + integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ== + dependencies: + git-up "^4.0.0" + gitconfiglocal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b" @@ -10627,7 +10697,7 @@ handle-thing@^1.2.5: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ= -handlebars@4.0.12, handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2, handlebars@^4.0.3: +handlebars@4.0.12, handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.3: version "4.0.12" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5" integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA== @@ -10638,6 +10708,17 @@ handlebars@4.0.12, handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2, han optionalDependencies: uglify-js "^3.1.4" +handlebars@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a" + integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w== + dependencies: + async "^2.5.0" + optimist "^0.6.1" + source-map "^0.6.1" + optionalDependencies: + uglify-js "^3.1.4" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -11409,7 +11490,7 @@ inherits@2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= -ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -11993,6 +12074,13 @@ is-root@2.0.0: resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.0.0.tgz#838d1e82318144e5a6f77819d90207645acc7019" integrity sha512-F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg== +is-ssh@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" + integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg== + dependencies: + protocols "^1.1.0" + 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" @@ -13299,28 +13387,28 @@ left-pad@^1.3.0: resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== -lerna@3.10.7: - version "3.10.7" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.10.7.tgz#9d308b1fee1697f89fe90e6bc37e51c03b531557" - integrity sha512-ha/dehl/L3Nw0pbdir5z6Hrv2oYBg5ym2fTcuk8HCLe7Zdb/ylIHdrgW8CU9eTVZkwr4et8RdVtxFA/+xa65/Q== +lerna@3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.13.1.tgz#feaff562176f304bd82329ca29ce46ab6c033463" + integrity sha512-7kSz8LLozVsoUNTJzJzy+b8TnV9YdviR2Ee2PwGZSlVw3T1Rn7kOAPZjEi+3IWnOPC96zMPHVmjCmzQ4uubalw== dependencies: - "@lerna/add" "3.10.6" - "@lerna/bootstrap" "3.10.6" - "@lerna/changed" "3.10.6" - "@lerna/clean" "3.10.6" - "@lerna/cli" "3.10.7" - "@lerna/create" "3.10.6" - "@lerna/diff" "3.10.6" - "@lerna/exec" "3.10.6" - "@lerna/import" "3.10.6" - "@lerna/init" "3.10.6" - "@lerna/link" "3.10.6" - "@lerna/list" "3.10.6" - "@lerna/publish" "3.10.7" - "@lerna/run" "3.10.6" - "@lerna/version" "3.10.6" + "@lerna/add" "3.13.1" + "@lerna/bootstrap" "3.13.1" + "@lerna/changed" "3.13.1" + "@lerna/clean" "3.13.1" + "@lerna/cli" "3.13.0" + "@lerna/create" "3.13.1" + "@lerna/diff" "3.13.1" + "@lerna/exec" "3.13.1" + "@lerna/import" "3.13.1" + "@lerna/init" "3.13.1" + "@lerna/link" "3.13.1" + "@lerna/list" "3.13.1" + "@lerna/publish" "3.13.1" + "@lerna/run" "3.13.1" + "@lerna/version" "3.13.1" import-local "^1.0.0" - libnpm "^2.0.1" + npmlog "^4.1.2" level-codec@^9.0.0: version "9.0.0" @@ -13453,32 +13541,6 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -libnpm@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/libnpm/-/libnpm-2.0.1.tgz#a48fcdee3c25e13c77eb7c60a0efe561d7fb0d8f" - integrity sha512-qTKoxyJvpBxHZQB6k0AhSLajyXq9ZE/lUsZzuHAplr2Bpv9G+k4YuYlExYdUCeVRRGqcJt8hvkPh4tBwKoV98w== - dependencies: - bin-links "^1.1.2" - bluebird "^3.5.3" - find-npm-prefix "^1.0.2" - libnpmaccess "^3.0.1" - libnpmconfig "^1.2.1" - libnpmhook "^5.0.2" - libnpmorg "^1.0.0" - libnpmpublish "^1.1.0" - libnpmsearch "^2.0.0" - libnpmteam "^1.0.1" - lock-verify "^2.0.2" - npm-lifecycle "^2.1.0" - npm-logical-tree "^1.2.1" - npm-package-arg "^6.1.0" - npm-profile "^4.0.1" - npm-registry-fetch "^3.8.0" - npmlog "^4.1.2" - pacote "^9.2.3" - read-package-json "^2.0.13" - stringify-package "^1.0.0" - libnpmaccess@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8" @@ -13489,36 +13551,7 @@ libnpmaccess@^3.0.1: npm-package-arg "^6.1.0" npm-registry-fetch "^3.8.0" -libnpmconfig@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0" - integrity sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA== - dependencies: - figgy-pudding "^3.5.1" - find-up "^3.0.0" - ini "^1.3.5" - -libnpmhook@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-5.0.2.tgz#d12817b0fb893f36f1d5be20017f2aea25825d94" - integrity sha512-vLenmdFWhRfnnZiNFPNMog6CK7Ujofy2TWiM2CrpZUjBRIhHkJeDaAbJdYCT6W4lcHtyrJR8yXW8KFyq6UAp1g== - dependencies: - aproba "^2.0.0" - figgy-pudding "^3.4.1" - get-stream "^4.0.0" - npm-registry-fetch "^3.8.0" - -libnpmorg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232" - integrity sha512-o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw== - dependencies: - aproba "^2.0.0" - figgy-pudding "^3.4.1" - get-stream "^4.0.0" - npm-registry-fetch "^3.8.0" - -libnpmpublish@^1.1.0: +libnpmpublish@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.1.tgz#ff0c6bb0b4ad2bda2ad1f5fba6760a4af37125f0" integrity sha512-nefbvJd/wY38zdt+b9SHL6171vqBrMtZ56Gsgfd0duEKb/pB8rDT4/ObUQLrHz1tOfht1flt2zM+UGaemzAG5g== @@ -13533,25 +13566,6 @@ libnpmpublish@^1.1.0: semver "^5.5.1" ssri "^6.0.1" -libnpmsearch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.0.tgz#de05af47ada81554a5f64276a69599070d4a5685" - integrity sha512-vd+JWbTGzOSfiOc+72MU6y7WqmBXn49egCCrIXp27iE/88bX8EpG64ST1blWQI1bSMUr9l1AKPMVsqa2tS5KWA== - dependencies: - figgy-pudding "^3.5.1" - get-stream "^4.0.0" - npm-registry-fetch "^3.8.0" - -libnpmteam@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213" - integrity sha512-gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg== - dependencies: - aproba "^2.0.0" - figgy-pudding "^3.4.1" - get-stream "^4.0.0" - npm-registry-fetch "^3.8.0" - libp2p-crypto-secp256k1@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/libp2p-crypto-secp256k1/-/libp2p-crypto-secp256k1-0.2.2.tgz#0dd521f18abc4e36a152e24e9b36307b0ae9cf05" @@ -13681,14 +13695,6 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" -lock-verify@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.0.2.tgz#148e4f85974915c9e3c34d694b7de9ecb18ee7a8" - integrity sha512-QNVwK0EGZBS4R3YQ7F1Ox8p41Po9VGl2QG/2GsuvTbkJZYSsPeWHKMbbH6iZMCHWSMww5nrJroZYnGzI4cePuw== - dependencies: - npm-package-arg "^5.1.2 || 6" - semver "^5.4.1" - lockfile@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609" @@ -13815,6 +13821,11 @@ lodash.mergewith@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ== +lodash.set@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" + integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= + lodash.some@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" @@ -13990,6 +14001,11 @@ ltgt@~2.1.1: resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.1.3.tgz#10851a06d9964b971178441c23c9e52698eece34" integrity sha1-EIUaBtmWS5cReEQcI8nlJpjuzjQ= +macos-release@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.0.0.tgz#7dddf4caf79001a851eb4fba7fb6034f251276ab" + integrity sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A== + make-dir@^1.0.0, make-dir@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -14847,7 +14863,7 @@ node-fetch@^1.0.1, node-fetch@~1.7.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.1.2, node-fetch@^2.2.0: +node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5" integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA== @@ -15081,7 +15097,7 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -normalize-url@^3.0.0: +normalize-url@^3.0.0, normalize-url@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== @@ -15105,12 +15121,7 @@ npm-lifecycle@^2.1.0: umask "^1.1.0" which "^1.3.1" -npm-logical-tree@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88" - integrity sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg== - -"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^5.1.2 || 6", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: +"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1" integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA== @@ -15136,6 +15147,14 @@ npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" +npm-packlist@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc" + integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-pick-manifest@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40" @@ -15145,16 +15164,7 @@ npm-pick-manifest@^2.2.3: npm-package-arg "^6.0.0" semver "^5.4.1" -npm-profile@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa" - integrity sha512-NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA== - dependencies: - aproba "^1.1.2 || 2" - figgy-pudding "^3.4.1" - npm-registry-fetch "^3.8.0" - -npm-registry-fetch@^3.8.0: +npm-registry-fetch@^3.8.0, npm-registry-fetch@^3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz#44d841780e2833f06accb34488f8c7450d1a6856" integrity sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw== @@ -15400,6 +15410,11 @@ obuf@^1.0.0, obuf@^1.1.1: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +octokit-pagination-methods@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" + integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -15541,6 +15556,14 @@ os-locale@^3.0.0: lcid "^2.0.0" mem "^4.0.0" +os-name@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.0.0.tgz#e1434dbfddb8e74b44c98b56797d951b7648a5d9" + integrity sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g== + dependencies: + macos-release "^2.0.0" + windows-release "^3.1.0" + os-tmpdir@^1.0.0, 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" @@ -15677,10 +15700,10 @@ package-json@^4.0.0: registry-url "^3.0.3" semver "^5.1.0" -pacote@^9.2.3: - version "9.4.1" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.1.tgz#f0af2a52d241bce523d39280ac810c671db62279" - integrity sha512-YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw== +pacote@^9.5.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda" + integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg== dependencies: bluebird "^3.5.3" cacache "^11.3.2" @@ -15790,6 +15813,24 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= +parse-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff" + integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA== + dependencies: + is-ssh "^1.3.0" + protocols "^1.4.0" + +parse-url@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f" + integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg== + dependencies: + is-ssh "^1.3.0" + normalize-url "^3.3.0" + parse-path "^4.0.0" + protocols "^1.4.0" + parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -17175,6 +17216,11 @@ protocol-buffers-schema@^3.3.1: resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz#00434f608b4e8df54c59e070efeefc37fb4bb859" integrity sha512-Xdayp8sB/mU+sUV4G7ws8xtYMGdQnxbeIfLjyO9TZZRJdztBGhlmbI5x1qcY4TG5hBkIKGnc28i7nXxaugu88w== +protocols@^1.1.0, protocols@^1.4.0: + version "1.4.7" + resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32" + integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg== + protoduck@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f" @@ -18797,7 +18843,7 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2. dependencies: glob "^7.0.5" -rimraf@2.6.3, rimraf@^2.5.2: +rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== @@ -20025,11 +20071,6 @@ stringify-object@^3.2.2: is-obj "^1.0.1" is-regexp "^1.0.0" -stringify-package@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b" - integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g== - strip-ansi@3.0.1, strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -21112,6 +21153,13 @@ universal-deep-strict-equal@^1.0.0: indexof "0.0.1" object-keys "^1.0.0" +universal-user-agent@^2.0.0, universal-user-agent@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.3.tgz#9f6f09f9cc33de867bb720d84c08069b14937c6c" + integrity sha512-eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g== + dependencies: + os-name "^3.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -21247,6 +21295,11 @@ url-set-query@^1.0.0: resolved "https://registry.yarnpkg.com/url-set-query/-/url-set-query-1.0.0.tgz#016e8cfd7c20ee05cafe7795e892bd0702faa339" integrity sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk= +url-template@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" + integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= + url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" @@ -22885,6 +22938,13 @@ window-size@^0.2.0: resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU= +windows-release@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.1.0.tgz#8d4a7e266cbf5a233f6c717dac19ce00af36e12e" + integrity sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA== + dependencies: + execa "^0.10.0" + winston-transport@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.2.0.tgz#a20be89edf2ea2ca39ba25f3e50344d73e6520e5"