feat(watch): use concurrently for the watch task

Fixes #11

Author: bitjson

README.md

@@ -49,10 +49,8 @@ yarn watch
 
 which will build and watch the entire project for changes (to both the library source files and test source files). As you develop, you can add tests for new functionality – which will initially fail – before developing the new functionality. Each time you save, any changes will be rebuilt and retested.
 
-Typescript builds on the left, tests run on the right:
-
 <p align="center">
-  <img alt="Typescript and AVA watch task" src="https://cloud.githubusercontent.com/assets/904007/22908704/f4a83b20-f21d-11e6-8006-da6a851fb057.png">
+  <img alt="Typescript and AVA watch task" src="https://cloud.githubusercontent.com/assets/904007/23443884/c625d562-fdff-11e6-8f26-77bf75add240.png">
 </p>
 
 Since only changed files are rebuilt and retested, this workflow remains fast even for large projects.
@@ -154,6 +152,10 @@ While both the browser and the Node.js versions of the library are tested, this
 
 Note: test coverage is only checked against the Node.js implementation. This is much simpler, and works well for libraries where the node and browser implementations have different dependencies and only minor adapter code. With only a few lines of differences (e.g. `src/adapters/crypto.browser.ts`), including those few lines in test coverage analysis usually isn't necessary.
 
+### Building browser dependencies
+
+This starter demonstrates importing and using a CommonJS module ([`hash.js`](https://github.com/indutny/hash.js)) for it's `hash256` method. See the `build:browser-deps` [package script](./package.json) and [rollup.config.js](./config/exports/rollup.config.js) for more details. Of course, your project likely does not need this dependency, so it can be removed. If your library doesn't need to bundle external dependencies for the browser, several other devDependencies can also be removed (`browserify`, `rollup-plugin-alias`, `rollup-plugin-commonjs`, `rollup-plugin-node-resolve`, etc).
+
 ### Dependency on `tslib`
 
 By default, this project requires [tslib](https://github.com/Microsoft/tslib) as a dependency. This is the recommended way to use Typescript's es6 &amp; es7 transpiling for sizable projects, but you can remove this dependency by removing the `importHelpers` compiler option in `tsconfig.json`. Depending on your usage, this may increase the size of your library significantly, as the Typescript compiler will inject it's helper functions directly into every file which uses them. (See also: [`noEmitHelpers` &rarr;](https://www.typescriptlang.org/docs/handbook/compiler-options.html))

config/exports/build-tests.js

@@ -27,11 +27,15 @@ const makeTransform = (filePath, buildPath) => {
 
 // copy, then watch for changes to the tests
 const testsFromRoot = 'build/main/**/*.spec.js';
-const task = process.argv[2] === '-w' ? cpx.watch : cpx.copy;
+const watchMode = process.argv.indexOf('-w') !== -1 ? true : false;
+const browserTests = process.argv.indexOf('--no-browser') !== -1 ? true : false;
+const task = watchMode ? cpx.watch : cpx.copy;
 
 task(testsFromRoot, 'test/main', {
   transform: (filePath) => makeTransform(filePath, pkg.main)
-})
-task(testsFromRoot, 'test/browser', {
-  transform: (filePath) => makeTransform(filePath, pkg.browser.replace('.js', '.cjs.js'))
-})
+});
+if (!browserTests) {
+  task(testsFromRoot, 'test/browser', {
+    transform: (filePath) => makeTransform(filePath, pkg.browser.replace('.js', '.cjs.js'))
+  });
+}

package.json

@@ -11,22 +11,23 @@
   "license": "MIT",
   "scripts": {
     "info": "npm-scripts-info",
-    "build": "trash build && yarn build:main && yarn build:module && yarn build:browser-deps && yarn build:browser && yarn build:browser-cjs",
+    "build": "trash build && yarn build:main && yarn build:module && yarn build:browser-deps && yarn build:browser && yarn build:browser-cjs && yarn build:resolve-sourcemaps",
     "build:main": "tsc -p tsconfig.json",
     "build:module": "tsc -p config/exports/tsconfig.module.json",
     "build:browser-deps": "mkdirp build/temp && browserify node_modules/hash.js/lib/hash.js --standalone hash -o build/temp/hash.js",
-    "build:browser": "rollup -c config/exports/rollup.config.js -f es -o build/browser/index.js && sorcery -i  build/browser/index.js",
-    "build:browser-cjs": "rollup -c config/exports/rollup.config.js -f cjs -o build/browser/index.cjs.js && sorcery -i  build/browser/index.cjs.js",
-    "build:tests": "node config/exports/build-tests.js",
+    "build:browser": "rollup -c config/exports/rollup.config.js -f es -o build/browser/index.js",
+    "build:browser-cjs": "rollup -c config/exports/rollup.config.js -f cjs -o build/browser/index.cjs.js",
+    "build:resolve-sourcemaps": "sorcery -i build/browser/index.js && sorcery -i build/browser/index.cjs.js",
+    "build:tests": "trash test && node config/exports/build-tests.js",
     "lint": "tslint src/**/*.ts",
     "unit": "yarn build && yarn build:tests && nyc ava",
     "check-coverage": "nyc check-coverage --lines 100 --functions 100 --branches 100",
-    "test": "yarn lint && yarn unit && yarn check-coverage && ava",
-    "watch": "yarn build && concurrently -r 'yarn build:main -- -w' 'yarn build:module -- -w' 'yarn build:browser -- -w' 'yarn build:browser-cjs -- -w' 'yarn build:tests -- -w' 'ava --watch --verbose'",
+    "test": "yarn lint && yarn unit && yarn check-coverage",
+    "watch": "yarn build && yarn build:tests -- --no-browser && concurrently -r --kill-others 'npm run --silent build:main -- -w' 'npm run --silent build:tests -- -w --no-browser' 'sleepms 2000 && ava --watch'",
     "cov": "yarn unit && yarn html-coverage && opn coverage/index.html",
     "html-coverage": "nyc report --reporter=html",
     "send-coverage": "nyc report --reporter=lcov > coverage.lcov && codecov",
-    "docs": "typedoc src/index.ts --excludePrivate --mode file --theme minimal --out build/docs && opn build/docs/index.html",
+    "docs": "typedoc src/index.ts --excludePrivate --exclude src/adapters/*.ts --mode file --theme minimal --out build/docs && opn build/docs/index.html",
     "docs:json": "typedoc --mode file --json build/docs/typedoc.json src/index.ts",
     "release": "standard-version"
   },
@@ -66,13 +67,14 @@
     "rollup-plugin-commonjs": "^7.0.0",
     "rollup-plugin-node-resolve": "^2.0.0",
     "rollup-watch": "^3.2.2",
+    "sleep-ms": "^2.0.1",
     "sorcery": "^0.10.0",
     "standard-version": "^4.0.0",
     "trash-cli": "^1.4.0",
-    "tslint": "^4.0.2",
+    "tslint": "^4.5.1",
     "tslint-config-standard": "^4.0.0",
-    "typedoc": "^0.5.5",
-    "typescript": "^2.2.0"
+    "typedoc": "^0.5.7",
+    "typescript": "^2.2.1"
   },
   "keywords": [
     "async",
@@ -102,6 +104,6 @@
     ]
   },
   "dependencies": {
-    "tslib": "^1.5.0"
+    "tslib": "^1.6.0"
   }
 }