Merge branch 'dont-compress-development-assets' into 'master'

Don't compress development assets and fix deprecation warning in production

See merge request !9322

1 files changed, 4 insertions, 4 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 01c1a5bfb99..9bee7baceb7 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -80,9 +80,6 @@ var config = {
       modules: false,
       assets: true
     }),
-    new CompressionPlugin({
-      asset: '[path].gz[query]',
-    }),
     new webpack.IgnorePlugin(/moment/, /pikaday/),
   ],
 
@@ -102,7 +99,7 @@ var config = {
 if (IS_PRODUCTION) {
   config.devtool = 'source-map';
   config.plugins.push(
-    new webpack.NoErrorsPlugin(),
+    new webpack.NoEmitOnErrorsPlugin(),
     new webpack.LoaderOptionsPlugin({
       minimize: true,
       debug: false
@@ -112,6 +109,9 @@ if (IS_PRODUCTION) {
     }),
     new webpack.DefinePlugin({
       'process.env': { NODE_ENV: JSON.stringify('production') }
+    }),
+    new CompressionPlugin({
+      asset: '[path].gz[query]',
     })
   );
 }