Only add jquery-ujs for rails webpack config file

shakacode · Dec 27, 2015 · a58856a · a58856a
1 parent a9b7d47
commit a58856a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/generators/react_on_rails/templates/base/base/client/webpack.client.base.config.js.tt b/lib/generators/react_on_rails/templates/base/base/client/webpack.client.base.config.js.tt
@@ -17,7 +17,6 @@ module.exports = {
     vendor: [
       'babel-core/polyfill',
       'jquery',
-      'jquery-ujs',
       'react',
       'react-dom',
     ],

diff --git a/lib/generators/react_on_rails/templates/base/base/client/webpack.client.rails.config.js b/lib/generators/react_on_rails/templates/base/base/client/webpack.client.rails.config.js
@@ -19,8 +19,10 @@ config.entry.vendor.unshift(
   'es5-shim/es5-sham'
 );
 
-// See webpack.common.config for adding modules common to both the webpack dev server and rails
+// jquery-ujs MUST GO AFTER jquery, so must use 'push'
+config.entry.app.push('jquery-ujs');
 
+// See webpack.common.config for adding modules common to both the webpack dev server and rails
 config.module.loaders.push(
   {test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/},
   {test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham'}