From 3b649fa45523ef312e3cdb0c654ef8f84867e496 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Wed, 18 Sep 2019 14:30:41 -0500 Subject: [PATCH] build: phase 1 of introducing embark-collective --- babel.config.js | 7 + dapps/templates/boilerplate/package.json | 4 +- dapps/templates/demo/package.json | 6 +- dapps/templates/simple/package.json | 4 +- dapps/tests/app/package.json | 2 +- package.json | 47 +-- packages/.gitignore | 2 + packages/cockpit/cockpit-ui/package.json | 15 +- .../cockpit/embark-api-client/package.json | 29 +- packages/core/code-runner/package.json | 21 +- packages/core/console/package.json | 19 +- packages/core/core/package.json | 31 +- packages/core/i18n/package.json | 19 +- packages/core/i18n/src/index.ts | 2 +- packages/core/logger/package.json | 29 +- packages/core/reset/package.json | 7 + packages/core/typings/.gitignore | 1 + packages/core/typings/package.json | 9 +- packages/core/utils/package.json | 23 +- packages/embark-testing/babel.config.js | 1 - packages/embark-testing/package.json | 42 +-- packages/embark-testing/test/testing_test.js | 4 +- packages/embark/.babelrc.js | 45 ++- packages/embark/package.json | 27 +- packages/embarkjs/embarkjs-ens/.babelrc.js | 23 +- packages/embarkjs/embarkjs-ens/package.json | 39 +- .../embarkjs/embarkjs-ens/src/embarkjs.js | 1 - .../embarkjs/embarkjs-ens/src/node/index.js | 2 +- packages/embarkjs/embarkjs-ipfs/.babelrc.js | 23 +- packages/embarkjs/embarkjs-ipfs/package.json | 40 +- .../embarkjs/embarkjs-ipfs/src/embarkjs.js | 1 - .../embarkjs/embarkjs-ipfs/src/node/index.js | 2 +- packages/embarkjs/embarkjs-swarm/.babelrc.js | 23 +- packages/embarkjs/embarkjs-swarm/package.json | 40 +- .../embarkjs/embarkjs-swarm/src/embarkjs.js | 1 - .../embarkjs/embarkjs-swarm/src/node/index.js | 2 +- packages/embarkjs/embarkjs-web3/.babelrc.js | 23 +- packages/embarkjs/embarkjs-web3/package.json | 40 +- .../embarkjs/embarkjs-web3/src/embarkjs.js | 1 - .../embarkjs/embarkjs-web3/src/node/index.js | 2 +- .../embarkjs/embarkjs-whisper/.babelrc.js | 23 +- .../embarkjs/embarkjs-whisper/package.json | 40 +- .../embarkjs/embarkjs-whisper/src/embarkjs.js | 1 - .../embarkjs-whisper/src/node/index.js | 2 +- packages/embarkjs/embarkjs/.babelrc.js | 25 +- packages/embarkjs/embarkjs/package.json | 42 +-- packages/embarkjs/embarkjs/src/embark.js | 1 - .../embarkjs/src/{node => lib}/async.js | 0 .../embarkjs/src/{ => lib}/blockchain.js | 0 .../embarkjs/src/{ => lib/browser}/async.js | 0 .../embarkjs/embarkjs/src/{ => lib}/index.js | 0 .../embarkjs/src/{ => lib}/messages.js | 0 .../embarkjs/embarkjs/src/{ => lib}/names.js | 0 .../embarkjs/embarkjs/src/lib/node/index.js | 1 + .../embarkjs/src/{ => lib}/storage.js | 0 .../embarkjs/embarkjs/src/{ => lib}/utils.js | 0 packages/embarkjs/embarkjs/src/node/index.js | 1 - .../embarkjs/{ => src}/test/blockchain.js | 2 +- .../{ => src}/test/helpers/blockchain.js | 0 .../plugins/accounts-manager/package.json | 19 +- packages/plugins/coverage/package.json | 18 +- packages/plugins/debugger/package.json | 23 +- packages/plugins/deploy-tracker/package.json | 24 +- packages/plugins/ens/package.json | 29 +- packages/plugins/graph/package.json | 29 +- packages/plugins/ipfs/package.json | 29 +- packages/plugins/mocha-tests/package.json | 35 +- packages/plugins/plugin-cmd/package.json | 28 +- packages/plugins/profiler/package.json | 29 +- packages/plugins/scaffolding/.babelrc.js | 58 +++ packages/plugins/scaffolding/package.json | 22 +- packages/plugins/snark/babel.config.js | 42 --- packages/plugins/snark/package.json | 35 +- packages/plugins/solc/package.json | 28 +- packages/plugins/solidity-tests/package.json | 43 +-- packages/plugins/solidity/package.json | 31 +- packages/plugins/specialconfigs/package.json | 29 +- packages/plugins/swarm/package.json | 29 +- .../plugins/transaction-logger/package.json | 30 +- .../plugins/transaction-tracker/package.json | 29 +- packages/plugins/vyper/package.json | 29 +- packages/plugins/web3/.babelrc.js | 58 +++ packages/plugins/web3/package.json | 33 +- packages/plugins/whisper/package.json | 27 +- packages/stack/api/package.json | 19 +- packages/stack/authenticator/package.json | 29 +- packages/stack/communication/babel.config.js | 1 - packages/stack/communication/package.json | 47 ++- packages/stack/compiler/package.json | 19 +- packages/stack/contracts-manager/package.json | 19 +- packages/stack/deployment/babel.config.js | 1 - packages/stack/deployment/package.json | 47 ++- packages/stack/library-manager/package.json | 31 +- packages/stack/namesystem/package.json | 29 +- packages/stack/pipeline/package.json | 31 +- .../process-logs-api-manager/package.json | 29 +- packages/stack/proxy/package.json | 19 +- packages/stack/storage/package.json | 29 +- packages/stack/test-runner/package.json | 35 +- packages/stack/watcher/package.json | 29 +- packages/stack/webserver/.babelrc.js | 58 +++ packages/stack/webserver/package.json | 32 +- scripts/monorun.js | 50 +++ scripts/release.js | 1 - utils/.yarnrc | 1 + utils/collective/.npmrc | 4 + utils/collective/README.md | 6 + utils/collective/bin/collective | 5 + utils/collective/index.js | 198 ++++++++++ utils/collective/package.json | 62 ++++ utils/solo/.npmrc | 4 + utils/solo/README.md | 6 + utils/solo/bin/solo | 5 + utils/solo/index.js | 29 ++ utils/solo/package.json | 23 ++ yarn.lock | 344 ++++++++++++++++-- 116 files changed, 1635 insertions(+), 1190 deletions(-) create mode 100644 packages/.gitignore create mode 100644 packages/core/typings/.gitignore delete mode 100644 packages/embark-testing/babel.config.js delete mode 100644 packages/embarkjs/embarkjs-ens/src/embarkjs.js delete mode 100644 packages/embarkjs/embarkjs-ipfs/src/embarkjs.js delete mode 100644 packages/embarkjs/embarkjs-swarm/src/embarkjs.js delete mode 100644 packages/embarkjs/embarkjs-web3/src/embarkjs.js delete mode 100644 packages/embarkjs/embarkjs-whisper/src/embarkjs.js delete mode 100644 packages/embarkjs/embarkjs/src/embark.js rename packages/embarkjs/embarkjs/src/{node => lib}/async.js (100%) rename packages/embarkjs/embarkjs/src/{ => lib}/blockchain.js (100%) rename packages/embarkjs/embarkjs/src/{ => lib/browser}/async.js (100%) rename packages/embarkjs/embarkjs/src/{ => lib}/index.js (100%) rename packages/embarkjs/embarkjs/src/{ => lib}/messages.js (100%) rename packages/embarkjs/embarkjs/src/{ => lib}/names.js (100%) create mode 100644 packages/embarkjs/embarkjs/src/lib/node/index.js rename packages/embarkjs/embarkjs/src/{ => lib}/storage.js (100%) rename packages/embarkjs/embarkjs/src/{ => lib}/utils.js (100%) delete mode 100644 packages/embarkjs/embarkjs/src/node/index.js rename packages/embarkjs/embarkjs/{ => src}/test/blockchain.js (98%) rename packages/embarkjs/embarkjs/{ => src}/test/helpers/blockchain.js (100%) create mode 100644 packages/plugins/scaffolding/.babelrc.js delete mode 100644 packages/plugins/snark/babel.config.js create mode 100644 packages/plugins/web3/.babelrc.js delete mode 100644 packages/stack/communication/babel.config.js delete mode 100644 packages/stack/deployment/babel.config.js create mode 100644 packages/stack/webserver/.babelrc.js create mode 100644 scripts/monorun.js create mode 100644 utils/.yarnrc create mode 100644 utils/collective/.npmrc create mode 100644 utils/collective/README.md create mode 100755 utils/collective/bin/collective create mode 100644 utils/collective/index.js create mode 100644 utils/collective/package.json create mode 100644 utils/solo/.npmrc create mode 100644 utils/solo/README.md create mode 100755 utils/solo/bin/solo create mode 100644 utils/solo/index.js create mode 100644 utils/solo/package.json diff --git a/babel.config.js b/babel.config.js index 31494a52e..ca127b72b 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,12 @@ /* global module require */ +/* + * dependencies of this config should be specified in + * `utils/collective/package.json` relative to this config file, with reliance + * on yarn-workspace hoisting for those packages to be resolvable from the + * monorepo root + */ + const cloneDeep = require('lodash.clonedeep'); module.exports = (api) => { diff --git a/dapps/templates/boilerplate/package.json b/dapps/templates/boilerplate/package.json index 4cc6b9368..37ca9bc27 100644 --- a/dapps/templates/boilerplate/package.json +++ b/dapps/templates/boilerplate/package.json @@ -19,8 +19,7 @@ "scripts": { "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "qa": "npm-run-all test package", + "qa": "npm run test", "reset": "npx embark-reset && npx rimraf embark-*.tgz package", "test": "npx embark test" }, @@ -35,7 +34,6 @@ "devDependencies": { "embark": "^4.1.1", "embark-reset": "^4.1.1", - "npm-run-all": "4.1.5", "rimraf": "3.0.0" } } diff --git a/dapps/templates/demo/package.json b/dapps/templates/demo/package.json index 99a14ddff..1bb28f10a 100644 --- a/dapps/templates/demo/package.json +++ b/dapps/templates/demo/package.json @@ -19,8 +19,7 @@ "scripts": { "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "qa": "npm-run-all test package", + "qa": "npm run test", "reset": "npx embark-reset && npx rimraf embark-*.tgz package", "test": "npx embark test" }, @@ -37,7 +36,8 @@ "classnames": "2.2.6", "embark": "^4.1.1", "embark-reset": "^4.1.1", - "npm-run-all": "4.1.5", + "jquery": "3.4.1", + "popper.js": "1.15.0", "react": "16.9.0", "react-dom": "16.9.0", "reactstrap": "8.0.1", diff --git a/dapps/templates/simple/package.json b/dapps/templates/simple/package.json index 0988297c6..e17b0d091 100644 --- a/dapps/templates/simple/package.json +++ b/dapps/templates/simple/package.json @@ -15,8 +15,7 @@ "scripts": { "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "qa": "npm-run-all test package", + "qa": "npm run test", "reset": "npx embark-reset && npx rimraf embark-*.tgz package", "test": "npx embark test" }, @@ -31,7 +30,6 @@ "devDependencies": { "embark": "^4.1.1", "embark-reset": "^4.1.1", - "npm-run-all": "4.1.5", "rimraf": "3.0.0" } } diff --git a/dapps/tests/app/package.json b/dapps/tests/app/package.json index b45e1c4f3..db02ea4e9 100644 --- a/dapps/tests/app/package.json +++ b/dapps/tests/app/package.json @@ -7,7 +7,7 @@ "embark-dapp-test-service": "^4.0.0", "embark-i18n": "^4.1.1", "embark-reset": "^4.1.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "haml": "0.4.3", "jquery": "3.4.0", "react": "16.9.0", diff --git a/package.json b/package.json index 675bf638c..10b8b1ab0 100644 --- a/package.json +++ b/package.json @@ -1,27 +1,15 @@ { "devDependencies": { - "@babel/core": "7.2.2", - "@babel/plugin-proposal-class-properties": "7.5.5", - "@babel/plugin-proposal-decorators": "7.3.0", - "@babel/plugin-proposal-optional-chaining": "7.6.0", - "@babel/plugin-syntax-dynamic-import": "7.2.0", - "@babel/plugin-transform-runtime": "7.2.0", - "@babel/preset-env": "7.5.5", - "@babel/preset-typescript": "7.6.0", - "babel-plugin-dynamic-import-node": "2.2.0", - "babel-plugin-macros": "2.4.5", "chalk": "2.4.2", "coveralls": "3.0.6", - "eslint-plugin-react": "7.14.3", + "find-up": "4.1.0", "form-data": "2.5.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "lerna": "3.16.4", - "lodash.clonedeep": "4.5.0", "minimist": "1.2.0", "npm-run-all": "4.1.5", "nyc": "13.1.0", - "rimraf": "3.0.0", - "semver": "5.6.0" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", @@ -31,12 +19,12 @@ "name": "root", "private": true, "scripts": { - "build": "lerna run --stream build", + "build": "node scripts/monorun --stream build", "build:no-ui": "npm run build -- --ignore embark-ui", - "ci": "lerna run --ignore embark-dapp-* --stream ci", + "ci": "node scripts/monorun --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": "node scripts/monorun --stream clean", "clean:full": "npx npm-run-all clean clean:top", "clean:top": "npx rimraf node_modules", "coverage": "npm-run-all coverage:collect coverage:report", @@ -47,29 +35,33 @@ "cwtree": "node scripts/check-working-tree", "deploy:site": "node site/deploy-site", "globalize": "node scripts/globalize", - "lint": "lerna run --parallel lint", - "package": "lerna run --parallel package", + "lint": "node scripts/monorun --parallel lint", + "package": "lerna exec --stream --concurrency=1 -- npm pack", "postclean": "npx lerna clean --yes", "postreboot": "yarn install", "postreboot:full": "yarn install", "preci:full": "yarn install", "preclean": "npm run reset:top", "preqa:full": "yarn install", - "qa": "lerna run --ignore embark-dapp-* --stream qa", + "qa": "node scripts/monorun --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 --stream reset", + "reset": "node scripts/monorun --stream reset", "reset:full": "npx npm-run-all reset reset:top", "reset:top": "npx rimraf .nyc_output coverage", - "start": "lerna run --parallel start", - "test": "lerna run --ignore embark-dapp-* --stream test", + "start": "node scripts/monorun --parallel start", + "test": "node scripts/monorun --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" + "typecheck": "node scripts/monorun --parallel typecheck", + "watch": "node scripts/monorun --parallel watch", + "watch:build": "node scripts/monorun --parallel watch:build", + "watch:lint": "node scripts/monorun --parallel watch:lint", + "watch:test": "node scripts/monorun --ignore embark-dapp-* --parallel watch:test", + "watch:typecheck": "node scripts/monorun --parallel watch:typecheck" }, "workspaces": { "packages": [ @@ -80,7 +72,8 @@ "packages/core/*", "packages/embarkjs/*", "packages/plugins/*", - "packages/stack/*" + "packages/stack/*", + "utils/*" ], "nohoist": [ "embark-dapp-template-demo/bootstrap", diff --git a/packages/.gitignore b/packages/.gitignore new file mode 100644 index 000000000..952236585 --- /dev/null +++ b/packages/.gitignore @@ -0,0 +1,2 @@ +!/plugins/coverage +/plugins/coverage/coverage diff --git a/packages/cockpit/cockpit-ui/package.json b/packages/cockpit/cockpit-ui/package.json index c345cad3b..c956ed5c8 100644 --- a/packages/cockpit/cockpit-ui/package.json +++ b/packages/cockpit/cockpit-ui/package.json @@ -27,22 +27,25 @@ "scripts": { "build": "react-scripts build", "build-storybook": "build-storybook -s public", - "ci": "npm-run-all lint test package", + "ci": "npm-run-all lint test", "clean": "npm run reset", "lint": "eslint src/", - "package": "npm pack", "prebuild": "node scripts/copy-monaco-to-public", "prestart": "node scripts/copy-monaco-to-public dev", - "qa": "npm-run-all lint test build package", + "qa": "npm-run-all lint test build", "reset": "npx rimraf build embark-*.tgz package public/vsdir storybook-static", "start": "react-scripts start", "storybook": "start-storybook -p 9009 -s public", "test": "react-scripts test --watchAll=false", + "watch:build": "react-scripts start", "watch:test": "react-scripts test" }, "devDependencies": { + "@babel/core": "7.6.2", "@coreui/coreui": "2.1.0", "@coreui/react": "2.1.0", + "@emotion/core": "0.13.1", + "@emotion/styled": "0.10.6", "@monaco-editor/react": "1.2.1", "@storybook/addon-actions": "5.1.11", "@storybook/addon-info": "5.1.11", @@ -54,6 +57,7 @@ "ansi-to-html": "0.6.11", "array-move": "2.0.0", "autoscroll-react": "3.2.0", + "babel-loader": "8.0.6", "bignumber.js": "2.0.7", "classnames": "2.2.6", "connected-react-router": "4.5.0", @@ -64,8 +68,11 @@ "font-awesome": "4.7.0", "fs-extra": "8.1.0", "history": "4.7.2", + "jquery": "3.4.1", "monaco-editor": "0.14.3", "npm-run-all": "4.1.5", + "perfect-scrollbar": "1.4.0", + "popper.js": "1.15.0", "prop-types": "15.7.2", "qs": "6.5.2", "re-resizable": "6.0.0", @@ -78,6 +85,7 @@ "react-helmet": "5.2.0", "react-json-view": "1.19.1", "react-redux": "5.1.1", + "react-router": "4.3.1", "react-router-dom": "4.3.1", "react-scripts": "3.1.2", "react-sortable-hoc": "1.8.3", @@ -87,6 +95,7 @@ "redux-saga": "0.16.2", "rimraf": "3.0.0", "simple-line-icons": "2.4.1", + "typescript": "3.6.3", "uuid": "3.3.2", "velocity-react": "1.4.1", "web3": "1.2.1" diff --git a/packages/cockpit/embark-api-client/package.json b/packages/cockpit/embark-api-client/package.json index 9b61d057d..ddcdd9c2f 100644 --- a/packages/cockpit/embark-api-client/package.json +++ b/packages/cockpit/embark-api-client/package.json @@ -25,40 +25,31 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "axios": "0.19.0", "keccakjs": "0.2.3" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/core/code-runner/package.json b/packages/core/code-runner/package.json index a72ca1536..fa48b5dbf 100644 --- a/packages/core/code-runner/package.json +++ b/packages/core/code-runner/package.json @@ -25,46 +25,45 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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 typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "colors": "1.3.2", "embark-utils": "^4.1.1", "embarkjs": "^4.1.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "parse-json": "4.0.0", "vm2": "3.6.4", "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "@types/async": "2.0.50", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/core/console/package.json b/packages/core/console/package.json index 9885e75cc..bde76a751 100644 --- a/packages/core/console/package.json +++ b/packages/core/console/package.json @@ -26,28 +26,29 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/lib/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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 test package", + "qa": "npm-run-all lint typecheck _build test", "reset": "npx rimraf .nyc_output coverage dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "chalk": "2.4.2", "embark-core": "^4.1.1", @@ -56,11 +57,9 @@ "json-stringify-safe": "5.0.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "@types/json-stringify-safe": "5.0.0", - "cross-env": "5.2.0", "embark-logger": "^4.1.1", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "mocha": "6.2.0", "npm-run-all": "4.1.5", @@ -68,7 +67,7 @@ "rimraf": "3.0.0", "source-map-support": "0.5.13", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/core/core/package.json b/packages/core/core/package.json index 10bcc08a4..f5e48b772 100644 --- a/packages/core/core/package.json +++ b/packages/core/core/package.json @@ -27,44 +27,35 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:js": "eslint process.js 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", + "lint": "eslint process.js src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", "flatted": "0.2.3", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "node-ipc": "9.1.1", "uuid": "3.3.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/core/i18n/package.json b/packages/core/i18n/package.json index 35733d62d..446f406c9 100644 --- a/packages/core/i18n/package.json +++ b/packages/core/i18n/package.json @@ -26,36 +26,35 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "colors": "1.3.2", "i18n": "0.8.3", "os-locale": "2.1.0" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "@types/i18n": "0.8.3", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/core/i18n/src/index.ts b/packages/core/i18n/src/index.ts index 034820313..1580b0b9b 100644 --- a/packages/core/i18n/src/index.ts +++ b/packages/core/i18n/src/index.ts @@ -30,7 +30,7 @@ i18n.configure({ }); const isSupported = (locale: string) => { - return Object.values(SupportedLanguage).includes(locale); + return (Object.values(SupportedLanguage) as string[]).includes(locale); }; export const setOrDetectLocale = (locale: Maybe) => { diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json index 34373bb8a..ec60ee98e 100644 --- a/packages/core/logger/package.json +++ b/packages/core/logger/package.json @@ -25,41 +25,32 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "colors": "1.3.2", "date-and-time": "0.6.2", "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/core/reset/package.json b/packages/core/reset/package.json index 2b54ef71f..eae077a21 100644 --- a/packages/core/reset/package.json +++ b/packages/core/reset/package.json @@ -17,9 +17,16 @@ "files": [ "bin.js" ], + "embark-collective": {}, + "scripts": { + "solo": "embark-solo" + }, "dependencies": { "rimraf": "3.0.0" }, + "devDependencies": { + "embark-solo": "^4.1.1" + }, "engines": { "node": ">=8.12.0 <12.0.0", "npm": ">=6.4.1", diff --git a/packages/core/typings/.gitignore b/packages/core/typings/.gitignore new file mode 100644 index 000000000..407ab2240 --- /dev/null +++ b/packages/core/typings/.gitignore @@ -0,0 +1 @@ +types-embark-*.tgz diff --git a/packages/core/typings/package.json b/packages/core/typings/package.json index bd5a39484..6b0fe0e97 100644 --- a/packages/core/typings/package.json +++ b/packages/core/typings/package.json @@ -24,19 +24,22 @@ }, "main": "", "types": "index", + "embark-collective": {}, "scripts": { "ci": "npm run qa", "lint": "tslint -c tslint.json index.d.ts \"src/**/*.ts\"", "qa": "npm-run-all lint typecheck", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", - "watch": "npm run typecheck -- --preserveWatchOutput --watch" + "watch": "run-p watch:*", + "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "devDependencies": { "@types/web3": "1.0.12", + "embark-solo": "^4.1.1", "npm-run-all": "4.1.5", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 729fce16a..6780910e4 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -25,27 +25,28 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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 typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.6.0", + "@babel/runtime-corejs2": "7.6.2", "bip39": "3.0.2", "clipboardy": "1.2.3", "colors": "1.3.2", @@ -53,7 +54,7 @@ "ethereumjs-wallet": "0.6.3", "find-up": "2.1.0", "follow-redirects": "1.8.0", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "fuzzy": "0.1.3", "glob": "7.1.4", "globule": "1.2.1", @@ -67,19 +68,17 @@ "web3-eth-abi": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "@types/follow-redirects": "1.5.0", "@types/fs-extra": "7.0.0", - "@types/node": "10.11.7", + "@types/node": "12.7.8", "@types/pretty-ms": "5.0.1", - "cross-env": "5.2.0", "embark-inside-monorepo": "^4.1.1", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embark-testing/babel.config.js b/packages/embark-testing/babel.config.js deleted file mode 100644 index 325ca2a8e..000000000 --- a/packages/embark-testing/babel.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../babel.config.js'); diff --git a/packages/embark-testing/package.json b/packages/embark-testing/package.json index 33427f5c6..17465b6b7 100644 --- a/packages/embark-testing/package.json +++ b/packages/embark-testing/package.json @@ -23,54 +23,52 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch", + "solo": "embark-solo", "test": "jest" }, "eslintConfig": { "extends": "../../.eslintrc.json" }, "dependencies": { + "@babel/runtime-corejs2": "7.6.2", "refute": "1.0.2", "sinon": "7.4.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "@babel/plugin-proposal-class-properties": "7.5.5", - "@babel/plugin-transform-runtime": "7.5.5", - "@babel/preset-env": "7.5.5", + "@babel/core": "7.6.2", "@types/async": "2.0.50", "babel-jest": "24.9.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "jest": "24.9.0", "lodash.clonedeep": "4.5.0", "npm-run-all": "4.1.5", - "rimraf": "2.6.3", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "2.6.3" }, "jest": { "collectCoverage": true, "testEnvironment": "node", "testMatch": [ "**/test/**/*.js" - ] + ], + "transform": { + "\\.js$": [ + "babel-jest", + { + "rootMode": "upward" + } + ] + } }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embark-testing/test/testing_test.js b/packages/embark-testing/test/testing_test.js index a4c7b6107..14b2a906a 100644 --- a/packages/embark-testing/test/testing_test.js +++ b/packages/embark-testing/test/testing_test.js @@ -2,8 +2,8 @@ const assert = require('assert').strict; describe('Testing', () => { - it('should have tests', (done) => { - assert(false, 'No tests yet on testing'); + it('should have tests, please write them', (done) => { + expect(true).toBe(true); done(); }); }); diff --git a/packages/embark/.babelrc.js b/packages/embark/.babelrc.js index fe2674c6e..2b0ab4172 100644 --- a/packages/embark/.babelrc.js +++ b/packages/embark/.babelrc.js @@ -1,6 +1,41 @@ -/* global module require */ +/* global __dirname module require */ const cloneDeep = require('lodash.clonedeep'); +const {copySync, ensureDirSync} = require('fs-extra'); +const glob = require('glob'); +const {dirname, join, relative} = require('path'); + +// @babel/cli v7's --copy-files option does not work well together with +// config-specified ignore paths, and that's a problem for embark-collective +// actions since the @babel/cli invocation must be the same across all packages +// in the collective; so any package in the collective that excludes src/ files +// from transpilation via its package-local .babelrc.js should copy those files +// into dist/, but only if they are expected to be in dist/; .babelrc.js should +// also copy any non .js,.ts files into /dist + +// in this case we want the un-transpiled webpack config and babel-loader +// overrides script from the basic-pipeline to be copied into the respective +// subdir in dist/; we also want to copy .ejs and .json files + +function copyFiles (ignored) { + const others = glob.sync( + join(__dirname, 'src/**/*.*'), + {ignore: [ + join(__dirname, 'src/**/*.js'), + join(__dirname, 'src/**/*.ts'), + join(__dirname, 'src/**/*.disabled') + ]} + ).map(path => relative(__dirname, path)); + + ignored = ignored.concat(others); + ignored + .map(path => path.replace('src/', 'dist/')) + .forEach((dest, index) => { + ensureDirSync(dirname(join(__dirname, dest))); + const source = ignored[index]; + copySync(join(__dirname, source), join(__dirname, dest)); + }); +} module.exports = (api) => { const env = api.env(); @@ -16,8 +51,16 @@ module.exports = (api) => { }); if (env === 'node') { + copyFiles(node.ignore); return node; } + const test = cloneDeep(node); + + if (env === 'test') { + copyFiles(test.ignore); + return test; + } + return base; }; diff --git a/packages/embark/package.json b/packages/embark/package.json index ba519b3c7..c3d431400 100644 --- a/packages/embark/package.json +++ b/packages/embark/package.json @@ -32,21 +32,22 @@ "dist/lib", "locales" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --copy-files --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build test", "reset": "npx rimraf .nyc_output coverage dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require ./scripts/test.js --require source-map-support/register", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { @@ -60,7 +61,7 @@ ] }, "dependencies": { - "@babel/core": "7.2.2", + "@babel/core": "7.6.2", "@babel/plugin-proposal-class-properties": "7.5.5", "@babel/plugin-proposal-decorators": "7.3.0", "@babel/plugin-proposal-object-rest-spread": "7.3.2", @@ -71,7 +72,7 @@ "@babel/preset-env": "7.5.5", "@babel/preset-react": "7.0.0", "@babel/preset-typescript": "7.6.0", - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "ajv": "6.10.2", "ascii-table": "0.0.9", "async": "2.6.1", @@ -144,7 +145,7 @@ "file-loader": "4.2.0", "find-up": "2.1.0", "flatted": "0.2.3", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "ganache-cli": "6.4.3", "glob": "7.1.4", "globule": "1.2.1", @@ -209,10 +210,10 @@ "web3-utils": "1.2.1", "webpack": "4.41.0", "window-size": "1.1.1", - "ws": "7.1.2" + "ws": "7.1.2", + "yo-yoify": "4.3.0" }, "devDependencies": { - "@babel/cli": "7.2.3", "@types/async": "2.0.50", "@types/body-parser": "1.17.1", "@types/cors": "2.8.4", @@ -222,12 +223,12 @@ "@types/globule": "1.1.3", "@types/helmet": "0.0.42", "@types/i18n": "0.8.3", - "@types/node": "10.11.7", + "@types/node": "12.7.8", "@types/os-locale": "2.1.0", "@types/request": "2.48.1", "@types/web3": "1.0.12", "chai": "4.1.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "embark-test-contract-0": "0.0.2", "embark-test-contract-1": "0.0.1", "eslint": "5.7.0", @@ -237,7 +238,7 @@ "rimraf": "3.0.0", "sinon": "4.5.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embarkjs/embarkjs-ens/.babelrc.js b/packages/embarkjs/embarkjs-ens/.babelrc.js index 787135151..05d103187 100644 --- a/packages/embarkjs/embarkjs-ens/.babelrc.js +++ b/packages/embarkjs/embarkjs-ens/.babelrc.js @@ -10,36 +10,21 @@ module.exports = (api) => { const browser = cloneDeep(base); Object.assign(browser, { ignore: [ - 'src/embarkjs.js', - 'src/node/index.js' + 'src/node' ] }); const node = cloneDeep(base); - Object.assign(node, { - ignore: [ - 'src/browser.js' - ] - }); - const nodeAsync = cloneDeep(base); - Object.assign(nodeAsync, { - ignore: [ - 'src/node/index.js' - ] - }); - - const nodeTest = cloneDeep(base); + const test = cloneDeep(node); switch (env) { case 'browser': return browser; case 'node': return node; - case 'node:async': - return nodeAsync; - case 'node:test': - return nodeTest; + case 'test': + return test; default: return base; } diff --git a/packages/embarkjs/embarkjs-ens/package.json b/packages/embarkjs/embarkjs-ens/package.json index a0fe2a590..6218a4bba 100644 --- a/packages/embarkjs/embarkjs-ens/package.json +++ b/packages/embarkjs/embarkjs-ens/package.json @@ -4,7 +4,7 @@ "author": "Iuri Matias ", "contributors": [], "description": "Ens plugin for embarkjs", - "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs-ens#readme", + "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs/embarkjs-ens#readme", "bugs": "https://github.com/embark-framework/embark/issues", "keywords": [ "blockchain", @@ -17,14 +17,12 @@ ], "license": "MIT", "repository": { - "directory": "packages/embarkjs-ens", + "directory": "packages/embarkjs/embarkjs-ens", "type": "git", "url": "https://github.com/embark-framework/embark.git" }, "main": "dist/node/index.js", - "browser": { - "./dist/node/index.js": "./dist/browser/index.js" - }, + "browser": "./dist/browser/index.js", "browserslist": [ "last 1 version", "not dead", @@ -33,39 +31,30 @@ "files": [ "dist" ], + "embark-collective": { + "build:browser": true, + "build:node": true + }, "scripts": { - "build": "npm-run-all build:**", - "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser --root-mode upward", - "build:node": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "build:node:async": "cross-env BABEL_ENV=node:async babel src/node --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "// build:node:test": "cross-env BABEL_ENV=node:test babel test --extensions \".js\" --out-dir build-test --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "// qa": "npm-run-all build test package", - "qa": "npm-run-all build package", - "reset": "npx rimraf .nyc_output build-test coverage dist embarkjs-*.tgz package", - "start": "npm run watch", - "// test": "nyc --reporter=html --reporter=json mocha \"build-test/**/*.js\" --exit --no-timeouts --require source-map-support/register", - "watch": "run-p \"build:** -- --verbose --watch\"" + "qa": "npm-run-all _build", + "reset": "npx rimraf coverage dist embarkjs-*.tgz package", + "solo": "embark-solo" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "embarkjs": "^4.1.1", "eth-ens-namehash": "2.0.8", "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "ajv": "6.10.2", - "chai": "4.2.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "lodash.clonedeep": "4.5.0", - "mocha": "6.2.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "source-map-support": "0.5.13" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embarkjs/embarkjs-ens/src/embarkjs.js b/packages/embarkjs/embarkjs-ens/src/embarkjs.js deleted file mode 100644 index eb6ba4c77..000000000 --- a/packages/embarkjs/embarkjs-ens/src/embarkjs.js +++ /dev/null @@ -1 +0,0 @@ -export {default} from './index'; diff --git a/packages/embarkjs/embarkjs-ens/src/node/index.js b/packages/embarkjs/embarkjs-ens/src/node/index.js index a61b612f1..dd50d42ae 100644 --- a/packages/embarkjs/embarkjs-ens/src/node/index.js +++ b/packages/embarkjs/embarkjs-ens/src/node/index.js @@ -1 +1 @@ -module.exports = require('../embarkjs').default; +module.exports = require('..').default; diff --git a/packages/embarkjs/embarkjs-ipfs/.babelrc.js b/packages/embarkjs/embarkjs-ipfs/.babelrc.js index 787135151..05d103187 100644 --- a/packages/embarkjs/embarkjs-ipfs/.babelrc.js +++ b/packages/embarkjs/embarkjs-ipfs/.babelrc.js @@ -10,36 +10,21 @@ module.exports = (api) => { const browser = cloneDeep(base); Object.assign(browser, { ignore: [ - 'src/embarkjs.js', - 'src/node/index.js' + 'src/node' ] }); const node = cloneDeep(base); - Object.assign(node, { - ignore: [ - 'src/browser.js' - ] - }); - const nodeAsync = cloneDeep(base); - Object.assign(nodeAsync, { - ignore: [ - 'src/node/index.js' - ] - }); - - const nodeTest = cloneDeep(base); + const test = cloneDeep(node); switch (env) { case 'browser': return browser; case 'node': return node; - case 'node:async': - return nodeAsync; - case 'node:test': - return nodeTest; + case 'test': + return test; default: return base; } diff --git a/packages/embarkjs/embarkjs-ipfs/package.json b/packages/embarkjs/embarkjs-ipfs/package.json index 392e95f91..d49e0666f 100644 --- a/packages/embarkjs/embarkjs-ipfs/package.json +++ b/packages/embarkjs/embarkjs-ipfs/package.json @@ -4,7 +4,7 @@ "author": "Iuri Matias ", "contributors": [], "description": "Ipfs plugin for embarkjs", - "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs-ipfs#readme", + "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs/embarkjs-ipfs#readme", "bugs": "https://github.com/embark-framework/embark/issues", "keywords": [ "blockchain", @@ -17,14 +17,12 @@ ], "license": "MIT", "repository": { - "directory": "packages/embarkjs-ipfs", + "directory": "packages/embarkjs/embarkjs-ipfs", "type": "git", "url": "https://github.com/embark-framework/embark.git" }, "main": "dist/node/index.js", - "browser": { - "./dist/node/index.js": "./dist/browser/index.js" - }, + "browser": "./dist/browser/index.js", "browserslist": [ "last 1 version", "not dead", @@ -33,38 +31,28 @@ "files": [ "dist" ], + "embark-collective": { + "build:browser": true, + "build:node": true + }, "scripts": { - "build": "npm-run-all build:**", - "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser --root-mode upward", - "build:node": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "build:node:async": "cross-env BABEL_ENV=node:async babel src/node --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "// build:node:test": "cross-env BABEL_ENV=node:test babel test --extensions \".js\" --out-dir build-test --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "// qa": "npm-run-all build test package", - "qa": "npm-run-all build package", - "reset": "npx rimraf .nyc_output build-test coverage dist embarkjs-*.tgz package", - "start": "npm run watch", - "// test": "nyc --reporter=html --reporter=json mocha \"build-test/**/*.js\" --exit --no-timeouts --require source-map-support/register", - "watch": "run-p \"build:** -- --verbose --watch\"" + "qa": "npm-run-all _build", + "reset": "npx rimraf coverage dist embarkjs-*.tgz package", + "solo": "embark-solo" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "ipfs-api": "17.2.4" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "ajv": "6.10.2", - "chai": "4.2.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "lodash.clonedeep": "4.5.0", - "mocha": "6.2.0", "npm-run-all": "4.1.5", - "nyc": "13.1.0", - "rimraf": "3.0.0", - "source-map-support": "0.5.13" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embarkjs/embarkjs-ipfs/src/embarkjs.js b/packages/embarkjs/embarkjs-ipfs/src/embarkjs.js deleted file mode 100644 index eb6ba4c77..000000000 --- a/packages/embarkjs/embarkjs-ipfs/src/embarkjs.js +++ /dev/null @@ -1 +0,0 @@ -export {default} from './index'; diff --git a/packages/embarkjs/embarkjs-ipfs/src/node/index.js b/packages/embarkjs/embarkjs-ipfs/src/node/index.js index a61b612f1..dd50d42ae 100644 --- a/packages/embarkjs/embarkjs-ipfs/src/node/index.js +++ b/packages/embarkjs/embarkjs-ipfs/src/node/index.js @@ -1 +1 @@ -module.exports = require('../embarkjs').default; +module.exports = require('..').default; diff --git a/packages/embarkjs/embarkjs-swarm/.babelrc.js b/packages/embarkjs/embarkjs-swarm/.babelrc.js index 787135151..05d103187 100644 --- a/packages/embarkjs/embarkjs-swarm/.babelrc.js +++ b/packages/embarkjs/embarkjs-swarm/.babelrc.js @@ -10,36 +10,21 @@ module.exports = (api) => { const browser = cloneDeep(base); Object.assign(browser, { ignore: [ - 'src/embarkjs.js', - 'src/node/index.js' + 'src/node' ] }); const node = cloneDeep(base); - Object.assign(node, { - ignore: [ - 'src/browser.js' - ] - }); - const nodeAsync = cloneDeep(base); - Object.assign(nodeAsync, { - ignore: [ - 'src/node/index.js' - ] - }); - - const nodeTest = cloneDeep(base); + const test = cloneDeep(node); switch (env) { case 'browser': return browser; case 'node': return node; - case 'node:async': - return nodeAsync; - case 'node:test': - return nodeTest; + case 'test': + return test; default: return base; } diff --git a/packages/embarkjs/embarkjs-swarm/package.json b/packages/embarkjs/embarkjs-swarm/package.json index 6d5971b77..b73f3f288 100644 --- a/packages/embarkjs/embarkjs-swarm/package.json +++ b/packages/embarkjs/embarkjs-swarm/package.json @@ -4,7 +4,7 @@ "author": "Iuri Matias ", "contributors": [], "description": "Swarm plugin for embarkjs", - "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs-swarm#readme", + "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs/embarkjs-swarm#readme", "bugs": "https://github.com/embark-framework/embark/issues", "keywords": [ "blockchain", @@ -17,14 +17,12 @@ ], "license": "MIT", "repository": { - "directory": "packages/embarkjs-swarm", + "directory": "packages/embarkjs/embarkjs-swarm", "type": "git", "url": "https://github.com/embark-framework/embark.git" }, "main": "dist/node/index.js", - "browser": { - "./dist/node/index.js": "./dist/browser/index.js" - }, + "browser": "./dist/browser/index.js", "browserslist": [ "last 1 version", "not dead", @@ -33,39 +31,29 @@ "files": [ "dist" ], + "embark-collective": { + "build:browser": true, + "build:node": true + }, "scripts": { - "build": "npm-run-all build:**", - "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser --root-mode upward", - "build:node": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "build:node:async": "cross-env BABEL_ENV=node:async babel src/node --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "// build:node:test": "cross-env BABEL_ENV=node:test babel test --extensions \".js\" --out-dir build-test --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "// qa": "npm-run-all build test package", - "qa": "npm-run-all build package", - "reset": "npx rimraf .nyc_output build-test coverage dist embarkjs-*.tgz package", - "start": "npm run watch", - "// test": "nyc --reporter=html --reporter=json mocha \"build-test/**/*.js\" --exit --no-timeouts --require source-map-support/register", - "watch": "run-p \"build:** -- --verbose --watch\"" + "qa": "npm-run-all _build", + "reset": "npx rimraf coverage dist embarkjs-*.tgz package", + "solo": "embark-solo" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "swarm-api": "0.1.2", "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "ajv": "6.10.2", - "chai": "4.2.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "lodash.clonedeep": "4.5.0", - "mocha": "6.2.0", "npm-run-all": "4.1.5", - "nyc": "13.1.0", - "rimraf": "3.0.0", - "source-map-support": "0.5.13" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embarkjs/embarkjs-swarm/src/embarkjs.js b/packages/embarkjs/embarkjs-swarm/src/embarkjs.js deleted file mode 100644 index eb6ba4c77..000000000 --- a/packages/embarkjs/embarkjs-swarm/src/embarkjs.js +++ /dev/null @@ -1 +0,0 @@ -export {default} from './index'; diff --git a/packages/embarkjs/embarkjs-swarm/src/node/index.js b/packages/embarkjs/embarkjs-swarm/src/node/index.js index a61b612f1..dd50d42ae 100644 --- a/packages/embarkjs/embarkjs-swarm/src/node/index.js +++ b/packages/embarkjs/embarkjs-swarm/src/node/index.js @@ -1 +1 @@ -module.exports = require('../embarkjs').default; +module.exports = require('..').default; diff --git a/packages/embarkjs/embarkjs-web3/.babelrc.js b/packages/embarkjs/embarkjs-web3/.babelrc.js index 787135151..05d103187 100644 --- a/packages/embarkjs/embarkjs-web3/.babelrc.js +++ b/packages/embarkjs/embarkjs-web3/.babelrc.js @@ -10,36 +10,21 @@ module.exports = (api) => { const browser = cloneDeep(base); Object.assign(browser, { ignore: [ - 'src/embarkjs.js', - 'src/node/index.js' + 'src/node' ] }); const node = cloneDeep(base); - Object.assign(node, { - ignore: [ - 'src/browser.js' - ] - }); - const nodeAsync = cloneDeep(base); - Object.assign(nodeAsync, { - ignore: [ - 'src/node/index.js' - ] - }); - - const nodeTest = cloneDeep(base); + const test = cloneDeep(node); switch (env) { case 'browser': return browser; case 'node': return node; - case 'node:async': - return nodeAsync; - case 'node:test': - return nodeTest; + case 'test': + return test; default: return base; } diff --git a/packages/embarkjs/embarkjs-web3/package.json b/packages/embarkjs/embarkjs-web3/package.json index e6b2f2b2a..5f859c9b3 100644 --- a/packages/embarkjs/embarkjs-web3/package.json +++ b/packages/embarkjs/embarkjs-web3/package.json @@ -4,7 +4,7 @@ "author": "Iuri Matias ", "contributors": [], "description": "embarkjs plugin to interact with web3", - "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs-web3#readme", + "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs/embarkjs-web3#readme", "bugs": "https://github.com/embark-framework/embark/issues", "keywords": [ "blockchain", @@ -17,14 +17,12 @@ ], "license": "MIT", "repository": { - "directory": "packages/embarkjs-web3", + "directory": "packages/embarkjs/embarkjs-web3", "type": "git", "url": "https://github.com/embark-framework/embark.git" }, "main": "dist/node/index.js", - "browser": { - "./dist/node/index.js": "./dist/browser/index.js" - }, + "browser": "./dist/browser/index.js", "browserslist": [ "last 1 version", "not dead", @@ -33,38 +31,28 @@ "files": [ "dist" ], + "embark-collective": { + "build:browser": true, + "build:node": true + }, "scripts": { - "build": "npm-run-all build:**", - "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser --root-mode upward", - "build:node": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "build:node:async": "cross-env BABEL_ENV=node:async babel src/node --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "// build:node:test": "cross-env BABEL_ENV=node:test babel test --extensions \".js\" --out-dir build-test --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "// qa": "npm-run-all build test package", - "qa": "npm-run-all build package", - "reset": "npx rimraf .nyc_output build-test coverage dist embarkjs-*.tgz package", - "start": "npm run watch", - "// test": "nyc --reporter=html --reporter=json mocha \"build-test/**/*.js\" --exit --no-timeouts --require source-map-support/register", - "watch": "run-p \"build:** -- --verbose --watch\"" + "qa": "npm-run-all _build", + "reset": "npx rimraf coverage dist embarkjs-*.tgz package", + "solo": "embark-solo" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "ajv": "6.10.2", - "chai": "4.2.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "lodash.clonedeep": "4.5.0", - "mocha": "6.2.0", "npm-run-all": "4.1.5", - "nyc": "13.1.0", - "rimraf": "3.0.0", - "source-map-support": "0.5.13" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embarkjs/embarkjs-web3/src/embarkjs.js b/packages/embarkjs/embarkjs-web3/src/embarkjs.js deleted file mode 100644 index eb6ba4c77..000000000 --- a/packages/embarkjs/embarkjs-web3/src/embarkjs.js +++ /dev/null @@ -1 +0,0 @@ -export {default} from './index'; diff --git a/packages/embarkjs/embarkjs-web3/src/node/index.js b/packages/embarkjs/embarkjs-web3/src/node/index.js index a61b612f1..dd50d42ae 100644 --- a/packages/embarkjs/embarkjs-web3/src/node/index.js +++ b/packages/embarkjs/embarkjs-web3/src/node/index.js @@ -1 +1 @@ -module.exports = require('../embarkjs').default; +module.exports = require('..').default; diff --git a/packages/embarkjs/embarkjs-whisper/.babelrc.js b/packages/embarkjs/embarkjs-whisper/.babelrc.js index 787135151..05d103187 100644 --- a/packages/embarkjs/embarkjs-whisper/.babelrc.js +++ b/packages/embarkjs/embarkjs-whisper/.babelrc.js @@ -10,36 +10,21 @@ module.exports = (api) => { const browser = cloneDeep(base); Object.assign(browser, { ignore: [ - 'src/embarkjs.js', - 'src/node/index.js' + 'src/node' ] }); const node = cloneDeep(base); - Object.assign(node, { - ignore: [ - 'src/browser.js' - ] - }); - const nodeAsync = cloneDeep(base); - Object.assign(nodeAsync, { - ignore: [ - 'src/node/index.js' - ] - }); - - const nodeTest = cloneDeep(base); + const test = cloneDeep(node); switch (env) { case 'browser': return browser; case 'node': return node; - case 'node:async': - return nodeAsync; - case 'node:test': - return nodeTest; + case 'test': + return test; default: return base; } diff --git a/packages/embarkjs/embarkjs-whisper/package.json b/packages/embarkjs/embarkjs-whisper/package.json index 4067bad42..5b173031a 100644 --- a/packages/embarkjs/embarkjs-whisper/package.json +++ b/packages/embarkjs/embarkjs-whisper/package.json @@ -4,7 +4,7 @@ "author": "Iuri Matias ", "contributors": [], "description": "Whisper plugin for embarkjs", - "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs-whisper#readme", + "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs/embarkjs-whisper#readme", "bugs": "https://github.com/embark-framework/embark/issues", "keywords": [ "blockchain", @@ -17,14 +17,12 @@ ], "license": "MIT", "repository": { - "directory": "packages/embarkjs-whisper", + "directory": "packages/embarkjs/embarkjs-whisper", "type": "git", "url": "https://github.com/embark-framework/embark.git" }, "main": "dist/node/index.js", - "browser": { - "./dist/node/index.js": "./dist/browser/index.js" - }, + "browser": "./dist/browser/index.js", "browserslist": [ "last 1 version", "not dead", @@ -33,39 +31,29 @@ "files": [ "dist" ], + "embark-collective": { + "build:browser": true, + "build:node": true + }, "scripts": { - "build": "npm-run-all build:**", - "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser --root-mode upward", - "build:node": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "build:node:async": "cross-env BABEL_ENV=node:async babel src/node --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "// build:node:test": "cross-env BABEL_ENV=node:test babel test --extensions \".js\" --out-dir build-test --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "// qa": "npm-run-all build test package", - "qa": "npm-run-all build package", - "reset": "npx rimraf .nyc_output build-test coverage dist embarkjs-*.tgz package", - "start": "npm run watch", - "// test": "nyc --reporter=html --reporter=json mocha \"build-test/**/*.js\" --exit --no-timeouts --require source-map-support/register", - "watch": "run-p \"build:** -- --verbose --watch\"" + "qa": "npm-run-all _build", + "reset": "npx rimraf coverage dist embarkjs-*.tgz package", + "solo": "embark-solo" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "rxjs": "6.4.0", "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "ajv": "6.10.2", - "chai": "4.2.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "lodash.clonedeep": "4.5.0", - "mocha": "6.2.0", "npm-run-all": "4.1.5", - "nyc": "13.1.0", - "rimraf": "3.0.0", - "source-map-support": "0.5.13" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/embarkjs/embarkjs-whisper/src/embarkjs.js b/packages/embarkjs/embarkjs-whisper/src/embarkjs.js deleted file mode 100644 index eb6ba4c77..000000000 --- a/packages/embarkjs/embarkjs-whisper/src/embarkjs.js +++ /dev/null @@ -1 +0,0 @@ -export {default} from './index'; diff --git a/packages/embarkjs/embarkjs-whisper/src/node/index.js b/packages/embarkjs/embarkjs-whisper/src/node/index.js index a61b612f1..dd50d42ae 100644 --- a/packages/embarkjs/embarkjs-whisper/src/node/index.js +++ b/packages/embarkjs/embarkjs-whisper/src/node/index.js @@ -1 +1 @@ -module.exports = require('../embarkjs').default; +module.exports = require('..').default; diff --git a/packages/embarkjs/embarkjs/.babelrc.js b/packages/embarkjs/embarkjs/.babelrc.js index bb1c06168..9b27403c6 100644 --- a/packages/embarkjs/embarkjs/.babelrc.js +++ b/packages/embarkjs/embarkjs/.babelrc.js @@ -10,39 +10,28 @@ module.exports = (api) => { const browser = cloneDeep(base); Object.assign(browser, { ignore: [ - 'src/embark.js', - 'src/node/async.js', - 'src/node/index.js' + 'src/lib/async.js', + 'src/lib/node', + 'src/test' ] }); const node = cloneDeep(base); Object.assign(node, { ignore: [ - 'src/async.js', - 'src/browser.js', - 'src/node/async.js' + 'src/lib/browser' ] }); - const nodeAsync = cloneDeep(base); - Object.assign(nodeAsync, { - ignore: [ - 'src/node/index.js' - ] - }); - - const nodeTest = cloneDeep(base); + const test = cloneDeep(node); switch (env) { case 'browser': return browser; case 'node': return node; - case 'node:async': - return nodeAsync; - case 'node:test': - return nodeTest; + case 'test': + return test; default: return base; } diff --git a/packages/embarkjs/embarkjs/package.json b/packages/embarkjs/embarkjs/package.json index 4a8d0a94b..2600cb37f 100644 --- a/packages/embarkjs/embarkjs/package.json +++ b/packages/embarkjs/embarkjs/package.json @@ -4,7 +4,7 @@ "author": "Iuri Matias ", "contributors": [], "description": "JavaScript library for easily interacting with web3 technologies", - "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs#readme", + "homepage": "https://github.com/embark-framework/embark/tree/master/packages/embarkjs/embarkjs#readme", "bugs": "https://github.com/embark-framework/embark/issues", "keywords": [ "blockchain", @@ -17,13 +17,14 @@ ], "license": "MIT", "repository": { - "directory": "packages/embarkjs", + "directory": "packages/embarkjs/embarkjs", "type": "git", "url": "https://github.com/embark-framework/embark.git" }, - "main": "dist/node/index.js", + "main": "./dist/lib/node/index.js", "browser": { - "./dist/node/index.js": "./dist/browser/index.js" + "./dist/lib/node/index.js": "./dist/browser/lib/index.js", + "./dist/browser/lib/async.js": "./dist/browser/lib/browser/async.js" }, "browserslist": [ "last 1 version", @@ -31,42 +32,39 @@ "> 0.2%" ], "files": [ - "dist" + "dist/browser", + "dist/lib" ], + "embark-collective": { + "build:browser": true, + "build:node": true + }, "scripts": { - "build": "npm-run-all build:**", - "build:browser": "cross-env BABEL_ENV=browser babel src --extensions \".js\" --out-dir dist/browser --root-mode upward", - "build:node": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "build:node:async": "cross-env BABEL_ENV=node:async babel src/node --extensions \".js\" --out-dir dist --root-mode upward --source-maps", - "build:node:test": "cross-env BABEL_ENV=node:test babel test --extensions \".js\" --out-dir build-test --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "package": "npm pack", - "qa": "npm-run-all build test package", - "reset": "npx rimraf .nyc_output build-test coverage dist embarkjs-*.tgz package", - "start": "npm run watch", - "test": "nyc --reporter=html --reporter=json mocha \"build-test/**/*.js\" --exit --no-timeouts --require source-map-support/register", - "watch": "run-p \"build:** -- --verbose --watch\"" + "qa": "npm-run-all _build test", + "reset": "npx rimraf .nyc_output coverage dist embarkjs-*.tgz package", + "solo": "embark-solo", + "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register" }, "nyc": { "exclude": [ "**/node_modules/**", - "build-test/**", - "coverage/**" + "coverage/**", + "dist/test/**" ] }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "async-es": "2.6.1", "colors": "1.3.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "ajv": "6.10.2", "chai": "4.2.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "lodash.clonedeep": "4.5.0", "mocha": "6.2.0", "npm-run-all": "4.1.5", diff --git a/packages/embarkjs/embarkjs/src/embark.js b/packages/embarkjs/embarkjs/src/embark.js deleted file mode 100644 index eb6ba4c77..000000000 --- a/packages/embarkjs/embarkjs/src/embark.js +++ /dev/null @@ -1 +0,0 @@ -export {default} from './index'; diff --git a/packages/embarkjs/embarkjs/src/node/async.js b/packages/embarkjs/embarkjs/src/lib/async.js similarity index 100% rename from packages/embarkjs/embarkjs/src/node/async.js rename to packages/embarkjs/embarkjs/src/lib/async.js diff --git a/packages/embarkjs/embarkjs/src/blockchain.js b/packages/embarkjs/embarkjs/src/lib/blockchain.js similarity index 100% rename from packages/embarkjs/embarkjs/src/blockchain.js rename to packages/embarkjs/embarkjs/src/lib/blockchain.js diff --git a/packages/embarkjs/embarkjs/src/async.js b/packages/embarkjs/embarkjs/src/lib/browser/async.js similarity index 100% rename from packages/embarkjs/embarkjs/src/async.js rename to packages/embarkjs/embarkjs/src/lib/browser/async.js diff --git a/packages/embarkjs/embarkjs/src/index.js b/packages/embarkjs/embarkjs/src/lib/index.js similarity index 100% rename from packages/embarkjs/embarkjs/src/index.js rename to packages/embarkjs/embarkjs/src/lib/index.js diff --git a/packages/embarkjs/embarkjs/src/messages.js b/packages/embarkjs/embarkjs/src/lib/messages.js similarity index 100% rename from packages/embarkjs/embarkjs/src/messages.js rename to packages/embarkjs/embarkjs/src/lib/messages.js diff --git a/packages/embarkjs/embarkjs/src/names.js b/packages/embarkjs/embarkjs/src/lib/names.js similarity index 100% rename from packages/embarkjs/embarkjs/src/names.js rename to packages/embarkjs/embarkjs/src/lib/names.js diff --git a/packages/embarkjs/embarkjs/src/lib/node/index.js b/packages/embarkjs/embarkjs/src/lib/node/index.js new file mode 100644 index 000000000..dd50d42ae --- /dev/null +++ b/packages/embarkjs/embarkjs/src/lib/node/index.js @@ -0,0 +1 @@ +module.exports = require('..').default; diff --git a/packages/embarkjs/embarkjs/src/storage.js b/packages/embarkjs/embarkjs/src/lib/storage.js similarity index 100% rename from packages/embarkjs/embarkjs/src/storage.js rename to packages/embarkjs/embarkjs/src/lib/storage.js diff --git a/packages/embarkjs/embarkjs/src/utils.js b/packages/embarkjs/embarkjs/src/lib/utils.js similarity index 100% rename from packages/embarkjs/embarkjs/src/utils.js rename to packages/embarkjs/embarkjs/src/lib/utils.js diff --git a/packages/embarkjs/embarkjs/src/node/index.js b/packages/embarkjs/embarkjs/src/node/index.js deleted file mode 100644 index 18fe3a589..000000000 --- a/packages/embarkjs/embarkjs/src/node/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../embark').default; diff --git a/packages/embarkjs/embarkjs/test/blockchain.js b/packages/embarkjs/embarkjs/src/test/blockchain.js similarity index 98% rename from packages/embarkjs/embarkjs/test/blockchain.js rename to packages/embarkjs/embarkjs/src/test/blockchain.js index 3289ed2ab..dfef1bf9f 100644 --- a/packages/embarkjs/embarkjs/test/blockchain.js +++ b/packages/embarkjs/embarkjs/src/test/blockchain.js @@ -2,7 +2,7 @@ const {startRPCMockServer, TestProvider} = require('./helpers/blockchain'); const {assert} = require('chai'); -const {Blockchain} = require('..'); +const {Blockchain} = require('../lib/node'); const {promisify} = require('util'); describe('Blockchain', () => { diff --git a/packages/embarkjs/embarkjs/test/helpers/blockchain.js b/packages/embarkjs/embarkjs/src/test/helpers/blockchain.js similarity index 100% rename from packages/embarkjs/embarkjs/test/helpers/blockchain.js rename to packages/embarkjs/embarkjs/src/test/helpers/blockchain.js diff --git a/packages/plugins/accounts-manager/package.json b/packages/plugins/accounts-manager/package.json index e35a11d82..7be50d964 100644 --- a/packages/plugins/accounts-manager/package.json +++ b/packages/plugins/accounts-manager/package.json @@ -25,26 +25,27 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".ts\",\".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", @@ -52,14 +53,12 @@ "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/coverage/package.json b/packages/plugins/coverage/package.json index 2e20d6a3c..517cc14a5 100644 --- a/packages/plugins/coverage/package.json +++ b/packages/plugins/coverage/package.json @@ -25,27 +25,28 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/lib/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "test": "nyc --reporter=html --reporter=json mocha dist/test/**/*.js --exit --no-timeouts --require source-map-support/register", + "solo": "embark-solo", + "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "dependencies": { "@babel/runtime-corejs2": "7.3.1", "embark-core": "^4.1.1", "embark-utils": "^4.1.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "globule": "1.2.1", "prettier-plugin-solidity": "1.0.0-alpha.25", "semver": "5.6.0", @@ -61,12 +62,13 @@ "@types/semver": "5.5.0", "@types/web3": "1.0.12", "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "mocha": "6.2.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/debugger/package.json b/packages/plugins/debugger/package.json index 69db8c83b..bd2a7c0b6 100644 --- a/packages/plugins/debugger/package.json +++ b/packages/plugins/debugger/package.json @@ -25,40 +25,35 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf .nyc_output coverage dist embark-*.tgz package", - "start": "npm run watch", - "// test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "colors": "1.3.2", "embark-i18n": "^4.1.1", "remix-debug-debugtest": "0.2.16" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", - "mocha": "6.2.0", + "embark-solo": "^4.1.1", "npm-run-all": "4.1.5", - "nyc": "13.1.0", "rimraf": "3.0.0", - "source-map-support": "0.5.13", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/deploy-tracker/package.json b/packages/plugins/deploy-tracker/package.json index ff6c1d36a..731131fbf 100644 --- a/packages/plugins/deploy-tracker/package.json +++ b/packages/plugins/deploy-tracker/package.json @@ -25,23 +25,18 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf .nyc_output coverage dist embark-*.tgz package", - "start": "npm run watch", - "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo", + "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register" }, "eslintConfig": { "extends": "../../../.eslintrc.json" @@ -49,10 +44,11 @@ "dependencies": { "colors": "1.3.2", "embark-utils": "^4.1.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "web3": "1.2.1" }, "devDependencies": { + "embark-solo": "^4.1.1", "eslint": "5.7.0", "expect.js": "0.3.1", "mocha": "6.2.0", diff --git a/packages/plugins/ens/package.json b/packages/plugins/ens/package.json index 33b1ab60f..d528bbd64 100644 --- a/packages/plugins/ens/package.json +++ b/packages/plugins/ens/package.json @@ -26,28 +26,23 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", @@ -58,14 +53,10 @@ "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/graph/package.json b/packages/plugins/graph/package.json index da169a0b7..821efb0ac 100644 --- a/packages/plugins/graph/package.json +++ b/packages/plugins/graph/package.json @@ -25,40 +25,31 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "viz.js": "1.8.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/ipfs/package.json b/packages/plugins/ipfs/package.json index 720a4c15e..f9091171a 100644 --- a/packages/plugins/ipfs/package.json +++ b/packages/plugins/ipfs/package.json @@ -27,28 +27,23 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:js": "eslint process.js 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", + "lint": "eslint process.js src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "colors": "1.3.2", "embark-core": "^4.1.1", @@ -61,14 +56,10 @@ "shelljs": "0.8.3" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/mocha-tests/package.json b/packages/plugins/mocha-tests/package.json index 0930fc01f..8e0bda98d 100644 --- a/packages/plugins/mocha-tests/package.json +++ b/packages/plugins/mocha-tests/package.json @@ -23,23 +23,18 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch", - "test": "mocha dist/test/**/*.js" + "lint": "eslint src/", + "qa": "npm-run-all lint _build", + "reset": "npx rimraf .nyc_output dist embark-*.tgz package", + "solo": "embark-solo", + "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register" }, "eslintConfig": { "env": { @@ -48,27 +43,25 @@ "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "3.1.0", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", + "embarkjs": "^4.1.1", "mocha": "6.2.0", "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "@types/async": "2.0.50", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", + "nyc": "13.1.0", "refute": "1.0.2", "rimraf": "3.0.0", "sinon": "7.4.2", - "tslint": "5.16.0", - "typescript": "3.4.5" + "source-map-support": "0.5.13" }, - "embarkjs": "^4.1.1", "engines": { "node": ">=8.12.0 <12.0.0", "npm": ">=6.4.1", diff --git a/packages/plugins/plugin-cmd/package.json b/packages/plugins/plugin-cmd/package.json index cc5b56a27..65a4975dc 100644 --- a/packages/plugins/plugin-cmd/package.json +++ b/packages/plugins/plugin-cmd/package.json @@ -16,40 +16,32 @@ "dist" ], "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/profiler/package.json b/packages/plugins/profiler/package.json index 41f24e7dd..5865702d4 100644 --- a/packages/plugins/profiler/package.json +++ b/packages/plugins/profiler/package.json @@ -25,41 +25,32 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "ascii-table": "0.0.9", "async": "2.6.1", "web3-utils": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/scaffolding/.babelrc.js b/packages/plugins/scaffolding/.babelrc.js new file mode 100644 index 000000000..f85097a2e --- /dev/null +++ b/packages/plugins/scaffolding/.babelrc.js @@ -0,0 +1,58 @@ +/* global __dirname module require */ + +const cloneDeep = require('lodash.clonedeep'); +const {copySync, ensureDirSync} = require('fs-extra'); +const glob = require('glob'); +const {dirname, join, relative} = require('path'); + +// @babel/cli v7's --copy-files option does not work well together with +// config-specified ignore paths, and that's a problem for embark-collective +// actions since the @babel/cli invocation must be the same across all packages +// in the collective; so any package in the collective that excludes src/ files +// from transpilation via its package-local .babelrc.js should copy those files +// into dist/, but only if they are expected to be in dist/; .babelrc.js should +// also copy any non .js,.ts files into /dist + +// in this case we want we want to copy .hbs files + +function copyFiles (ignored) { + const others = glob.sync( + join(__dirname, 'src/**/*.*'), + {ignore: [ + join(__dirname, 'src/**/*.js'), + join(__dirname, 'src/**/*.ts'), + join(__dirname, 'src/**/*.disabled') + ]} + ).map(path => relative(__dirname, path)); + + ignored = ignored.concat(others); + ignored + .map(path => path.replace('src/', 'dist/')) + .forEach((dest, index) => { + ensureDirSync(dirname(join(__dirname, dest))); + const source = ignored[index]; + copySync(join(__dirname, source), join(__dirname, dest)); + }); +} + +module.exports = (api) => { + const env = api.env(); + + const base = {}; + + const node = cloneDeep(base); + + if (env === 'node') { + copyFiles([]); + return node; + } + + const test = cloneDeep(node); + + if (env === 'test') { + copyFiles([]); + return test; + } + + return base; +}; diff --git a/packages/plugins/scaffolding/package.json b/packages/plugins/scaffolding/package.json index 6ae6445d1..a2ddcc5b6 100644 --- a/packages/plugins/scaffolding/package.json +++ b/packages/plugins/scaffolding/package.json @@ -25,37 +25,39 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --copy-files --extensions \".ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "ajv": "6.10.2", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", "handlebars": "4.2.0" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", + "fs-extra": "8.1.0", + "glob": "7.1.4", + "lodash.clonedeep": "4.5.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/snark/babel.config.js b/packages/plugins/snark/babel.config.js deleted file mode 100644 index 8591034d0..000000000 --- a/packages/plugins/snark/babel.config.js +++ /dev/null @@ -1,42 +0,0 @@ -const cloneDeep = require('lodash.clonedeep'); - -module.exports = api => { - const env = api.env(); - - const base = { - plugins: [ - '@babel/plugin-proposal-class-properties', - [ - '@babel/plugin-transform-runtime', - { - corejs: 2 - } - ] - ], - presets: ['@babel/preset-env'] - }; - - if (env === 'base' || env.startsWith('base:')) { - return base; - } - - const node = cloneDeep(base); - node.presets[0] = [ - node.presets[0], - { - targets: { node: '8.11.3' } - } - ]; - - if (env === 'node' || env.startsWith('node:')) { - return node; - } - - const test = cloneDeep(node); - - if (env === 'test') { - return test; - } - - return {}; -}; diff --git a/packages/plugins/snark/package.json b/packages/plugins/snark/package.json index bfecb86e4..2a34b4ee1 100644 --- a/packages/plugins/snark/package.json +++ b/packages/plugins/snark/package.json @@ -32,34 +32,31 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "eslint babel.config.js src/ test/", - "package": "npm pack", - "qa": "npm-run-all lint build test package", + "lint": "eslint src/ test/", + "qa": "npm-run-all lint _build test", "reset": "npx rimraf coverage dist embark-*.tgz package", - "start": "npm run watch", - "test": "jest", - "watch": "npm run build -- --verbose --watch" + "solo": "embark-solo", + "test": "jest" }, "dependencies": { - "@babel/runtime-corejs2": "7.6.0", + "@babel/runtime-corejs2": "7.6.2", "circom": "0.0.31", "find-up": "4.1.0", "glob": "7.1.4", "snarkjs": "0.1.19" }, "devDependencies": { - "@babel/cli": "7.5.5", - "@babel/core": "7.5.5", - "@babel/plugin-proposal-class-properties": "7.5.5", - "@babel/plugin-transform-runtime": "7.5.5", - "@babel/preset-env": "7.5.5", + "@babel/core": "7.6.2", "babel-eslint": "10.0.3", "babel-jest": "24.9.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "6.2.2", "eslint-config-prettier": "6.1.0", "eslint-plugin-jest": "22.5.1", @@ -88,7 +85,15 @@ "testEnvironment": "node", "testMatch": [ "**/test/**/*.js" - ] + ], + "transform": { + "\\.js$": [ + "babel-jest", + { + "rootMode": "upward" + } + ] + } }, "prettier": { "singleQuote": true diff --git a/packages/plugins/solc/package.json b/packages/plugins/solc/package.json index 81a957fee..6af314f07 100644 --- a/packages/plugins/solc/package.json +++ b/packages/plugins/solc/package.json @@ -25,40 +25,32 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --copy-files --extensions \".ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "semver": "5.6.0", "shelljs": "0.8.3" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/solidity-tests/package.json b/packages/plugins/solidity-tests/package.json index 4477ea5ab..40c2100c8 100644 --- a/packages/plugins/solidity-tests/package.json +++ b/packages/plugins/solidity-tests/package.json @@ -23,41 +23,38 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch", - "test": "mocha dist/test/**/*.js" + "lint": "eslint src/", + "qa": "npm-run-all lint _build", + "reset": "npx rimraf .nyc_output dist embark-*.tgz package", + "solo": "embark-solo", + "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, - "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "@types/async": "2.0.50", + "dependencies": { + "@babel/runtime-corejs2": "7.6.2", "async": "3.1.0", - "cross-env": "5.2.0", + "remix-tests": "0.1.14", + "web3": "1.2.1", + "yo-yoify": "4.3.0" + }, + "devDependencies": { + "@types/async": "2.0.50", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "mocha": "6.2.0", "npm-run-all": "4.1.5", - "remix-tests": "0.1.14", + "nyc": "13.1.0", "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5", - "web3": "1.2.1" + "source-map-support": "0.5.13" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/solidity/package.json b/packages/plugins/solidity/package.json index c6489e97c..246c136dd 100644 --- a/packages/plugins/solidity/package.json +++ b/packages/plugins/solidity/package.json @@ -25,46 +25,37 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "semver": "5.6.0", "solc": "0.5.0", "uuid": "3.3.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/specialconfigs/package.json b/packages/plugins/specialconfigs/package.json index bfc59fa27..adfe9b1ad 100644 --- a/packages/plugins/specialconfigs/package.json +++ b/packages/plugins/specialconfigs/package.json @@ -25,41 +25,32 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-i18n": "^4.1.1", "viz.js": "1.8.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/swarm/package.json b/packages/plugins/swarm/package.json index b87666a32..ef8f0d012 100644 --- a/packages/plugins/swarm/package.json +++ b/packages/plugins/swarm/package.json @@ -28,28 +28,23 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:js": "eslint process.js 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", + "lint": "eslint process.js src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "colors": "1.3.2", "embark-core": "^4.1.1", @@ -61,14 +56,10 @@ "swarm-api": "0.1.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/transaction-logger/package.json b/packages/plugins/transaction-logger/package.json index 70a32bdd6..2ea8de88a 100644 --- a/packages/plugins/transaction-logger/package.json +++ b/packages/plugins/transaction-logger/package.json @@ -25,28 +25,23 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", @@ -55,15 +50,10 @@ "ethereumjs-util": "6.0.0" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "source-map-support": "0.5.13", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/transaction-tracker/package.json b/packages/plugins/transaction-tracker/package.json index 8c0506af9..724149a50 100644 --- a/packages/plugins/transaction-tracker/package.json +++ b/packages/plugins/transaction-tracker/package.json @@ -25,40 +25,31 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "viz.js": "1.8.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/vyper/package.json b/packages/plugins/vyper/package.json index 6e84a20bc..edf66560d 100644 --- a/packages/plugins/vyper/package.json +++ b/packages/plugins/vyper/package.json @@ -25,41 +25,32 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-i18n": "^4.1.1", "shelljs": "0.8.3" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/web3/.babelrc.js b/packages/plugins/web3/.babelrc.js new file mode 100644 index 000000000..71fe1c0f7 --- /dev/null +++ b/packages/plugins/web3/.babelrc.js @@ -0,0 +1,58 @@ +/* global __dirname module require */ + +const cloneDeep = require('lodash.clonedeep'); +const {copySync, ensureDirSync} = require('fs-extra'); +const glob = require('glob'); +const {dirname, join, relative} = require('path'); + +// @babel/cli v7's --copy-files option does not work well together with +// config-specified ignore paths, and that's a problem for embark-collective +// actions since the @babel/cli invocation must be the same across all packages +// in the collective; so any package in the collective that excludes src/ files +// from transpilation via its package-local .babelrc.js should copy those files +// into dist/, but only if they are expected to be in dist/; .babelrc.js should +// also copy any non .js,.ts files into /dist + +// in this case we want we want to copy .ejs files + +function copyFiles (ignored) { + const others = glob.sync( + join(__dirname, 'src/**/*.*'), + {ignore: [ + join(__dirname, 'src/**/*.js'), + join(__dirname, 'src/**/*.ts'), + join(__dirname, 'src/**/*.disabled') + ]} + ).map(path => relative(__dirname, path)); + + ignored = ignored.concat(others); + ignored + .map(path => path.replace('src/', 'dist/')) + .forEach((dest, index) => { + ensureDirSync(dirname(join(__dirname, dest))); + const source = ignored[index]; + copySync(join(__dirname, source), join(__dirname, dest)); + }); +} + +module.exports = (api) => { + const env = api.env(); + + const base = {}; + + const node = cloneDeep(base); + + if (env === 'node') { + copyFiles([]); + return node; + } + + const test = cloneDeep(node); + + if (env === 'test') { + copyFiles([]); + return test; + } + + return base; +}; diff --git a/packages/plugins/web3/package.json b/packages/plugins/web3/package.json index 4fa0f3c73..70f1076a1 100644 --- a/packages/plugins/web3/package.json +++ b/packages/plugins/web3/package.json @@ -25,43 +25,36 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps --copy-files", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/core": "7.2.2", - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "ejs": "2.6.1", "embark-core": "^4.1.1", "embark-utils": "^4.1.1", "embarkjs-web3": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", + "fs-extra": "8.1.0", + "glob": "7.1.4", + "lodash.clonedeep": "4.5.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/plugins/whisper/package.json b/packages/plugins/whisper/package.json index 41d2e398f..2279a866b 100644 --- a/packages/plugins/whisper/package.json +++ b/packages/plugins/whisper/package.json @@ -25,28 +25,23 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", @@ -55,14 +50,10 @@ "rxjs": "6.4.0" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5", "web3": "1.2.1" }, "engines": { diff --git a/packages/stack/api/package.json b/packages/stack/api/package.json index 93f17245f..a77f696ae 100644 --- a/packages/stack/api/package.json +++ b/packages/stack/api/package.json @@ -25,35 +25,34 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "colors": "1.3.2", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/authenticator/package.json b/packages/stack/authenticator/package.json index 2b46e1fda..a35d5e3be 100644 --- a/packages/stack/authenticator/package.json +++ b/packages/stack/authenticator/package.json @@ -25,42 +25,33 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", "keccakjs": "0.2.3", "uuid": "3.3.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/communication/babel.config.js b/packages/stack/communication/babel.config.js deleted file mode 100644 index 245e0d859..000000000 --- a/packages/stack/communication/babel.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../../babel.config.js'); diff --git a/packages/stack/communication/package.json b/packages/stack/communication/package.json index 9e434e3f2..590908704 100644 --- a/packages/stack/communication/package.json +++ b/packages/stack/communication/package.json @@ -25,29 +25,24 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "test": "jest", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo", + "test": "jest" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "clone-deep": "4.0.0", "embark-core": "^4.1.1", @@ -55,31 +50,33 @@ "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.5.5", - "@babel/core": "7.5.5", - "@babel/plugin-proposal-class-properties": "7.5.5", - "@babel/plugin-transform-runtime": "7.5.5", - "@babel/preset-env": "7.5.5", + "@babel/core": "7.6.2", "babel-jest": "24.9.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "embark-testing": "^5.0.0", "eslint": "5.7.0", "jest": "24.9.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", "npm": ">=6.4.1", "yarn": ">=1.12.3" }, - "jest": { + "jest": { "collectCoverage": true, "testEnvironment": "node", "testMatch": [ "**/test/**/*.js" - ] + ], + "transform": { + "\\.js$": [ + "babel-jest", + { + "rootMode": "upward" + } + ] + } } } diff --git a/packages/stack/compiler/package.json b/packages/stack/compiler/package.json index a0911b2b7..d1baec54b 100644 --- a/packages/stack/compiler/package.json +++ b/packages/stack/compiler/package.json @@ -25,34 +25,33 @@ "files": [ "dist" ], + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "dependencies": { - "@babel/runtime-corejs2": "7.6.0", + "@babel/runtime-corejs2": "7.6.2", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/contracts-manager/package.json b/packages/stack/contracts-manager/package.json index 5bf3ce8f3..daa93081a 100644 --- a/packages/stack/contracts-manager/package.json +++ b/packages/stack/contracts-manager/package.json @@ -25,27 +25,28 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js,.ts\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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 typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "clone-deep": "4.0.0", "embark-core": "^4.1.1", @@ -54,14 +55,12 @@ "web3": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/deployment/babel.config.js b/packages/stack/deployment/babel.config.js deleted file mode 100644 index 245e0d859..000000000 --- a/packages/stack/deployment/babel.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('../../../babel.config.js'); diff --git a/packages/stack/deployment/package.json b/packages/stack/deployment/package.json index 9e4fa1fd3..c90ec0c3f 100644 --- a/packages/stack/deployment/package.json +++ b/packages/stack/deployment/package.json @@ -25,29 +25,24 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "test": "jest", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo", + "test": "jest" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "clone-deep": "4.0.0", "embark-core": "^4.1.1", @@ -55,31 +50,33 @@ "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.5.5", - "@babel/core": "7.5.5", - "@babel/plugin-proposal-class-properties": "7.5.5", - "@babel/plugin-transform-runtime": "7.5.5", - "@babel/preset-env": "7.5.5", + "@babel/core": "7.6.2", "babel-jest": "24.9.0", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "embark-testing": "^5.0.0", "eslint": "5.7.0", "jest": "24.9.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", "npm": ">=6.4.1", "yarn": ">=1.12.3" }, - "jest": { + "jest": { "collectCoverage": true, "testEnvironment": "node", "testMatch": [ "**/test/**/*.js" - ] + ], + "transform": { + "\\.js$": [ + "babel-jest", + { + "rootMode": "upward" + } + ] + } } } diff --git a/packages/stack/library-manager/package.json b/packages/stack/library-manager/package.json index 7f2b2dd50..ae6fb40c0 100644 --- a/packages/stack/library-manager/package.json +++ b/packages/stack/library-manager/package.json @@ -25,43 +25,34 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "colors": "1.3.2", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "rimraf": "3.0.0" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/namesystem/package.json b/packages/stack/namesystem/package.json index 252b34406..97dc1e1b0 100644 --- a/packages/stack/namesystem/package.json +++ b/packages/stack/namesystem/package.json @@ -26,39 +26,30 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "embark-i18n": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/pipeline/package.json b/packages/stack/pipeline/package.json index 1a5b41012..b9dbf999b 100644 --- a/packages/stack/pipeline/package.json +++ b/packages/stack/pipeline/package.json @@ -25,45 +25,36 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --copy-files --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "colors": "1.3.2", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", "find-up": "2.1.0", - "fs-extra": "7.0.1" + "fs-extra": "8.1.0" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/process-logs-api-manager/package.json b/packages/stack/process-logs-api-manager/package.json index 1d3a9d650..900c7fd81 100644 --- a/packages/stack/process-logs-api-manager/package.json +++ b/packages/stack/process-logs-api-manager/package.json @@ -25,39 +25,30 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/proxy/package.json b/packages/stack/proxy/package.json index 20f59f3ce..a8bb61bd4 100644 --- a/packages/stack/proxy/package.json +++ b/packages/stack/proxy/package.json @@ -25,26 +25,27 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".ts\",\".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "qa": "npm-run-all lint typecheck _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", + "solo": "embark-solo", "typecheck": "tsc", "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", "watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "cors": "2.8.5", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", @@ -54,14 +55,12 @@ "web3-core-requestmanager": "1.2.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", "tslint": "5.16.0", - "typescript": "3.4.5" + "typescript": "3.6.3" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/storage/package.json b/packages/stack/storage/package.json index 55f5292b9..e03f517c8 100644 --- a/packages/stack/storage/package.json +++ b/packages/stack/storage/package.json @@ -27,28 +27,23 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "clean": "npm run reset", - "lint": "npm-run-all lint:*", - "lint:js": "eslint processes.js 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", + "lint": "eslint processes.js src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "embark-core": "^4.1.1", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", @@ -56,14 +51,10 @@ "shelljs": "0.8.3" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/test-runner/package.json b/packages/stack/test-runner/package.json index 2d75f5bbf..a399e0d36 100644 --- a/packages/stack/test-runner/package.json +++ b/packages/stack/test-runner/package.json @@ -25,23 +25,18 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/lib/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch", - "test": "mocha dist/test/**/*.js" + "lint": "eslint src/", + "qa": "npm-run-all lint _build", + "reset": "npx rimraf .nyc_output dist embark-*.tgz package", + "solo": "embark-solo", + "test": "nyc --reporter=html --reporter=json mocha \"dist/test/**/*.js\" --exit --no-timeouts --require source-map-support/register" }, "eslintConfig": { "env": { @@ -50,13 +45,13 @@ "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "chalk": "2.4.2", "embark-i18n": "^4.1.1", "embark-testing": "5.0.0", "embark-utils": "^4.1.1", - "fs-extra": "7.0.1", + "fs-extra": "8.1.0", "istanbul-lib-coverage": "2.0.5", "istanbul-lib-report": "2.0.8", "istanbul-reports": "2.2.4", @@ -64,18 +59,16 @@ "open": "6.4.0" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", "@types/async": "2.0.50", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "mocha": "6.2.0", "npm-run-all": "4.1.5", + "nyc": "13.1.0", "refute": "1.0.2", "rimraf": "3.0.0", "sinon": "7.4.2", - "tslint": "5.16.0", - "typescript": "3.4.5" + "source-map-support": "0.5.13" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/watcher/package.json b/packages/stack/watcher/package.json index ee2ac1eb1..d99cbe3f6 100644 --- a/packages/stack/watcher/package.json +++ b/packages/stack/watcher/package.json @@ -25,41 +25,32 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "chokidar": "2.1.6", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/packages/stack/webserver/.babelrc.js b/packages/stack/webserver/.babelrc.js new file mode 100644 index 000000000..71fe1c0f7 --- /dev/null +++ b/packages/stack/webserver/.babelrc.js @@ -0,0 +1,58 @@ +/* global __dirname module require */ + +const cloneDeep = require('lodash.clonedeep'); +const {copySync, ensureDirSync} = require('fs-extra'); +const glob = require('glob'); +const {dirname, join, relative} = require('path'); + +// @babel/cli v7's --copy-files option does not work well together with +// config-specified ignore paths, and that's a problem for embark-collective +// actions since the @babel/cli invocation must be the same across all packages +// in the collective; so any package in the collective that excludes src/ files +// from transpilation via its package-local .babelrc.js should copy those files +// into dist/, but only if they are expected to be in dist/; .babelrc.js should +// also copy any non .js,.ts files into /dist + +// in this case we want we want to copy .ejs files + +function copyFiles (ignored) { + const others = glob.sync( + join(__dirname, 'src/**/*.*'), + {ignore: [ + join(__dirname, 'src/**/*.js'), + join(__dirname, 'src/**/*.ts'), + join(__dirname, 'src/**/*.disabled') + ]} + ).map(path => relative(__dirname, path)); + + ignored = ignored.concat(others); + ignored + .map(path => path.replace('src/', 'dist/')) + .forEach((dest, index) => { + ensureDirSync(dirname(join(__dirname, dest))); + const source = ignored[index]; + copySync(join(__dirname, source), join(__dirname, dest)); + }); +} + +module.exports = (api) => { + const env = api.env(); + + const base = {}; + + const node = cloneDeep(base); + + if (env === 'node') { + copyFiles([]); + return node; + } + + const test = cloneDeep(node); + + if (env === 'test') { + copyFiles([]); + return test; + } + + return base; +}; diff --git a/packages/stack/webserver/package.json b/packages/stack/webserver/package.json index 14d162621..8864ca0a9 100644 --- a/packages/stack/webserver/package.json +++ b/packages/stack/webserver/package.json @@ -25,28 +25,23 @@ "url": "https://github.com/embark-framework/embark.git" }, "main": "./dist/index.js", + "embark-collective": { + "build:node": true + }, "scripts": { - "build": "cross-env BABEL_ENV=node babel src --copy-files --extensions \".js\" --out-dir dist --root-mode upward --source-maps", + "_build": "npm run solo -- build", "ci": "npm run qa", "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", + "lint": "eslint src/", + "qa": "npm-run-all lint _build", "reset": "npx rimraf dist embark-*.tgz package", - "start": "npm run watch", - "// typecheck": "tsc", - "watch": "run-p watch:*", - "watch:build": "npm run build -- --verbose --watch", - "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + "solo": "embark-solo" }, "eslintConfig": { "extends": "../../../.eslintrc.json" }, "dependencies": { - "@babel/runtime-corejs2": "7.3.1", + "@babel/runtime-corejs2": "7.6.2", "async": "2.6.1", "embark-i18n": "^4.1.1", "embark-utils": "^4.1.1", @@ -57,14 +52,13 @@ "serve-static": "1.13.2" }, "devDependencies": { - "@babel/cli": "7.2.3", - "@babel/core": "7.2.2", - "cross-env": "5.2.0", + "embark-solo": "^4.1.1", "eslint": "5.7.0", + "fs-extra": "8.1.0", + "glob": "7.1.4", + "lodash.clonedeep": "4.5.0", "npm-run-all": "4.1.5", - "rimraf": "3.0.0", - "tslint": "5.16.0", - "typescript": "3.4.5" + "rimraf": "3.0.0" }, "engines": { "node": ">=8.12.0 <12.0.0", diff --git a/scripts/monorun.js b/scripts/monorun.js new file mode 100644 index 000000000..3e4e0d07a --- /dev/null +++ b/scripts/monorun.js @@ -0,0 +1,50 @@ +/* global process require */ + +// there seems to be a bug in yarn whereby forwarding arguments with -- like so: +// $ yarn monorun [...] -- --foo +// results in [...] being stripped away; can workaround with: +// $ yarn monorun -- [...] -- --foo +// but note that yarn warns about a future behavioral change re: yarn and -- + +const {dirname} = require('path'); +const {spawn} = require('child_process'); +const {sync: findUp} = require('find-up'); +const minimist = require('minimist'); + +const monorepoRootPath = dirname(findUp('lerna.json')); + +let cliArgs = process.argv.slice(2); + +const options = minimist( + cliArgs, + {boolean: [ + 'include-filtered-dependents', + 'include-filtered-dependencies', + 'no-bail', + 'no-prefix', + 'no-private', + 'no-progress', + 'no-sort', + 'parallel', + 'reject-cycles', + 'stream' + ]} +); + +Object.keys(options).forEach(key => { + const invKey = key.slice(3); + if (key.startsWith('no-') && options.hasOwnProperty(invKey)) { + options[key] = !options[invKey]; + delete options[invKey]; + } +}); + +process.env.EMBARK_COLLECTIVE_OPTIONS = JSON.stringify(options); + +if (cliArgs.includes('--scope')) { + cliArgs.push('--scope', 'embark-collective'); +} + +const npxCmd = process.platform === 'win32' ? 'npx.cmd': 'npx'; +process.chdir(monorepoRootPath); +spawn(npxCmd, ['lerna', 'run', ...cliArgs], {stdio: 'inherit'}); diff --git a/scripts/release.js b/scripts/release.js index a42c14aa4..ab8de20e7 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -5,7 +5,6 @@ const {execSync} = require('child_process'); const minimist = require('minimist'); const path = require('path'); const {prompt} = require('promptly'); -const semver = require('semver'); const args = minimist(process.argv.slice(2)); diff --git a/utils/.yarnrc b/utils/.yarnrc new file mode 100644 index 000000000..acaaffdb7 --- /dev/null +++ b/utils/.yarnrc @@ -0,0 +1 @@ +--install.no-lockfile true diff --git a/utils/collective/.npmrc b/utils/collective/.npmrc new file mode 100644 index 000000000..e031d3432 --- /dev/null +++ b/utils/collective/.npmrc @@ -0,0 +1,4 @@ +engine-strict = true +package-lock = false +save-exact = true +scripts-prepend-node-path = true diff --git a/utils/collective/README.md b/utils/collective/README.md new file mode 100644 index 000000000..504e4b5ae --- /dev/null +++ b/utils/collective/README.md @@ -0,0 +1,6 @@ +# `embark-collective` + +> You will be assimilated + +Visit [embark.status.im](https://embark.status.im/) to get started with +[Embark](https://github.com/embark-framework/embark). diff --git a/utils/collective/bin/collective b/utils/collective/bin/collective new file mode 100755 index 000000000..547bf1c3c --- /dev/null +++ b/utils/collective/bin/collective @@ -0,0 +1,5 @@ +#!/usr/bin/env node + +/* global process require */ + +require('..')(process.argv.slice(2)); diff --git a/utils/collective/index.js b/utils/collective/index.js new file mode 100644 index 000000000..0c72b514d --- /dev/null +++ b/utils/collective/index.js @@ -0,0 +1,198 @@ +/* global Buffer __dirname module process require */ + +const filterPackages = require('@lerna/filter-packages'); +const {fork, spawn} = require('child_process'); +const {sync: findUp} = require('find-up'); +const {readJsonSync} = require('fs-extra'); +const {sync: glob} = require('glob'); +const minimist = require('minimist'); +const {dirname, join, normalize, relative} = require('path'); +const { Transform } = require('stream'); + +module.exports = function (cliArgs = []) { + const {action, exclude, include, showPrivate} = processArgs(cliArgs); + + const allPackages = findAllMonorepoPackages(); + const allPkgJsons = allPackages.map(path => readJsonSync(path)); + + const filteredPkgJsons = filterPkgJsons( + allPkgJsons, + {action, exclude, include, showPrivate} + ); + + const pkgJsonDict = makePkgJsonDict( + allPackages, + allPkgJsons, + filteredPkgJsons + ); + + switch (action) { + case 'build:browser': + buildBrowser(cliArgs.slice(1), pkgJsonDict); + break; + case 'build:node': + buildNode(cliArgs.slice(1), pkgJsonDict); + break; + default: + throw new Error(`no implementation for ${action} action`); + } +}; + +function processArgs(cliArgs) { + let options; + if (process.env.EMBARK_COLLECTIVE_OPTIONS) { + options = JSON.parse(process.env.EMBARK_COLLECTIVE_OPTIONS); + } else { + options = {}; + } + + const solo = !!process.env.EMBARK_SOLO; + + const args = minimist(cliArgs); + + Object.keys(args).forEach(key => { + const invKey = key.slice(3); + if (key.startsWith('no-') && args.hasOwnProperty(invKey)) { + args[key] = !args[invKey]; + delete args[invKey]; + } + }); + + const np = 'no-private'; + args.ignore = [].concat(options.ignore || [], args.ignore || []); + args[np] = !!options[np]; + args.scope = [].concat(options.scope || [], args.scope || []); + if (!args._[0]) args._[0] = 'start'; + + // scripts/monorun.js (in the monorepo root) forwards other `lerna run` + // options as well, e.g. `stream` and `parallel`; for now only make use of + // ignore, scope, and no-private; can consider implementing support for the + // others if desirable/needed in the context of collective actions + + const {_: [action], ignore: exclude, [np]: noPrivate, scope: include} = args; + const showPrivate = !noPrivate; + + return {action, exclude, include, showPrivate}; +} + +let _monorepoRootPath = null; +const lernaJson = 'lerna.json'; +function monorepoRootPath() { + if (_monorepoRootPath === null) { + _monorepoRootPath = dirname(findUp(lernaJson, {cwd: __dirname})); + } + + return _monorepoRootPath; +} + +const globArgs = [ + '**/package.json', + { + cwd: monorepoRootPath(), + ignore: [ + '**/node_modules/**', + 'package.json', + 'scripts/**', + 'site/**' + ] + } +]; + +function findAllMonorepoPackages() { + return glob(...globArgs).map(path => join(monorepoRootPath(), path)); +} + +function filterPkgJsons(pkgJsons, {action, exclude, include, showPrivate}) { + const embarkCollective = 'embark-collective'; + return filterPackages( + pkgJsons, + include, + exclude, + showPrivate + ).filter(pkgJson => ( + pkgJson && pkgJson[embarkCollective] && pkgJson[embarkCollective][action] && + !(pkgJson.scripts && pkgJson.scripts[action]) + )); +} + +function makePkgJsonDict(allPackages, allPkgJsons, filteredPkgJsons) { + const allPkgJsonDict = {}; + const filteredPkgJsonDict = {}; + + allPkgJsons.forEach(({name}, index) => { + allPkgJsonDict[name] = allPackages[index]; + }); + + filteredPkgJsons.forEach(({name}) => { + filteredPkgJsonDict[name] = allPkgJsonDict[name]; + }); + + return filteredPkgJsonDict; +} + +function labeler(label) { + return new Transform({ + transform(chunk, _encoding, callback) { + chunk = Buffer.from( + `[${label}] ${chunk.toString()}` + ); + callback(null, chunk); + } + }); +} + +function build(babelEnv, outDir, cliArgs, pkgJsonDict) { + const rootPath = monorepoRootPath(); + + const babelCmd = process.platform === 'win32' ? 'babel.cmd': 'babel'; + const babelBinPath = join(__dirname, 'node_modules', '.bin', babelCmd); + const babelConfigPath = join(rootPath, 'babel.config.js'); + + const sources = Object.values(pkgJsonDict).map( + path => relative(rootPath, join(dirname(path), 'src')) + ); + + if (!sources.length) { + return; + } + + process.chdir(rootPath); + + const subp = spawn(babelBinPath, [ + ...sources, + '--config-file', + babelConfigPath, + '--extensions', + '.js,.ts', + '--out-dir', + normalize(`../${outDir}`), + '--relative', + '--source-maps', + ...cliArgs + ], { + env: { + ...process.env, + BABEL_ENV: babelEnv + }, + stdio: ['inherit', 'pipe', 'pipe'] + }); + + subp.stdout.pipe(labeler(`build:${babelEnv}`)).pipe(process.stdout); + subp.stderr.pipe(labeler(`build:${babelEnv}`)).pipe(process.stderr); +} + +function buildBrowser(cliArgs, pkgJsonDict) { + build('browser', 'dist/browser', cliArgs, pkgJsonDict); +} + +function buildNode(cliArgs, pkgJsonDict) { + build('node', 'dist', cliArgs, pkgJsonDict); +} + +const embarkInsidePkg = 'embark-inside-monorepo'; +try { + require.resolve(embarkInsidePkg, {paths: [__dirname]}); +} catch (err) { + const dir = dirname(findUp('package.json', {cwd: __dirname})); + throw new Error(`package at ${dir} is not inside embark's monorepo`); +} diff --git a/utils/collective/package.json b/utils/collective/package.json new file mode 100644 index 000000000..ef26fa47a --- /dev/null +++ b/utils/collective/package.json @@ -0,0 +1,62 @@ +{ + "name": "embark-collective", + "version": "4.1.1", + "author": "Michael Bradley (https://github.com/michaelsbradleyjr/)", + "description": "You will be assimilated", + "keywords": [], + "license": "MIT", + "bin": "./bin/collective", + "main": "index.js", + "files": [], + "scripts": { + "build": "run-p build:node build:browser", + "build:browser": "node bin/collective build:browser", + "build:browser:watch": "node bin/collective build:browser --verbose --watch", + "build:node": "node bin/collective build:node", + "build:node:watch": "node bin/collective build:node --verbose --watch", + "build:watch": "run-p build:node:watch build:browser:watch", + "// ci": "npm run qa", + "// clean": "node bin/collective reset", + "// lint": "node bin/collective lint", + "// lint:fix": "npm run lint -- --fix", + "// qa": "run-s typecheck lint test build", + "// reset": "node bin/collective reset", + "start": "npm run watch", + "// start:fix": "npm run watch+fix", + "// test": "node bin/collective test", + "// typecheck": "node bin/collective typecheck", + "watch": "run-p watch:*", + "// watch+fix": "run-p watch:build watch:lint:fix watch:test watch:typecheck", + "watch:build": "npm run build:watch", + "// watch:lint": "npm run lint -- --watch", + "// watch:lint:fix": "npm run lint -- --fix --watch", + "// watch:test": "npm run test -- --watch", + "// watch:typecheck": "npm run typecheck -- --preserveWatchOutput --watch" + }, + "devDependencies": { + "@babel/cli": "7.6.2", + "@babel/core": "7.6.2", + "@babel/plugin-proposal-class-properties": "7.5.5", + "@babel/plugin-proposal-decorators": "7.6.0", + "@babel/plugin-proposal-optional-chaining": "7.6.0", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-transform-runtime": "7.6.2", + "@babel/preset-env": "7.6.2", + "@babel/preset-typescript": "7.6.0", + "@lerna/filter-packages": "3.16.0", + "babel-plugin-dynamic-import-node": "2.3.0", + "babel-plugin-macros": "2.6.1", + "embark-inside-monorepo": "^4.1.1", + "find-up": "4.1.0", + "fs-extra": "8.1.0", + "glob": "7.1.4", + "lodash.clonedeep": "4.5.0", + "minimist": "1.2.0", + "npm-run-all": "4.1.5" + }, + "engines": { + "node": ">=8.12.0 <12.0.0", + "npm": ">=6.4.1", + "yarn": ">=1.12.3" + } +} diff --git a/utils/solo/.npmrc b/utils/solo/.npmrc new file mode 100644 index 000000000..e031d3432 --- /dev/null +++ b/utils/solo/.npmrc @@ -0,0 +1,4 @@ +engine-strict = true +package-lock = false +save-exact = true +scripts-prepend-node-path = true diff --git a/utils/solo/README.md b/utils/solo/README.md new file mode 100644 index 000000000..1ac4aa531 --- /dev/null +++ b/utils/solo/README.md @@ -0,0 +1,6 @@ +# `embark-solo` + +> Resistance is not futile? + +Visit [embark.status.im](https://embark.status.im/) to get started with +[Embark](https://github.com/embark-framework/embark). diff --git a/utils/solo/bin/solo b/utils/solo/bin/solo new file mode 100755 index 000000000..547bf1c3c --- /dev/null +++ b/utils/solo/bin/solo @@ -0,0 +1,5 @@ +#!/usr/bin/env node + +/* global process require */ + +require('..')(process.argv.slice(2)); diff --git a/utils/solo/index.js b/utils/solo/index.js new file mode 100644 index 000000000..ed95f48f7 --- /dev/null +++ b/utils/solo/index.js @@ -0,0 +1,29 @@ +/* global __dirname module process require */ + +const {spawn} = require('child_process'); +const {sync: findUp} = require('find-up'); +const {readJsonSync, realpathSync} = require('fs-extra'); +const {join} = require('path'); + +module.exports = function (cliArgs) { + process.env.EMBARK_SOLO='t'; + + const pkgName = readJsonSync(findUp('package.json')).name; + + const options = { + scope: pkgName + }; + + process.env.EMBARK_COLLECTIVE_OPTIONS = JSON.stringify(options); + + const embarkCollectivePath = realpathSync(findUp( + 'node_modules/embark-collective', {cwd: __dirname, type: 'directory'} + )); + + const embarkCollectivePkgJson = readJsonSync( + join(embarkCollectivePath, 'package.json') + ); + + process.chdir(embarkCollectivePath); + spawn('npm', ['run', '--', ...cliArgs], {stdio: 'inherit'}); +}; diff --git a/utils/solo/package.json b/utils/solo/package.json new file mode 100644 index 000000000..fa788e5a6 --- /dev/null +++ b/utils/solo/package.json @@ -0,0 +1,23 @@ +{ + "name": "embark-solo", + "private": true, + "version": "4.1.1", + "author": "Michael Bradley (https://github.com/michaelsbradleyjr/)", + "description": "Resistance is not futile?", + "keywords": [], + "license": "MIT", + "bin": "./bin/solo", + "main": "index.js", + "files": [], + "scripts": {}, + "devDependencies": { + "embark-collective": "^4.1.1", + "find-up": "4.1.0", + "fs-extra": "8.1.0" + }, + "engines": { + "node": ">=8.12.0 <12.0.0", + "npm": ">=6.4.1", + "yarn": ">=1.12.3" + } +} diff --git a/yarn.lock b/yarn.lock index 951f413a9..1a3cafc33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,10 +19,10 @@ optionalDependencies: chokidar "^2.0.3" -"@babel/cli@7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.5.5.tgz#bdb6d9169e93e241a08f5f7b0265195bf38ef5ec" - integrity sha512-UHI+7pHv/tk9g6WXQKYz+kmXTI77YtuY3vqC59KIqcoWEjsJJSG6rAxKaLsgj3LDyadsPrCB929gVOKM6Hui0w== +"@babel/cli@7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.2.tgz#4ce8b5b4b2e4b4c1b7bd841cec62085e2dfc4465" + integrity sha512-JDZ+T/br9pPfT2lmAMJypJDTTTHM9ePD/ED10TRjRzJVdEVy+JB3iRlhzYmTt5YkNgHvxWGlUVnLtdv6ruiDrQ== dependencies: commander "^2.8.1" convert-source-map "^1.1.0" @@ -34,7 +34,7 @@ slash "^2.0.0" source-map "^0.5.0" optionalDependencies: - chokidar "^2.0.4" + chokidar "^2.1.8" "@babel/code-frame@7.0.0": version "7.0.0" @@ -110,6 +110,26 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/core@7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz#069a776e8d5e9eefff76236bc8845566bd31dd91" + integrity sha512-l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.6.2" + "@babel/helpers" "^7.6.2" + "@babel/parser" "^7.6.2" + "@babel/template" "^7.6.0" + "@babel/traverse" "^7.6.2" + "@babel/types" "^7.6.0" + convert-source-map "^1.1.0" + debug "^4.1.0" + json5 "^2.1.0" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + "@babel/generator@^7.2.2", "@babel/generator@^7.4.0", "@babel/generator@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf" @@ -132,6 +152,16 @@ source-map "^0.5.0" trim-right "^1.0.1" +"@babel/generator@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz#dac8a3c2df118334c2a29ff3446da1636a8f8c03" + integrity sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ== + dependencies: + "@babel/types" "^7.6.0" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/helper-annotate-as-pure@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32" @@ -337,6 +367,15 @@ "@babel/traverse" "^7.6.0" "@babel/types" "^7.6.0" +"@babel/helpers@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153" + integrity sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA== + dependencies: + "@babel/template" "^7.6.0" + "@babel/traverse" "^7.6.2" + "@babel/types" "^7.6.0" + "@babel/highlight@^7.0.0": version "7.5.0" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540" @@ -356,6 +395,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.0.tgz#3e05d0647432a8326cb28d0de03895ae5a57f39b" integrity sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ== +"@babel/parser@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz#205e9c95e16ba3b8b96090677a67c9d6075b70a1" + integrity sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg== + "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" @@ -432,6 +476,14 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-object-rest-spread" "^7.2.0" +"@babel/plugin-proposal-object-rest-spread@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096" + integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-proposal-optional-catch-binding@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5" @@ -457,6 +509,15 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.5.4" +"@babel/plugin-proposal-unicode-property-regex@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802" + integrity sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.6.0" + "@babel/plugin-syntax-async-generators@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f" @@ -558,7 +619,7 @@ "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.13" -"@babel/plugin-transform-block-scoping@^7.6.0": +"@babel/plugin-transform-block-scoping@^7.6.0", "@babel/plugin-transform-block-scoping@^7.6.2": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz#96c33ab97a9ae500cc6f5b19e04a7e6553360a79" integrity sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ== @@ -610,6 +671,15 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.5.4" +"@babel/plugin-transform-dotall-regex@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9" + integrity sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.6.0" + "@babel/plugin-transform-duplicate-keys@^7.5.0": version "7.5.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853" @@ -715,7 +785,7 @@ dependencies: regexp-tree "^0.1.6" -"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0": +"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0", "@babel/plugin-transform-named-capturing-groups-regex@^7.6.2": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz#c1ca0bb84b94f385ca302c3932e870b0fb0e522b" integrity sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g== @@ -837,6 +907,16 @@ resolve "^1.8.1" semver "^5.5.1" +"@babel/plugin-transform-runtime@7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz#2669f67c1fae0ae8d8bf696e4263ad52cb98b6f8" + integrity sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-shorthand-properties@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" @@ -851,6 +931,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-transform-spread@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd" + integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-transform-sticky-regex@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1" @@ -892,6 +979,15 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.5.4" +"@babel/plugin-transform-unicode-regex@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698" + integrity sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.6.0" + "@babel/polyfill@^7.0.0": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.4.4.tgz#78801cf3dbe657844eeabf31c1cae3828051e893" @@ -1012,6 +1108,62 @@ js-levenshtein "^1.1.3" semver "^5.5.0" +"@babel/preset-env@7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz#abbb3ed785c7fe4220d4c82a53621d71fc0c75d3" + integrity sha512-Ru7+mfzy9M1/YTEtlDS8CD45jd22ngb9tXnn64DvQK3ooyqSw9K4K9DUWmYknTTVk4TqygL9dqCrZgm1HMea/Q== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-async-generator-functions" "^7.2.0" + "@babel/plugin-proposal-dynamic-import" "^7.5.0" + "@babel/plugin-proposal-json-strings" "^7.2.0" + "@babel/plugin-proposal-object-rest-spread" "^7.6.2" + "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.6.2" + "@babel/plugin-syntax-async-generators" "^7.2.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" + "@babel/plugin-syntax-json-strings" "^7.2.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" + "@babel/plugin-transform-arrow-functions" "^7.2.0" + "@babel/plugin-transform-async-to-generator" "^7.5.0" + "@babel/plugin-transform-block-scoped-functions" "^7.2.0" + "@babel/plugin-transform-block-scoping" "^7.6.2" + "@babel/plugin-transform-classes" "^7.5.5" + "@babel/plugin-transform-computed-properties" "^7.2.0" + "@babel/plugin-transform-destructuring" "^7.6.0" + "@babel/plugin-transform-dotall-regex" "^7.6.2" + "@babel/plugin-transform-duplicate-keys" "^7.5.0" + "@babel/plugin-transform-exponentiation-operator" "^7.2.0" + "@babel/plugin-transform-for-of" "^7.4.4" + "@babel/plugin-transform-function-name" "^7.4.4" + "@babel/plugin-transform-literals" "^7.2.0" + "@babel/plugin-transform-member-expression-literals" "^7.2.0" + "@babel/plugin-transform-modules-amd" "^7.5.0" + "@babel/plugin-transform-modules-commonjs" "^7.6.0" + "@babel/plugin-transform-modules-systemjs" "^7.5.0" + "@babel/plugin-transform-modules-umd" "^7.2.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.2" + "@babel/plugin-transform-new-target" "^7.4.4" + "@babel/plugin-transform-object-super" "^7.5.5" + "@babel/plugin-transform-parameters" "^7.4.4" + "@babel/plugin-transform-property-literals" "^7.2.0" + "@babel/plugin-transform-regenerator" "^7.4.5" + "@babel/plugin-transform-reserved-words" "^7.2.0" + "@babel/plugin-transform-shorthand-properties" "^7.2.0" + "@babel/plugin-transform-spread" "^7.6.2" + "@babel/plugin-transform-sticky-regex" "^7.2.0" + "@babel/plugin-transform-template-literals" "^7.4.4" + "@babel/plugin-transform-typeof-symbol" "^7.2.0" + "@babel/plugin-transform-unicode-regex" "^7.6.2" + "@babel/types" "^7.6.0" + browserslist "^4.6.0" + core-js-compat "^3.1.1" + invariant "^2.2.2" + js-levenshtein "^1.1.3" + semver "^5.5.0" + "@babel/preset-flow@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2" @@ -1063,10 +1215,10 @@ core-js "^2.5.7" regenerator-runtime "^0.12.0" -"@babel/runtime-corejs2@7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.6.0.tgz#6fcd37c2580070817d62f219db97f67e26f50f9c" - integrity sha512-zbPQzlbyJab2xCYb6VaESn8Tk/XiVpQJU7WvIKiQCwlFyc2NSCzKjqtBXCvpZBbiTOHCx10s2656REVnySwb+A== +"@babel/runtime-corejs2@7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.6.2.tgz#062f8e31f3df30fc1a3dea68aa1bd854e06e9ba6" + integrity sha512-wdyVKnTv9Be4YlwF/7pByYNfcl23qC21aAQ0aIaZOo2ZOvhFEyJdBLJClYZ9i+Pmrz7sUQgg/MwbJa2RZTkygg== dependencies: core-js "^2.6.5" regenerator-runtime "^0.13.2" @@ -1148,6 +1300,21 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/traverse@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz#b0e2bfd401d339ce0e6c05690206d1e11502ce2c" + integrity sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.6.2" + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/parser" "^7.6.2" + "@babel/types" "^7.6.0" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a" @@ -1249,7 +1416,7 @@ "@emotion/utils" "0.11.2" "@emotion/weak-memoize" "0.2.3" -"@emotion/core@^0.13.1": +"@emotion/core@0.13.1", "@emotion/core@^0.13.1": version "0.13.1" resolved "https://registry.yarnpkg.com/@emotion/core/-/core-0.13.1.tgz#4fa4983e18dbf089fa16584486c8033ca50013ea" integrity sha512-5qzKP6bTe2Ah7Wvh1sgtzgy6ycdpxwgMAjQ/K/VxvqBxveG9PCpq+Z0GdVg7Houb1AwYjTfNtXstjSk4sqi/7g== @@ -1373,7 +1540,7 @@ "@emotion/serialize" "^0.11.9" "@emotion/utils" "0.11.2" -"@emotion/styled@^0.10.6": +"@emotion/styled@0.10.6", "@emotion/styled@^0.10.6": version "0.10.6" resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-0.10.6.tgz#1f6af1d3d4bf9fdeb05a4d220046ce11ad21a7ca" integrity sha512-DFNW8jlMjy1aYCj/PKsvBoJVZAQXzjmSCwtKXLs31qZzNPaUEPbTYSIKnMUtIiAOYsu0pUTGXM+l0a+MYNm4lA== @@ -3178,16 +3345,16 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.3.tgz#27b3f40addaf2f580459fdb405222685542f907a" integrity sha512-3SiLAIBkDWDg6vFo0+5YJyHPWU9uwu40Qe+v+0MH8wRKYBimHvvAOyk3EzMrD/TrIlLYfXrqDqrg913PynrMJQ== -"@types/node@10.11.7": - version "10.11.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.7.tgz#0e75ca9357d646ca754016ca1d68a127ad7e7300" - integrity sha512-yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg== - "@types/node@11.11.6": version "11.11.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a" integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ== +"@types/node@12.7.8": + version "12.7.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.8.tgz#cb1bf6800238898bc2ff6ffa5702c3cadd350708" + integrity sha512-FMdVn84tJJdV+xe+53sYiZS4R5yn1mAIxfj+DVoNiQjTYz1+OYmjwEZr1ev9nU0axXwda0QDbYl06QHanRVH3A== + "@types/node@^10.3.2": version "10.14.17" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.17.tgz#b96d4dd3e427382482848948041d3754d40fd5ce" @@ -3575,12 +3742,26 @@ acorn-jsx@^5.0.0, acorn-jsx@^5.0.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== +acorn-node@^1.3.0: + version "1.8.2" + resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== + dependencies: + acorn "^7.0.0" + acorn-walk "^7.0.0" + xtend "^4.0.2" + acorn-walk@^6.0.1: version "6.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== -"acorn@>= 2.5.2 <= 5.7.3", acorn@^5.5.0, acorn@^5.5.3: +acorn-walk@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.0.0.tgz#c8ba6f0f1aac4b0a9e32d1f0af12be769528f36b" + integrity sha512-7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg== + +"acorn@>= 2.5.2 <= 5.7.3", acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== @@ -4332,13 +4513,6 @@ babel-plugin-add-react-displayname@^0.0.5: resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5" integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U= -babel-plugin-dynamic-import-node@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.2.0.tgz#c0adfb07d95f4a4495e9aaac6ec386c4d7c2524e" - integrity sha512-fP899ELUnTaBcIzmrW7nniyqqdYWrWuJUyPWHxFa/c7r7hS6KC8FscNfLlBNIoPSc55kYMGEEKjPjJGCLbE1qA== - dependencies: - object.assign "^4.1.0" - babel-plugin-dynamic-import-node@2.3.0, babel-plugin-dynamic-import-node@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" @@ -5521,7 +5695,7 @@ chokidar@2.1.6: optionalDependencies: fsevents "^1.2.7" -chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4: +chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4, chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== @@ -6674,6 +6848,11 @@ dargs@^4.0.1: dependencies: number-is-nan "^1.0.0" +dash-ast@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dash-ast/-/dash-ast-1.0.0.tgz#12029ba5fb2f8aa6f0a861795b23c1b4b6c27d37" + integrity sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA== + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -10499,6 +10678,18 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" +hyperscript-attribute-to-property@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/hyperscript-attribute-to-property/-/hyperscript-attribute-to-property-1.0.2.tgz#66ad4164f88beefacf46ec884bd3d1173c1c382a" + integrity sha512-oerMul16jZCmrbNsUw8QgrtDzF8lKgFri1bKQjReLw1IhiiNkI59CWuzZjJDGT79UQ1YiWqXhJMv/tRMVqgtkA== + +hyperx@^2.0.3: + version "2.5.4" + resolved "https://registry.yarnpkg.com/hyperx/-/hyperx-2.5.4.tgz#72b4c3ed4111f64838221a9d0409e6bfc3f78d9e" + integrity sha512-iOkSh7Yse7lsN/B9y7OsevLWjeXPqGuHQ5SbwaiJM5xAhWFqhoN6erpK1dQsS12OFU36lyai1pnx1mmzWLQqcA== + dependencies: + hyperscript-attribute-to-property "^1.0.0" + i18n@0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.8.3.tgz#2d8cf1c24722602c2041d01ba6ae5eaa51388f0e" @@ -10967,7 +11158,7 @@ is-buffer@^1.0.2, is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.2, is-buffer@~2.0.3: +is-buffer@^2.0.0, is-buffer@^2.0.2, is-buffer@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== @@ -11843,6 +12034,11 @@ jquery@3.4.0: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf" integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ== +jquery@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" + integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== + js-base64@^2.1.8: version "2.5.1" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" @@ -12778,6 +12974,13 @@ macos-release@^2.2.0: resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA== +magic-string@^0.23.2: + version "0.23.2" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.23.2.tgz#204d7c3ea36c7d940209fcc54c39b9f243f13369" + integrity sha512-oIUZaAxbcxYIp4AyLafV6OVKoB3YouZs0UTCJ8mOKBHNyJgGDaMJ4TgA+VylJh6fx7EQCC52XkbURxxG9IoJXA== + dependencies: + sourcemap-codec "^1.4.1" + 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" @@ -13050,6 +13253,13 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge-source-map@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f" + integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8= + dependencies: + source-map "^0.5.6" + merge-source-map@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" @@ -13503,6 +13713,11 @@ mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mutexify@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mutexify/-/mutexify-1.2.0.tgz#45597975a2b035f56dcf61ff15cc8d73c28e7639" + integrity sha512-oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ== + mz@^2.5.0, mz@^2.6.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -13527,6 +13742,21 @@ nano-json-stream-parser@^0.1.2: resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18= +nanoassert@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/nanoassert/-/nanoassert-1.1.0.tgz#4f3152e09540fde28c76f44b19bbcd1d5a42478d" + integrity sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40= + +nanobench@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/nanobench/-/nanobench-2.1.1.tgz#c2f23fcce116d50b4998b1954ba114674c137269" + integrity sha512-z+Vv7zElcjN+OpzAxAquUayFLGK3JI/ubCl0Oh64YQqsTGG09CGqieJVQw4ui8huDnnAgrvTv93qi5UaOoNj8A== + dependencies: + browser-process-hrtime "^0.1.2" + chalk "^1.1.3" + mutexify "^1.1.0" + pretty-hrtime "^1.0.2" + nanoid@^1.0.2: version "1.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-1.3.4.tgz#ad89f62c9d1f4fd69710d4a90953d2893d2d31f4" @@ -14240,6 +14470,14 @@ on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== +on-load@^3.2.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/on-load/-/on-load-3.4.1.tgz#e554d0e025f29c8692e91c4c3fcf50d0c2bb9142" + integrity sha512-Q3v6aurn5Pif4Rk1QZhnH/azZiKZqiroCcRkPlEccwTl4UFomAGFAqZz8XRCGN/KtuX4DwXCn9SB/edSSoV+Hg== + dependencies: + global "^4.3.2" + nanoassert "^1.1.0" + once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -14813,7 +15051,7 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -perfect-scrollbar@^1.4.0: +perfect-scrollbar@1.4.0, perfect-scrollbar@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz#5d014ef9775e1f43058a1dbae9ed1daf0e7091f1" integrity sha512-/2Sk/khljhdrsamjJYS5NjrH+GKEHEwh7zFSiYyxROyYKagkE4kSn2zDQDRTOMo8mpT2jikxx6yI1dG7lNP/hw== @@ -14962,7 +15200,7 @@ polished@^3.3.1: dependencies: "@babel/runtime" "^7.4.5" -popper.js@^1.14.1, popper.js@^1.14.4, popper.js@^1.14.7: +popper.js@1.15.0, popper.js@^1.14.1, popper.js@^1.14.4, popper.js@^1.14.7: version "1.15.0" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2" integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA== @@ -15745,7 +15983,7 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -pretty-hrtime@^1.0.3: +pretty-hrtime@^1.0.2, pretty-hrtime@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= @@ -16610,7 +16848,7 @@ react-router-redux@^4.0.0: resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.8.tgz#227403596b5151e182377dab835b5d45f0f8054e" integrity sha1-InQDWWtRUeGCN32rg1tdRfD4BU4= -react-router@^4.3.1: +react-router@4.3.1, react-router@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg== @@ -18636,6 +18874,11 @@ source-map@~0.2.0: dependencies: amdefine ">=0.0.4" +sourcemap-codec@^1.4.1: + version "1.4.6" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9" + integrity sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg== + space-separated-tokens@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.2.tgz#e95ab9d19ae841e200808cd96bc7bd0adbbb3412" @@ -19497,7 +19740,7 @@ throat@^4.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= -through2@^2.0.0, through2@^2.0.2, through2@^2.0.3: +through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -19676,6 +19919,19 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +transform-ast@^2.2.1: + version "2.4.4" + resolved "https://registry.yarnpkg.com/transform-ast/-/transform-ast-2.4.4.tgz#bebf494e2e73f024746f76348bc86a5992851d00" + integrity sha512-AxjeZAcIOUO2lev2GDe3/xZ1Q0cVGjIMk5IsriTy8zbWlsEnjeB025AhkhBJHoy997mXpLd4R+kRbvnnQVuQHQ== + dependencies: + acorn-node "^1.3.0" + convert-source-map "^1.5.1" + dash-ast "^1.0.0" + is-buffer "^2.0.0" + magic-string "^0.23.2" + merge-source-map "1.0.4" + nanobench "^2.1.1" + trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" @@ -19852,10 +20108,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@3.4.5: - version "3.4.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99" - integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw== +typescript@3.6.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da" + integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw== ua-parser-js@^0.7.18: version "0.7.20" @@ -21714,7 +21970,7 @@ xregexp@^2.0.0: resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM= -xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -21947,6 +22203,18 @@ yauzl@^2.4.2: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +yo-yoify@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/yo-yoify/-/yo-yoify-4.3.0.tgz#efed05310e104700ec544ab1765cbe69b861ce7c" + integrity sha512-txj2+d99KbSg3+GvFawb04vwB7dnIvERzxfndOogbiumKlKKbMR+zFyHInZfdGXDswIo7ce3ZExxD4sb8mD87g== + dependencies: + acorn "^5.0.0" + convert-source-map "^1.5.1" + hyperx "^2.0.3" + on-load "^3.2.0" + through2 "^2.0.1" + transform-ast "^2.2.1" + zeppelin-solidity@1.12.0: version "1.12.0" resolved "https://registry.yarnpkg.com/zeppelin-solidity/-/zeppelin-solidity-1.12.0.tgz#427edf8e0041ec8600875d3cb8fc9395f33ccfff"