Skip to content

Commit

Permalink
Del jquery-ujs from webpack.client.base.config.js
Browse files Browse the repository at this point in the history
jquery-ujs is not needed for the Webpack Dev Server setup.
fix linter issue
  • Loading branch information
justin808 committed Dec 8, 2015
1 parent d0f1dbd commit d52f280
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 11 deletions.
1 change: 0 additions & 1 deletion client/app/bundles/Comments/startup/serverGlobals.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ import RouterApp from './ServerRouterApp';
// NodeJs: https://nodejs.org/api/globals.html#globals_global
global.App = App;
global.RouterApp = RouterApp;

38 changes: 32 additions & 6 deletions client/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@
"webpack": "^1.12.8"
},
"devDependencies": {
"babel-eslint": "^4.1.5",
"babel-eslint": "^5.0.0-beta4",
"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",
Expand Down
1 change: 0 additions & 1 deletion client/webpack.client.base.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ module.exports = {
vendor: [
'babel-core/polyfill',
'jquery',
'jquery-ujs',
'react',
'react-dom',
],
Expand Down
6 changes: 6 additions & 0 deletions client/webpack.client.rails.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ config.entry.vendor.unshift(
'es5-shim/es5-sham'
);

// jquery-ujs MUST GO AFTER jquery, so must use 'push'
config.entry.app.push(
'jquery-ujs',
'./app/startup/clientGlobals'
);

// See webpack.common.config for adding modules common to both the webpack dev server and rails

config.module.loaders.push(
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@
"url": "https://github.com/shakacode/react-webpack-rails-tutorial/issues"
},
"homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
"dependencies": {}
"dependencies": {
"eslint": "^1.10.3"
}
}

0 comments on commit d52f280

Please sign in to comment.