Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 9, 2015
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d1d08
Del jquery-ujs from webpack.client.base.config.js
justin808 Dec 2, 2015
c3da8dc
Fix client entry point path and linting issues
josiasds Dec 9, 2015
a7e53db
Remove unnecessary client entry point
josiasds Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/app/bundles/Comments/startup/serverGlobals.jsx
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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": "^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",
Expand Down
9 changes: 4 additions & 5 deletions client/webpack.client.base.config.js
View file
Open in desktop
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 Expand Up @@ -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?$' },
],
},
};
12 changes: 6 additions & 6 deletions client/webpack.client.hot.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
7 changes: 5 additions & 2 deletions client/webpack.client.rails.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions client/webpack.server.rails.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
],
},
};