From 4332d131ad0a2f2727a842b1ee5d4e01d7ab1041 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Fri, 11 Jan 2019 16:52:17 -0800
Subject: [PATCH] build/watch using the 'concurrently' package
---
package-lock.json | Bin 485088 -> 495706 bytes
package.json | 8 ++++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 8dd941ab943fd2727d03938f79af7d152d4c532c..cc7850e04ac8a1e255726dc3322017c6e38b0671 100644
GIT binary patch
delta 2120
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
Pdue1vKNwjd{xI@i?+?pS
delta 64
zcmcb$K<>d=*@i8Qjx(mSFJcjzE|<kDKD}TzvuV5X0Y)HZ0%B$$X4$TMfK?!9ySOl0
QOi_Dl8{78QHukHW02vh*fdBvi
diff --git a/package.json b/package.json
index 613df0b68..b8b457ae1 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,13 @@
"scripts": {
"lint": "tslint src/**/*.ts",
"build": "cpx \"src/**/*.{vert,frag,glsl,scss,woff,woff2,ttf,otf,eot,svg,html,gql}\" build/node_modules/ && tsc",
- "watch": "tsc -watch",
+ "watch": "concurrently --kill-others \"npm:watch-ts\" \"npm:watch-extra\" \"npm:watch-webpack\"",
+ "watch-ts": "tsc -watch",
"watch-extra": "cpx \"src/**/*.{vert,frag,glsl,scss,woff,woff2,ttf,otf,eot,svg,html,gql}\" build/node_modules/ --watch",
- "watch-all-win": "start cmd /K npm run watch & start cmd /K npm run watch-extra & start cmd /K npm run watch-viewer & start http-server -p 1338",
+ "watch-all-win": "start cmd /K npm run watch-ts & start cmd /K npm run watch-extra & start cmd /K npm run watch-viewer & start http-server -p 1338",
"test": "jest",
+ "build-webpack": "webpack --mode development",
+ "watch-webpack": "webpack -w --mode development",
"build-viewer": "webpack build/node_modules/apps/viewer/index.js --mode development -o build/viewer/index.js",
"watch-viewer": "webpack build/node_modules/apps/viewer/index.js -w --mode development -o build/viewer/index.js",
"build-ms-query": "webpack build/node_modules/apps/model-server-query/index.js --mode development -o build/model-server-query/index.js",
@@ -87,6 +90,7 @@
"@types/webgl2": "0.0.4",
"benchmark": "^2.1.4",
"circular-dependency-plugin": "^5.0.2",
+ "concurrently": "^4.1.0",
"cpx": "^1.5.0",
"css-loader": "^1.0.1",
"extra-watch-webpack-plugin": "^1.0.3",
--
GitLab