Merge pull request ManageIQ#4341 from himdel/webpack-environment

Remove Redux environment warning in production
romanblanco · Jul 25, 2018 · 5a90cdc · 5a90cdc
2 parents 198c28c + 4caf5a3
commit 5a90cdc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -15,7 +15,6 @@
 //= require bower_components/angular-bootstrap/ui-bootstrap-tpls
 //= require angular-sanitize
 //= require angular.validators/angular.validators
-//= require ng-redux/dist/ng-redux
 //= require bower_components/moment/moment
 //= require bower_components/moment-strftime/lib/moment-strftime
 //= require bower_components/moment-timezone/moment-timezone

diff --git a/app/javascript/packs/application-common.js b/app/javascript/packs/application-common.js
@@ -7,6 +7,7 @@
 // layout file, like app/views/layouts/application.html.erb
 
 import 'proxy-polyfill';
+import 'ng-redux';
 
 import { mount } from '../react/mounter';
 import componentRegistry from '../react/componentRegistry';

diff --git a/config/webpack/shared.js b/config/webpack/shared.js
@@ -44,7 +44,9 @@ module.exports = {
   },
 
   plugins: [
-    new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV || 'development'),
+    }),
 
     // Workaround for graphql/graphql-language-service#128
     new webpack.ContextReplacementPlugin(