Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ee769cd

Browse files
Merge pull request #163 from shakacode/jquery-ujs-only-rails
Del jquery-ujs from webpack.client.base.config.js
2 parents d0f1dbd + a7e53db commit ee769cd

File tree

7 files changed

+52
-25
lines changed

7 files changed

+52
-25
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": "^4.1.6",
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: 4 additions & 5 deletions
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
],
@@ -57,10 +56,10 @@ module.exports = {
5756
loaders: [
5857

5958
// React is necessary for the client rendering:
60-
{test: require.resolve('react'), loader: 'expose?React'},
61-
{test: require.resolve('react-dom'), loader: 'expose?ReactDOM'},
62-
{test: require.resolve('jquery'), loader: 'expose?jQuery'},
63-
{test: require.resolve('jquery'), loader: 'expose?$'},
59+
{test: require.resolve('react'), loader: 'expose?React'},
60+
{test: require.resolve('react-dom'), loader: 'expose?ReactDOM'},
61+
{test: require.resolve('jquery'), loader: 'expose?jQuery'},
62+
{test: require.resolve('jquery'), loader: 'expose?$'},
6463
],
6564
},
6665
};

‎client/webpack.client.hot.config.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ config.module.loaders.push(
4949
},
5050
},
5151
},
52-
{test: /\.css$/, loader: 'style-loader!css-loader'},
52+
{test: /\.css$/, loader: 'style-loader!css-loader'},
5353
{
5454
test: /\.scss$/,
5555
loader: 'style!css!sass?outputStyle=expanded&imagePath=/assets/images&includePaths[]=' +
5656
path.resolve(__dirname, './assets/stylesheets'),
5757
},
5858

5959
// The url-loader uses DataUrls. The file-loader emits files.
60-
{test: /\.woff$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
61-
{test: /\.woff2$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
62-
{test: /\.ttf$/, loader: 'file-loader'},
63-
{test: /\.eot$/, loader: 'file-loader'},
64-
{test: /\.svg$/, loader: 'file-loader'}
60+
{test: /\.woff$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
61+
{test: /\.woff2$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
62+
{test: /\.ttf$/, loader: 'file-loader'},
63+
{test: /\.eot$/, loader: 'file-loader'},
64+
{test: /\.svg$/, loader: 'file-loader'}
6565
);
6666

6767
module.exports = config;

‎client/webpack.client.rails.config.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@ 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('jquery-ujs');
25+
2326
// See webpack.common.config for adding modules common to both the webpack dev server and rails
2427

2528
config.module.loaders.push(
26-
{test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/},
27-
{test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham'}
29+
{test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/},
30+
{test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham'}
2831
);
2932

3033
module.exports = config;

‎client/webpack.server.rails.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ module.exports = {
3030
],
3131
module: {
3232
loaders: [
33-
{test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/},
33+
{test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/},
3434

3535
// React is necessary for the client rendering:
36-
{test: require.resolve('react'), loader: 'expose?React'},
37-
{test: require.resolve('react-dom/server'), loader: 'expose?ReactDOMServer'},
36+
{test: require.resolve('react'), loader: 'expose?React'},
37+
{test: require.resolve('react-dom/server'), loader: 'expose?ReactDOMServer'},
3838
],
3939
},
4040
};

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /