Skip to content

Commit c3da8dc

Browse files
committed
Fix client entry point path and linting issues
1 parent 47d1d08 commit c3da8dc

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

client/webpack.client.base.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ module.exports = {
5656
loaders: [
5757

5858
// React is necessary for the client rendering:
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?$'},
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?$' },
6363
],
6464
},
6565
};

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ config.entry.vendor.unshift(
2323
// jquery-ujs MUST GO AFTER jquery, so must use 'push'
2424
config.entry.app.push(
2525
'jquery-ujs',
26-
'./app/startup/clientGlobals'
26+
'./app/bundles/Comments/startup/clientGlobals'
2727
);
2828

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

3131
config.module.loaders.push(
32-
{test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/},
33-
{test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham'}
32+
{ test: /\.jsx?$/, loader: 'babel-loader', exclude: /node_modules/ },
33+
{ test: require.resolve('react'), loader: 'imports?shim=es5-shim/es5-shim&sham=es5-shim/es5-sham' }
3434
);
3535

3636
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)