ff-stream-web

commit 17a2dc0dfc6bc60c0a702565a0dc2e430fea7229
parent cc69ec585fa7b5c95a14b5c14b67cd5388b1e7dc
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Sat, 29 Aug 2015 01:02:06 +0300

Update npm modules

Diffstat:
M
package.json
 | 
6
+++---
M
tools/config.js
 | 
14
++++++++------

2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "npm": ">= 2.1"
   },
   "dependencies": {
-    "babel": "5.8.21",
+    "babel": "5.8.23",
     "classnames": "2.1.3",
     "eventemitter3": "1.1.1",
     "express": "4.13.3",
@@ -33,7 +33,7 @@
     "csscomb": "^3.1.8",
     "cssnext": "^1.8.4",
     "del": "^1.2.1",
-    "eslint": "^1.2.1",
+    "eslint": "^1.3.0",
     "eslint-loader": "^1.0.0",
     "eslint-plugin-react": "^3.3.0",
     "gaze": "^0.5.1",
@@ -46,7 +46,7 @@
     "postcss-loader": "^0.5.1",
     "postcss-nested": "^1.0.0",
     "psi": "^1.0.6",
-    "react-hot-loader": "^1.2.9",
+    "react-hot-loader": "^1.3.0",
     "replace": "^0.3.0",
     "run-sequence": "^1.1.2",
     "style-loader": "^0.12.3",
diff --git a/tools/config.js b/tools/config.js
@@ -103,7 +103,10 @@ const config = {
 // -----------------------------------------------------------------------------
 
 const appConfig = merge({}, config, {
-  entry: [...(WATCH ? ['webpack-hot-middleware/client'] : []), './src/app.js'],
+  entry: [
+    ...(WATCH && ['webpack-hot-middleware/client']),
+    './src/app.js'
+  ],
   output: {
     path: path.join(__dirname, '../build/public'),
     filename: 'app.js'
@@ -112,15 +115,14 @@ const appConfig = merge({}, config, {
   plugins: [
     ...config.plugins,
     new DefinePlugin(merge({}, GLOBALS, {'__SERVER__': false})),
-    ...(DEBUG ? [] : [
+    ...(!DEBUG && [
       new webpack.optimize.DedupePlugin(),
       new webpack.optimize.UglifyJsPlugin({compress: {warnings: VERBOSE}}),
       new webpack.optimize.AggressiveMergingPlugin()
     ]),
-    ...(WATCH ? [
-      new webpack.HotModuleReplacementPlugin(),
-      new webpack.NoErrorsPlugin()
-    ] : [])
+    ...(WATCH && [
+      new webpack.HotModuleReplacementPlugin()
+    ])
   ],
   module: {
     loaders: [...config.module.loaders, {