Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit d3d4768

Browse files
authored
Merge pull request #2175 from matrix-org/travis/build-process
Split npm start into an init and watch script
2 parents 1157320 + c5a2e0b commit d3d4768

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@
3838
"reskindex:watch": "node scripts/reskindex.js -h header -w",
3939
"i18n": "matrix-gen-i18n",
4040
"prunei18n": "matrix-prune-i18n",
41-
"build": "npm run reskindex && babel src -d lib --source-maps --copy-files",
42-
"build:watch": "babel src -w -d lib --source-maps --copy-files",
41+
"build": "npm run reskindex && npm run start:init",
42+
"build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files",
4343
"emoji-data-strip": "node scripts/emoji-data-strip.js",
44-
"start": "parallelshell \"npm run build:watch\" \"npm run reskindex:watch\"",
44+
"start": "npm run start:init && npm run start:all",
45+
"start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"npm run build:watch\" \"npm run reskindex:watch\"",
46+
"start:init": "babel src -d lib --source-maps --copy-files",
4547
"lint": "eslint src/",
4648
"lintall": "eslint src/ test/",
4749
"lintwithexclusions": "eslint --max-warnings 20 --ignore-path .eslintignore.errorfiles src test",
@@ -111,6 +113,7 @@
111113
"babel-preset-es2017": "^6.14.0",
112114
"babel-preset-react": "^6.11.1",
113115
"chokidar": "^1.6.1",
116+
"concurrently": "^4.0.1",
114117
"eslint": "^3.13.1",
115118
"eslint-config-google": "^0.7.1",
116119
"eslint-plugin-babel": "^4.0.1",
@@ -133,7 +136,6 @@
133136
"matrix-mock-request": "^1.2.1",
134137
"matrix-react-test-utils": "^0.1.1",
135138
"mocha": "^5.0.5",
136-
"parallelshell": "3.0.1",
137139
"react-addons-test-utils": "^15.4.0",
138140
"require-json": "0.0.1",
139141
"rimraf": "^2.4.3",

0 commit comments

Comments
 (0)