Skip to content
This repository was archived by the owner on Nov 16, 2018. It is now read-only.

Commit 190ed29

Browse files
authored
Add concurrently to dev task. Remove ProgressBarPlugin because it is … (#25)
* Add concurrently to dev task. * Add SimpleProgressPlugin for none development builds
1 parent b53dff1 commit 190ed29

File tree

3 files changed

+91
-28
lines changed

3 files changed

+91
-28
lines changed

package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"start": "cross-env NODE_ENV=production node ./dist/server.js",
1212
"---------- DEVELOPMENT -------------------------------------------------------------------------": "",
1313
"predev": "npm run removeAndBuildServer",
14-
"dev": "npm run watchServer & npm run devServer",
14+
"dev": "concurrently --kill-others \"npm run watchServer\" \"npm run devServer\"",
1515
"devServer": "cross-env BABEL_ENV=client NODE_ENV=development nodemon ./dist/server.js",
1616
"---------- STAGING -----------------------------------------------------------------------------": "",
1717
"prestaging:build": "npm run removeAndBuildServer",
@@ -58,10 +58,11 @@
5858
"babel-preset-react": "6.24.1",
5959
"babel-preset-stage-2": "6.24.1",
6060
"babel-watch": "2.0.7",
61+
"concurrently": "3.5.0",
6162
"copy-webpack-plugin": "4.0.1",
6263
"cross-env": "5.0.5",
6364
"css-hot-loader": "1.3.0",
64-
"css-loader": "0.28.5",
65+
"css-loader": "0.28.7",
6566
"eslint": "4.5.0",
6667
"eslint-config-airbnb": "15.1.0",
6768
"eslint-config-airbnb-base": "11.3.2",
@@ -77,12 +78,12 @@
7778
"postcss-cssnext": "3.0.2",
7879
"postcss-import": "10.0.0",
7980
"postcss-loader": "2.0.6",
80-
"progress-bar-webpack-plugin": "1.10.0",
8181
"rimraf": "2.6.1",
8282
"robotstxt-webpack-plugin": "2.0.0",
8383
"style-loader": "0.18.2",
8484
"webpack-dev-middleware": "1.12.0",
85-
"webpack-hot-middleware": "2.18.2"
85+
"webpack-hot-middleware": "2.18.2",
86+
"webpack-simple-progress-plugin": "0.0.2"
8687
},
8788
"dependencies": {
8889
"babel-polyfill": "6.26.0",

webpack.config.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const webpack = require('webpack');
33
const CopyWebpackPlugin = require('copy-webpack-plugin');
44
const ExtractTextPlugin = require('extract-text-webpack-plugin');
55
const HtmlWebpackPlugin = require('html-webpack-plugin');
6-
const ProgressBarPlugin = require('progress-bar-webpack-plugin');
6+
const SimpleProgressPlugin = require('webpack-simple-progress-plugin');
77
const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin');
88
const RobotstxtPlugin = require('robotstxt-webpack-plugin').default;
99
const pkg = require('./package.json');
@@ -13,6 +13,7 @@ const HOST = process.env.HOST || 'localhost';
1313
const NODE_ENV = process.env.NODE_ENV || 'production';
1414
const isProduction = (NODE_ENV === 'production');
1515
const isDevelopment = (NODE_ENV === 'development');
16+
const isNotDevelopment = isDevelopment === false;
1617

1718
const config = {
1819
entry: isDevelopment
@@ -70,7 +71,9 @@ const config = {
7071
},
7172

7273
plugins: [
73-
new ProgressBarPlugin(),
74+
isNotDevelopment
75+
? new SimpleProgressPlugin()
76+
: null,
7477

7578
new webpack.DefinePlugin({
7679
'process.env.NODE_ENV': JSON.stringify(NODE_ENV),

yarn.lock

+81-22
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ ansi-html@0.0.7:
9292
version "0.0.7"
9393
resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
9494

95+
ansi-regex@^0.2.0, ansi-regex@^0.2.1:
96+
version "0.2.1"
97+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
98+
9599
ansi-regex@^2.0.0:
96100
version "2.1.1"
97101
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -100,6 +104,10 @@ ansi-regex@^3.0.0:
100104
version "3.0.0"
101105
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
102106

107+
ansi-styles@^1.1.0:
108+
version "1.1.0"
109+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
110+
103111
ansi-styles@^2.2.1:
104112
version "2.2.1"
105113
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -1242,6 +1250,16 @@ center-align@^0.1.1:
12421250
align-text "^0.1.3"
12431251
lazy-cache "^1.0.3"
12441252

1253+
chalk@0.5.1:
1254+
version "0.5.1"
1255+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
1256+
dependencies:
1257+
ansi-styles "^1.1.0"
1258+
escape-string-regexp "^1.0.0"
1259+
has-ansi "^0.1.0"
1260+
strip-ansi "^0.3.0"
1261+
supports-color "^0.2.0"
1262+
12451263
chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
12461264
version "1.1.3"
12471265
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -1402,6 +1420,10 @@ commander@2.11.x, commander@^2.11.0, commander@^2.9.0, commander@~2.11.0:
14021420
version "2.11.0"
14031421
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
14041422

1423+
commander@2.6.0:
1424+
version "2.6.0"
1425+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
1426+
14051427
commondir@^1.0.1:
14061428
version "1.0.1"
14071429
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -1418,6 +1440,19 @@ concat-stream@^1.6.0:
14181440
readable-stream "^2.2.2"
14191441
typedarray "^0.0.6"
14201442

1443+
concurrently@3.5.0:
1444+
version "3.5.0"
1445+
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.5.0.tgz#8cf1b7707a6916a78a4ff5b77bb04dec54b379b2"
1446+
dependencies:
1447+
chalk "0.5.1"
1448+
commander "2.6.0"
1449+
date-fns "^1.23.0"
1450+
lodash "^4.5.1"
1451+
rx "2.3.24"
1452+
spawn-command "^0.0.2-1"
1453+
supports-color "^3.2.3"
1454+
tree-kill "^1.1.0"
1455+
14211456
configstore@^1.0.0:
14221457
version "1.4.0"
14231458
resolved "https://registry.yarnpkg.com/configstore/-/configstore-1.4.0.tgz#c35781d0501d268c25c54b8b17f6240e8a4fb021"
@@ -1593,9 +1628,9 @@ css-hot-loader@1.3.0:
15931628
loader-utils "^1.1.0"
15941629
normalize-url "^1.9.1"
15951630

1596-
css-loader@0.28.5:
1597-
version "0.28.5"
1598-
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.5.tgz#dd02bb91b94545710212ef7f6aaa66663113d754"
1631+
css-loader@0.28.7:
1632+
version "0.28.7"
1633+
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
15991634
dependencies:
16001635
babel-code-frame "^6.11.0"
16011636
css-selector-tokenizer "^0.7.0"
@@ -1707,6 +1742,10 @@ dashdash@^1.12.0:
17071742
dependencies:
17081743
assert-plus "^1.0.0"
17091744

1745+
date-fns@^1.23.0:
1746+
version "1.28.5"
1747+
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.28.5.tgz#257cfc45d322df45ef5658665967ee841cd73faf"
1748+
17101749
date-now@^0.1.4:
17111750
version "0.1.4"
17121751
resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -2015,7 +2054,7 @@ es6-weak-map@^2.0.1:
20152054
es6-iterator "^2.0.1"
20162055
es6-symbol "^3.1.1"
20172056

2018-
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
2057+
escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
20192058
version "1.0.5"
20202059
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
20212060

@@ -2614,6 +2653,12 @@ har-validator@~4.2.1:
26142653
ajv "^4.9.1"
26152654
har-schema "^1.0.5"
26162655

2656+
has-ansi@^0.1.0:
2657+
version "0.1.0"
2658+
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
2659+
dependencies:
2660+
ansi-regex "^0.2.0"
2661+
26172662
has-ansi@^2.0.0:
26182663
version "2.0.0"
26192664
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -3471,7 +3516,7 @@ lodash.upperfirst@4.3.1:
34713516
version "4.3.1"
34723517
resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
34733518

3474-
lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
3519+
lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1:
34753520
version "4.17.4"
34763521
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
34773522

@@ -3857,18 +3902,10 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
38573902
version "4.1.1"
38583903
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
38593904

3860-
object-keys@^1.0.10, object-keys@^1.0.8:
3905+
object-keys@^1.0.8:
38613906
version "1.0.11"
38623907
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
38633908

3864-
object.assign@^4.0.1:
3865-
version "4.0.4"
3866-
resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
3867-
dependencies:
3868-
define-properties "^1.1.2"
3869-
function-bind "^1.1.0"
3870-
object-keys "^1.0.10"
3871-
38723909
object.omit@^2.0.0:
38733910
version "2.0.1"
38743911
resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -4678,14 +4715,6 @@ process@~0.5.1:
46784715
version "0.5.2"
46794716
resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
46804717

4681-
progress-bar-webpack-plugin@1.10.0:
4682-
version "1.10.0"
4683-
resolved "https://registry.yarnpkg.com/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.10.0.tgz#e0b1063aa03c79e298a9340598590bb61efef9a4"
4684-
dependencies:
4685-
chalk "^1.1.1"
4686-
object.assign "^4.0.1"
4687-
progress "^1.1.8"
4688-
46894718
progress@^1.1.8:
46904719
version "1.1.8"
46914720
resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
@@ -5240,6 +5269,10 @@ rx-lite@*, rx-lite@^4.0.8:
52405269
version "4.0.8"
52415270
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
52425271

5272+
rx@2.3.24:
5273+
version "2.3.24"
5274+
resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
5275+
52435276
safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
52445277
version "5.1.1"
52455278
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -5371,6 +5404,10 @@ sourcemapped-stacktrace@^1.1.6:
53715404
dependencies:
53725405
source-map "0.5.6"
53735406

5407+
spawn-command@^0.0.2-1:
5408+
version "0.0.2"
5409+
resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
5410+
53745411
spdx-correct@~1.0.0:
53755412
version "1.0.2"
53765413
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -5494,6 +5531,12 @@ stringstream@~0.0.4:
54945531
version "0.0.5"
54955532
resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
54965533

5534+
strip-ansi@^0.3.0:
5535+
version "0.3.0"
5536+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
5537+
dependencies:
5538+
ansi-regex "^0.2.1"
5539+
54975540
strip-ansi@^3.0.0, strip-ansi@^3.0.1:
54985541
version "3.0.1"
54995542
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -5547,6 +5590,10 @@ subtext@^5.0.0:
55475590
pez "2.x.x"
55485591
wreck "12.x.x"
55495592

5593+
supports-color@^0.2.0:
5594+
version "0.2.0"
5595+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
5596+
55505597
supports-color@^2.0.0:
55515598
version "2.0.0"
55525599
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -5673,6 +5720,10 @@ tough-cookie@~2.3.0:
56735720
dependencies:
56745721
punycode "^1.4.1"
56755722

5723+
tree-kill@^1.1.0:
5724+
version "1.1.0"
5725+
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.1.0.tgz#c963dcf03722892ec59cba569e940b71954d1729"
5726+
56765727
trim-newlines@^1.0.0:
56775728
version "1.0.0"
56785729
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -5905,6 +5956,14 @@ webpack-hot-middleware@2.18.2, webpack-hot-middleware@^2.17.1:
59055956
querystring "^0.2.0"
59065957
strip-ansi "^3.0.0"
59075958

5959+
webpack-simple-progress-plugin@0.0.2:
5960+
version "0.0.2"
5961+
resolved "https://registry.yarnpkg.com/webpack-simple-progress-plugin/-/webpack-simple-progress-plugin-0.0.2.tgz#806344e64b6f313b4d9627fe46447ae4e93fcd36"
5962+
dependencies:
5963+
chalk "^1.1.3"
5964+
object-assign "^4.1.0"
5965+
progress "^1.1.8"
5966+
59085967
webpack-sources@^1.0.1:
59095968
version "1.0.1"
59105969
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"

0 commit comments

Comments
 (0)