Merge branch 'disable-webpack-optimization' into 'master'

Disable webpack.optimize because it's breaking karma in EE See merge request !13720

Merge branch 'disable-webpack-optimization' into 'master'
0f74ba96 · Tim Zallmann · b7cfeeba · e9bd73e1 · 0f74ba96
Commit 0f74ba96 authored Aug 23, 2017 by Tim Zallmann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

karma.config.js config/karma.config.js +1 -0

No files found.
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -8,6 +8,7 @@ if (webpackConfig.plugins) {
  webpackConfig.plugins = webpackConfig.plugins.filter(function (plugin) {
    return !(
      plugin instanceof webpack.optimize.CommonsChunkPlugin ||
+      plugin instanceof webpack.optimize.ModuleConcatenationPlugin ||
      plugin instanceof webpack.DefinePlugin
    );
  });