This repository has been archived by the owner on Sep 11, 2018. It is now read-only.
upgrade webpack from 1 to 2 #1189
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,12 +12,15 @@ const __TEST__ = project.globals.__TEST__ | |
|
|
||
| debug('Creating configuration.') | ||
| const webpackConfig = { | ||
| name: 'client', | ||
| target: 'web', | ||
| devtool: project.compiler_devtool, | ||
| resolve: { | ||
| modules: [ | ||
| project.paths.client(), | ||
| 'node_modules' | ||
| ], | ||
| extensions: ['.js', '.jsx', '.json'] | ||
| }, | ||
| module : {} | ||
| } | ||
|
|
@@ -84,21 +87,22 @@ if (__TEST__ && !argv.watch) { | |
| } | ||
|
|
||
| if (__DEV__) { | ||
| debug('Enabling plugins for live development (HMR, NoEmitOnErrors).') | ||
| webpackConfig.plugins.push( | ||
| new webpack.HotModuleReplacementPlugin(), | ||
| new webpack.NoEmitOnErrorsPlugin() | ||
| ) | ||
| } else if (__PROD__) { | ||
| debug('Enabling plugins for production (OccurenceOrder, Dedupe & UglifyJS).') | ||
| webpackConfig.plugins.push( | ||
| new webpack.optimize.OccurrenceOrderPlugin(), | ||
| new webpack.optimize.DedupePlugin(), | ||
|
There was a problem hiding this comment. Probably should remove the DedupePlugin? https://webpack.js.org/guides/migrating/#dedupeplugin-has-been-removed |
||
| new webpack.optimize.UglifyJsPlugin({ | ||
| sourceMap: true, | ||
| compress : { | ||
| unused : true, | ||
| dead_code : true | ||
| // warnings : false | ||
| } | ||
| }), | ||
| new webpack.optimize.AggressiveMergingPlugin() | ||
|
|
@@ -118,75 +122,159 @@ if (!__TEST__) { | |
| // Loaders | ||
| // ------------------------------------ | ||
| // JavaScript / JSON | ||
| webpackConfig.module.rules = [{ | ||
| test : /\.(js|jsx)$/, | ||
| exclude : /node_modules/, | ||
| loader : 'babel-loader', | ||
| query : project.compiler_babel | ||
| }, { | ||
| test : /\.json$/, | ||
| loader : 'json-loader' | ||
| }] | ||
|
There was a problem hiding this comment. Can eliminate this. JSON loader is built-in in Webpack 2. |
||
|
|
||
| // ------------------------------------ | ||
| // Style Loaders | ||
| // ------------------------------------ | ||
| // We use cssnano with the postcss loader, so we tell | ||
| // css-loader not to duplicate minimization. | ||
| webpackConfig.module.rules.push({ | ||
| test : /\.scss$/, | ||
| use : [ | ||
| { | ||
| loader: 'style-loader' | ||
| }, | ||
| { | ||
| loader : 'css-loader', | ||
| options : { | ||
| sourceMap : true, | ||
| minimize : true | ||
| } | ||
| }, | ||
| { | ||
| loader : 'postcss-loader' | ||
| }, | ||
| { | ||
| loader : 'sass-loader', | ||
| options : { | ||
| sourceMap : true | ||
| } | ||
| } | ||
| ] | ||
| }) | ||
| webpackConfig.module.rules.push({ | ||
| test : /\.css$/, | ||
| use : [ | ||
| { | ||
| loader : 'style-loader' | ||
| }, | ||
| { | ||
| loader : 'css-loader', | ||
| options : { | ||
| sourceMap : true, | ||
| minimize : true | ||
| } | ||
| }, | ||
| { | ||
| loader : 'postcss-loader' | ||
| } | ||
| ] | ||
| }) | ||
|
|
||
| webpackConfig.plugins.push( | ||
| new webpack.LoaderOptionsPlugin({ | ||
| options : { | ||
| postcss : [ | ||
| cssnano({ | ||
| autoprefixer : { | ||
| add : true, | ||
| remove : true, | ||
| browsers : ['last 2 versions'] | ||
| }, | ||
| discardComments: { | ||
| removeAll : true | ||
| }, | ||
| discardUnused : false, | ||
| mergeIdents : false, | ||
| reduceIdents : false, | ||
| safe : true, | ||
| sourcemap : true | ||
| }) | ||
| ], | ||
| sassLoader : { | ||
| includePaths : project.paths.client('styles') | ||
| } | ||
| } | ||
| }) | ||
| ) | ||
|
|
||
| // File loaders | ||
| /* eslint-disable */ | ||
|
There was a problem hiding this comment. I think we can eliminate the There was a problem hiding this comment. Less boilerplate: Note addition of .gif |
||
| webpackConfig.module.rules.push( | ||
| { | ||
| test : /\.woff(\?.*)?$/, | ||
| loader : 'url-loader', | ||
| options : { | ||
| prefix : 'fonts/', | ||
| name : '[path][name].[ext]', | ||
| limit : '10000', | ||
| mimetype : 'application/font-woff' | ||
| } | ||
| }, | ||
| { | ||
| test : /\.woff2(\?.*)?$/, | ||
| loader : 'url-loader', | ||
| options : { | ||
| prefix : 'fonts/', | ||
| name : '[path][name].[ext]', | ||
| limit : '10000', | ||
| mimetype : 'application/font-woff2' | ||
| } | ||
| }, | ||
| { | ||
| test : /\.otf(\?.*)?$/, | ||
| loader : 'file-loader', | ||
| options : { | ||
| prefix : 'fonts/', | ||
| name : '[path][name].[ext]', | ||
| limit : '10000', | ||
| mimetype : 'font/opentype' | ||
| } | ||
| }, | ||
| { | ||
| test : /\.ttf(\?.*)?$/, | ||
| loader : 'url-loader', | ||
| options : { | ||
| prefix : 'fonts/', | ||
| name : '[path][name].[ext]', | ||
| limit : '10000', | ||
| mimetype : 'application/octet-stream' | ||
| } | ||
| }, | ||
| { | ||
| test : /\.eot(\?.*)?$/, | ||
| loader : 'file-loader', | ||
| options : { | ||
| prefix : 'fonts/', | ||
| name : '[path][name].[ext]' | ||
| } | ||
| }, | ||
| { | ||
| test : /\.svg(\?.*)?$/, | ||
| loader : 'url-loader', | ||
| options : { | ||
| prefix : 'fonts/', | ||
| name : '[path][name].[ext]', | ||
| limit : '10000', | ||
| mimetype : 'image/svg+xml' | ||
| } | ||
| }, | ||
| { | ||
| test : /\.(png|jpg)$/, | ||
| loader : 'url-loader', | ||
| options : { | ||
| limit : '8192' | ||
| } | ||
| } | ||
| ) | ||
| /* eslint-enable */ | ||
|
|
||
|
|
@@ -198,17 +286,22 @@ webpackConfig.module.loaders.push( | |
| // http://stackoverflow.com/questions/34133808/webpack-ots-parsing-error-loading-fonts/34133809#34133809 | ||
| if (!__DEV__) { | ||
| debug('Applying ExtractTextPlugin to CSS loaders.') | ||
| webpackConfig.module.rules.filter(rule => | ||
| rule.loader && /css/.test(rule.loader) | ||
| ).forEach(loader => { | ||
|
There was a problem hiding this comment. isn't it a misspell here? |
||
| const first = rule.loader | ||
| const rest = rule.loader.slice(1) | ||
|
|
||
| rule.loader = ExtractTextPlugin.extract({ | ||
| fallback: first, | ||
| use: rest.join('!') | ||
| }) | ||
| delete rule.loader | ||
| }) | ||
|
|
||
| webpackConfig.plugins.push( | ||
| new ExtractTextPlugin({ | ||
| filename : '[name].[contenthash].css', | ||
| allChunks : true | ||
| }) | ||
| ) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be
./${project.dir_test}/test-bundler.jslike on line 11 of this file