diff --git a/package.json b/package.json index 498e86f9622865e68c03ae45b54344fc211cb722..d2595ba21dd5508b5ccf388de8b0ffbdaefbafe7 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ "build-tsc": "tsc --incremental", "build-extra": "cpx \"src/**/*.{scss,woff,woff2,ttf,otf,eot,svg,html,ico}\" lib/", "build-webpack": "webpack --mode production", - "watch": "concurrently --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack\"", - "watch-viewer": "concurrently --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer\"", + "watch": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack\"", + "watch-viewer": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer\"", "watch-tsc": "tsc --watch --incremental", "watch-extra": "cpx \"src/**/*.{scss,woff,woff2,ttf,otf,eot,svg,html,ico}\" lib/ --watch", - "watch-webpack": "webpack -w --mode development --display minimal", - "watch-webpack-viewer": "webpack -w --mode development --display minimal --config ./webpack.config.viewer.js", + "watch-webpack": "webpack -w --mode development --display errors-only --info-verbosity verbose", + "watch-webpack-viewer": "webpack -w --mode development --display errors-only --info-verbosity verbose --config ./webpack.config.viewer.js", "serve": "http-server -p 1338", "model-server": "node lib/servers/model/server.js", "model-server-watch": "nodemon --watch lib lib/servers/model/server.js", diff --git a/webpack.config.common.js b/webpack.config.common.js index 070ac2bebe39213416f2493de1b19308add85466..386a5a8d8c4a9ad1b90a1eaf4b48ef21d23e2cf1 100644 --- a/webpack.config.common.js +++ b/webpack.config.common.js @@ -29,14 +29,6 @@ const sharedConfig = { // failOnError: false, // cwd: process.cwd(), // }), - new webpack.ProvidePlugin({ - '__assign': ['tslib', '__assign'], - '__extends': ['tslib', '__extends'], - '__awaiter': ['tslib', '__awaiter'], - '__generator': ['tslib', '__generator'], - '__spread': ['tslib', '__spread'], - '__spreadArrays': ['tslib', '__spreadArrays'], - }), new ExtraWatchWebpackPlugin({ files: [ './lib/**/*.scss', @@ -55,6 +47,9 @@ const sharedConfig = { path.resolve(__dirname, 'lib/') ], }, + watchOptions: { + aggregateTimeout: 750 + }, devtool: '' }