Skip to content

Commit d52f280

Browse files
committed
Del jquery-ujs from webpack.client.base.config.js
jquery-ujs is not needed for the Webpack Dev Server setup. fix linter issue
1 parent d0f1dbd commit d52f280

File tree

6 files changed

+43
-11
lines changed

6 files changed

+43
-11
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ import RouterApp from './ServerRouterApp';
77
// NodeJs: https://nodejs.org/api/globals.html#globals_global
88
global.App = App;
99
global.RouterApp = RouterApp;
10-

client/npm-shrinkwrap.json

Lines changed: 32 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@
6464
"webpack": "^1.12.8"
6565
},
6666
"devDependencies": {
67-
"babel-eslint": "^4.1.5",
67+
"babel-eslint": "^5.0.0-beta4",
6868
"babel-plugin-react-transform": "^1.1.1",
6969
"bootstrap-sass": "^3.3.5",
7070
"bootstrap-sass-loader": "^1.0.9",
7171
"chai": "^3.4.1",
7272
"chai-immutable": "^1.5.3",
7373
"css-loader": "^0.23.0",
7474
"eslint": "^1.10.1",
75-
"eslint-config-airbnb": "1.0.0",
75+
"eslint-config-airbnb": "1.0.2",
7676
"eslint-plugin-react": "^3.11.3",
7777
"esprima-fb": "^15001.1001.0-dev-harmony-fb",
7878
"express": "^4.13.3",

client/webpack.client.base.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ module.exports = {
1616
vendor: [
1717
'babel-core/polyfill',
1818
'jquery',
19-
'jquery-ujs',
2019
'react',
2120
'react-dom',
2221
],

client/webpack.client.rails.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ config.entry.vendor.unshift(
2020
'es5-shim/es5-sham'
2121
);
2222

23+
// jquery-ujs MUST GO AFTER jquery, so must use 'push'
24+
config.entry.app.push(
25+
'jquery-ujs',
26+
'./app/startup/clientGlobals'
27+
);
28+
2329
// See webpack.common.config for adding modules common to both the webpack dev server and rails
2430

2531
config.module.loaders.push(

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@
2929
"url": "https://github.com/shakacode/react-webpack-rails-tutorial/issues"
3030
},
3131
"homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
32-
"dependencies": {}
32+
"dependencies": {
33+
"eslint": "^1.10.3"
34+
}
3335
}

0 commit comments

Comments
 (0)