diff --git a/src/FilterLists.Web/webpack.config.js b/src/FilterLists.Web/webpack.config.js index 909a953b6..c6cbd309c 100644 --- a/src/FilterLists.Web/webpack.config.js +++ b/src/FilterLists.Web/webpack.config.js @@ -23,16 +23,7 @@ module.exports = (env) => { test: /\.css$/, use: isDevBuild ? ["style-loader", "css-loader"] - : ExtractTextPlugin.extract({ - use: [ - { - loader: "css-loader", - options: { - minimize: { discardComments: { removeAll: true } } - } - } - ] - }) + : ExtractTextPlugin.extract({ use: "css-loader?minimize" }) }, { test: /\.(png|jpg|jpeg|gif|svg)$/, use: "url-loader?limit=25000" } ] @@ -45,19 +36,17 @@ module.exports = (env) => { }) ].concat(isDevBuild ? [ + // Plugins that apply in development builds only new webpack.SourceMapDevToolPlugin({ - filename: "[file].map", + filename: "[file].map", // Remove this line if you prefer inline source maps moduleFilenameTemplate: path.relative(bundleOutputDir, - "[resourcePath]") + "[resourcePath]") // Point sourcemap entries to the original file locations on disk }) ] : [ - new webpack.optimize.UglifyJsPlugin({ - output: { - comments: false - } - }), + // Plugins that apply in production builds only + new webpack.optimize.UglifyJsPlugin(), new ExtractTextPlugin("site.css") ]) } diff --git a/src/FilterLists.Web/webpack.config.vendor.js b/src/FilterLists.Web/webpack.config.vendor.js index 499afc9ff..1abee2f1b 100644 --- a/src/FilterLists.Web/webpack.config.vendor.js +++ b/src/FilterLists.Web/webpack.config.vendor.js @@ -3,7 +3,7 @@ const webpack = require("webpack"); const ExtractTextPlugin = require("extract-text-webpack-plugin"); module.exports = (env) => { - const extractCSS = new ExtractTextPlugin("vendor.css"); + const extractCss = new ExtractTextPlugin("vendor.css"); const isDevBuild = !(env && env.prod); return [ { @@ -16,7 +16,7 @@ module.exports = (env) => { { test: /\.(png|woff|woff2|eot|ttf|svg)(\?|$)/, use: "url-loader?limit=100000" }, { test: /\.css(\?|$)/, - use: extractCSS.extract([isDevBuild ? "css-loader" : "css-loader?minimize"]) + use: extractCss.extract([isDevBuild ? "css-loader" : "css-loader?minimize"]) } ] }, @@ -24,16 +24,16 @@ module.exports = (env) => { vendor: [ "bootstrap", "bootstrap/dist/css/bootstrap.css", "event-source-polyfill", "isomorphic-fetch", "react", "react-dom", "react-router-dom", "jquery" - ], + ] }, output: { path: path.join(__dirname, "wwwroot", "dist"), publicPath: "dist/", filename: "[name].js", - library: "[name]_[hash]", + library: "[name]_[hash]" }, plugins: [ - extractCSS, + extractCss, new webpack.ProvidePlugin({ $: "jquery", jQuery: "jquery"