build: make DApp templates member packages of the monorepo

Previously, templates were in a subdirectory of `packages/embark`. Reorganize
them so that they are member packages of the monorepo. This allows them to
cleanly depend on other members of the monorepo,
e.g. `embarkjs-connector-web3`.

It is desirable for the templates, in the context of the monorepo, to specify
embark as a dependency, to take advantage of `npx embark test` (and it's a
"forward looking" setup re: how we plan to evolve embark). However, if embark
were to specify the template packages as dependencies a circular relationship
would be introduced, which is [unsupported by Lerna][circular]. Therefore,
revise the template generator so that all templates are resolved / fetched at
runtime, i.e. `boilerplate`, `demo`, and `simple` are no longer
"built-ins" *per se*. This change won't be apparent to embark's users, but it
does mean that the template generator won't work (in a production install of
embark) if it can't connect to the npm registry, i.e. when the user runs
`embark demo` or `embark new [--simple]`. When embark is inside the monorepo,
templates are resolved and copied from the yarn workspace rather than being
fetched from the registry, which is convenient for development. Also, any
template dependencies that are members of the monorepo are linked into the
copied template's `node_modules` rather than being installed from the registry,
again for convenience. During template generation, remove scripts and
dependencies that pertain only to membership in the monorepo; for now, that
involves removing embark as a dependency since we're not quite ready for that
arrangement to be the default, i.e. outside of the monorepo.

Refactor the root scripts so that more of them can consistently be used with
Lerna's filter options, e.g. `--scope` and `--ignore`. "Combo" scripts that
don't support filtering generally have a `:full` postfix.

Flip `clean` and `reset` scripts at the root and in the member packages for
consistency re: Lerna's notion of `clean` and embark's notion of `reset`. Have
each package run its `reset` script when its `clean` script is invoked (and
that's all for now), relying on `lerna clean` to delete packages'
`node_modules` in view of how Lerna's topological sorting works.

Lift the implementation of `embark reset` into a private package in
`packages/embark-reset` and make it a bundled dependency of embark. Packages in
`dapps/*` depend on `embark-reset` directly and make use of it with `npx
embark-reset` (but only in monorepo context). This removes a "wart" where
reboots could show errors when embark's sources aren't already built in
`packages/embark/dist`. Users will not notice any difference since `embark
reset` works as before, transparently making use of the `embark-reset`
package. The only downside to having it be a bundled dependency of embark is
that bundled deps have all of their `node_modules` included in the tarball
built with `npm pack` (that's why having the templates as bundled dependencies
of embark isn't a viable approach). However, `embark-reset` only has one
dependency, `rimraf`, which is a tiny module, so the cost seems acceptable.

As part of the reorganization, move `test_dapps` into `dapps/tests` and
`packages/embark/templates` into `dapps/templates`. Keep the directory names
short but revise the package names to facilitate simple filtering with
`embark-dapp-*`. Consolidate `.yarnrc` and `.gitignore` and clean up some
redundant ignore listings.

Scripts run with `--scope embark-dapp-*` use `--concurrency=1` to avoid
conflicts that could arise over network ports. The `ci:full` and `qa:full`
scripts use `--concurrency=1` in all scopes, for two reasons: resource
limitations on Travis and AppVeyor result in slower runs with concurrency >1,
and if something fails in those contexts it's easier to see what went wrong
when Lerna's output isn't interleaved from a bunch of scripts in `packages/*`.

Bump the Lerna version.

[circular]: https://github.com/lerna/lerna/issues/1198#issuecomment-442278902
This commit is contained in:
Michael Bradley, Jr 2019-02-25 14:47:54 -06:00 committed by Michael Bradley
parent f957ba55dd
commit de0f02d00a
184 changed files with 1041 additions and 769 deletions

View File

@ -32,4 +32,4 @@ before_install:
install: install:
- echo embark installation managed by package.json script 'ci' - echo embark installation managed by package.json script 'ci'
script: script:
- npm run ci - npm run ci:full

View File

@ -29,5 +29,5 @@ install:
- yarn --version - yarn --version
- echo embark installation managed by package.json script 'ci' - echo embark installation managed by package.json script 'ci'
test_script: test_script:
- npm run ci - npm run ci:full
build: off build: off

View File

@ -1,8 +1,5 @@
**/.embark **/.embark
**/chains.json **/chains.json
**/config/production/password
**/config/livenet/password **/config/livenet/password
**/coverage **/config/production/password
**/dist
**/embarkArtifacts **/embarkArtifacts
**/node_modules

View File

@ -0,0 +1,2 @@
livenet/password
production/password

View File

@ -1,7 +1,8 @@
.embark .embark
chains.json chains.json
config/production/password
config/livenet/password config/livenet/password
config/production/password
coverage coverage
dist dist
embarkArtifacts
node_modules node_modules

View File

@ -0,0 +1,32 @@
{
"name": "embark-dapp-template-boilerplate",
"version": "4.0.0-beta.0",
"description": "",
"files": [
"app",
"config",
"contracts",
"dot.gitignore",
"dot.npmrc",
"embark.json",
"test"
],
"scripts": {
"ci": "npm run qa",
"clean": "npm run reset",
"package": "npm pack",
"qa": "npm-run-all test package",
"reset": "npx embark-reset && npx rimraf embark-*.tgz package",
"test": "npx embark test"
},
"keywords": [],
"author": "",
"license": "MIT",
"devDependencies": {
"embark": "^4.0.0-beta.0",
"embark-reset": "^4.0.0-beta.0",
"embarkjs-connector-web3": "^4.0.0-beta.0",
"npm-run-all": "4.1.5",
"rimraf": "2.6.3"
}
}

View File

@ -0,0 +1,2 @@
livenet/password
production/password

View File

@ -0,0 +1,8 @@
.embark
chains.json
config/livenet/password
config/production/password
coverage
dist
embarkArtifacts
node_modules

View File

@ -0,0 +1,35 @@
{
"name": "embark-dapp-template-demo",
"version": "4.0.0-beta.0",
"description": "Demo DApp for embark",
"files": [
"app",
"config",
"contracts",
"dot.gitignore",
"dot.npmrc",
"embark.json",
"test"
],
"scripts": {
"ci": "npm run qa",
"clean": "npm run reset",
"package": "npm pack",
"qa": "npm-run-all test package",
"reset": "npx embark-reset && npx rimraf embark-*.tgz package",
"test": "npx embark test"
},
"keywords": [],
"author": "",
"license": "MIT",
"devDependencies": {
"embark": "^4.0.0-beta.0",
"embark-reset": "^4.0.0-beta.0",
"embarkjs-connector-web3": "^4.0.0-beta.0",
"npm-run-all": "4.1.5",
"react": "16.7.0",
"react-bootstrap": "0.32.4",
"react-dom": "16.7.0",
"rimraf": "2.6.3"
}
}

View File

@ -0,0 +1,8 @@
.embark
chains.json
config/livenet/password
config/production/password
coverage
dist
embarkArtifacts
node_modules

View File

@ -0,0 +1,31 @@
{
"name": "embark-dapp-template-simple",
"version": "4.0.0-beta.0",
"description": "",
"files": [
"contracts",
"contracts.js",
"dot.gitignore",
"dot.npmrc",
"embark.json",
"test"
],
"scripts": {
"ci": "npm run qa",
"clean": "npm run reset",
"package": "npm pack",
"qa": "npm-run-all test package",
"reset": "npx embark-reset && npx rimraf embark-*.tgz package",
"test": "npx embark test"
},
"keywords": [],
"author": "",
"license": "MIT",
"devDependencies": {
"embark": "^4.0.0-beta.0",
"embark-reset": "^4.0.0-beta.0",
"embarkjs-connector-web3": "^4.0.0-beta.0",
"npm-run-all": "4.1.5",
"rimraf": "2.6.3"
}
}

3
dapps/tests/app/.npmrc Normal file
View File

@ -0,0 +1,3 @@
package-lock = false
save-exact = true
scripts-prepend-node-path = true

View File

View File

Before

Width:  |  Height:  |  Size: 1011 B

After

Width:  |  Height:  |  Size: 1011 B

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

View File

Some files were not shown because too many files have changed in this diff Show More