Merge pull request #163 from shakacode/jquery-ujs-only-rails

Del jquery-ujs from webpack.client.base.config.js

Author: justin808

client/app/bundles/Comments/startup/serverGlobals.jsx

@@ -7,4 +7,3 @@ import RouterApp from './ServerRouterApp';
 // NodeJs: https://nodejs.org/api/globals.html#globals_global
 global.App = App;
 global.RouterApp = RouterApp;
-

client/npm-shrinkwrap.json

@@ -64,15 +64,15 @@
     "webpack": "^1.12.8"
   },
   "devDependencies": {
-    "babel-eslint": "^4.1.5",
+    "babel-eslint": "^4.1.6",
     "babel-plugin-react-transform": "^1.1.1",
     "bootstrap-sass": "^3.3.5",
     "bootstrap-sass-loader": "^1.0.9",
     "chai": "^3.4.1",
     "chai-immutable": "^1.5.3",
     "css-loader": "^0.23.0",
     "eslint": "^1.10.1",
-    "eslint-config-airbnb": "1.0.0",
+    "eslint-config-airbnb": "1.0.2",
     "eslint-plugin-react": "^3.11.3",
     "esprima-fb": "^15001.1001.0-dev-harmony-fb",
     "express": "^4.13.3",

client/package.json

@@ -16,7 +16,6 @@ module.exports = {
     vendor: [
       'babel-core/polyfill',
       'jquery',
-      'jquery-ujs',
       'react',
       'react-dom',
     ],
@@ -57,10 +56,10 @@ module.exports = {
     loaders: [
 
       // React is necessary for the client rendering:
-      {test: require.resolve('react'), loader: 'expose?React'},
-      {test: require.resolve('react-dom'), loader: 'expose?ReactDOM'},
-      {test: require.resolve('jquery'), loader: 'expose?jQuery'},
-      {test: require.resolve('jquery'), loader: 'expose?$'},
+      { test: require.resolve('react'), loader: 'expose?React' },
+      { test: require.resolve('react-dom'), loader: 'expose?ReactDOM' },
+      { test: require.resolve('jquery'), loader: 'expose?jQuery' },
+      { test: require.resolve('jquery'), loader: 'expose?$' },
     ],
   },
 };

client/webpack.client.base.config.js

@@ -49,19 +49,19 @@ config.module.loaders.push(
       },
     },
   },
-  {test: /\.css$/, loader: 'style-loader!css-loader'},
+  { test: /\.css$/, loader: 'style-loader!css-loader' },
   {
     test: /\.scss$/,
     loader: 'style!css!sass?outputStyle=expanded&imagePath=/assets/images&includePaths[]=' +
     path.resolve(__dirname, './assets/stylesheets'),
   },
 
   // The url-loader uses DataUrls. The file-loader emits files.
-  {test: /\.woff$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
-  {test: /\.woff2$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
-  {test: /\.ttf$/, loader: 'file-loader'},
-  {test: /\.eot$/, loader: 'file-loader'},
-  {test: /\.svg$/, loader: 'file-loader'}
+  { test: /\.woff$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+  { test: /\.woff2$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
+  { test: /\.ttf$/, loader: 'file-loader' },
+  { test: /\.eot$/, loader: 'file-loader' },
+  { test: /\.svg$/, loader: 'file-loader' }
 );
 
 module.exports = config;

client/webpack.client.hot.config.js

@@ -20,11 +20,14 @@ config.entry.vendor.unshift(
   'es5-shim/es5-sham'
 );
 
+// 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'}
+  { test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/ },
+  { test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham' }
 );
 
 module.exports = config;

client/webpack.client.rails.config.js

@@ -30,11 +30,11 @@ module.exports = {
   ],
   module: {
     loaders: [
-      {test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/},
+      { test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/ },
 
       // React is necessary for the client rendering:
-      {test: require.resolve('react'), loader: 'expose?React'},
-      {test: require.resolve('react-dom/server'), loader: 'expose?ReactDOMServer'},
+      { test: require.resolve('react'), loader: 'expose?React' },
+      { test: require.resolve('react-dom/server'), loader: 'expose?ReactDOMServer' },
     ],
   },
 };