Merge branch 'master' of https://github.com/NMFR/optimize-css-assets-webpack-plugin

hzsrc · hzsrc · commit 7488602a166a · 2021-03-03T18:14:55.000+08:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+
+[*.md]
+indent_size = 4
+trim_trailing_whitespace = false
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v8.9.4
+v14.9.0
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 A Webpack plugin to optimize \ minimize CSS assets.
 
+> :warning: For webpack v5 or above please use [css-minimizer-webpack-plugin](https://github.com/webpack-contrib/css-minimizer-webpack-plugin) instead.
+
 ## What does the plugin do?
 
 It will search for CSS assets during the Webpack build and will optimize \ minimize the CSS (by default it uses [cssnano](http://github.com/ben-eb/cssnano) but a custom CSS processor can be specified).
@@ -58,3 +60,4 @@ module.exports = {
 ## License
 
 MIT (http://www.opensource.org/licenses/mit-license.php)
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "optimize-css-assets-webpack-plugin",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "A Webpack plugin to optimize \\ minimize CSS assets, with sorce map file name support",
   "keywords": [
     "CSS",
@@ -25,20 +25,20 @@
     ]
   },
   "dependencies": {
-    "cssnano": "^4.1.0",
+    "cssnano": "^4.1.10",
     "last-call-webpack-plugin": "^3.0.0"
   },
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-jest": "^22.1.0",
+    "babel-core": "^6.26.3",
+    "babel-jest": "^26.3.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "css-loader": "^0.28.9",
+    "babel-preset-env": "^1.7.0",
+    "css-loader": "^3.6.0",
     "extract-text-webpack-plugin": "next",
-    "jest": "^22.1.4",
+    "jest": "^26.4.2",
     "style-loader": "^0.20.1",
-    "webpack": "^4.9.1"
+    "webpack": "^4.44.1"
   },
   "peerDependencies": {
     "webpack": "^4.0.0"
diff --git a/test/__snapshots__/webpack-integration.test.js.snap b/test/__snapshots__/webpack-integration.test.js.snap
@@ -17,6 +17,6 @@ p {
 "
 `;
 
-exports[`Webpack Integration Tests only-assetNameRegExp-processed 2`] = `"a{color:#00f}body{color:red;margin:0}p{margin:1000px}"`;
+exports[`Webpack Integration Tests only-assetNameRegExp-processed 2`] = `"a{color:#00f}body{margin:0;color:red}p{margin:1000px}"`;
 
 exports[`Webpack Integration Tests removes-duplicate-css 1`] = `"a{color:#00f}body{color:red}p{color:green}"`;
diff --git a/test/cases/assetNameRegExp-no-source/a_optimize-me.css b/test/cases/assetNameRegExp-no-source/a_optimize-me.css
@@ -1,6 +1 @@
-body {
-  color: red;
-}
-a {
-  color: blue;
-}
+body{color:red}a{color:blue}
diff --git a/test/cases/assetNameRegExp-no-source/b_optimize-me.css b/test/cases/assetNameRegExp-no-source/b_optimize-me.css
@@ -1,7 +1 @@
-body {
-  margin: 0;
-  color: red;
-}
-p {
-  margin: 1000px;
-}
+body{margin:0;color:red}p{margin:1000px}
diff --git a/test/cases/assetNameRegExp-no-source/c.css b/test/cases/assetNameRegExp-no-source/c.css
@@ -1,9 +1 @@
-body {
-  color: red;
-  padding: 0;
-  margin: 0;
-}
-p {
-  padding: 500px;
-  padding: 1000px;
-}
+body{color:red;padding:0;margin:0}p{padding:500px;padding:1000px}
diff --git a/test/cases/assetNameRegExp-no-source/webpack.config.js b/test/cases/assetNameRegExp-no-source/webpack.config.js
@@ -10,8 +10,7 @@ module.exports = {
         use: ExtractTextPlugin.extract({
           fallback: { loader: 'style-loader' },
           use: {
-            loader: 'css-loader',
-            options: { minimize: true }
+            loader: 'css-loader'
           }
         })
       },
diff --git a/test/cases/duplicate-css-exists-without-plugin/a.css b/test/cases/duplicate-css-exists-without-plugin/a.css
@@ -1,6 +1 @@
-body {
-  color: red;
-}
-a {
-  color: blue;
-}
+body{color:red}a{color:blue}
diff --git a/test/cases/duplicate-css-exists-without-plugin/b.css b/test/cases/duplicate-css-exists-without-plugin/b.css
@@ -1,6 +1 @@
-body {
-  color: red;
-}
-p {
-  color: green;
-}
+body{color:red}p{color:green}
diff --git a/test/cases/duplicate-css-exists-without-plugin/webpack.config.js b/test/cases/duplicate-css-exists-without-plugin/webpack.config.js
@@ -1,23 +1,20 @@
-import ExtractTextPlugin from 'extract-text-webpack-plugin';
-import OptimizeCssAssetsPlugin from '../../../src/';
+import ExtractTextPlugin from "extract-text-webpack-plugin";
+import OptimizeCssAssetsPlugin from "../../../src/";
 
 module.exports = {
-  entry: './index',
+  entry: "./index",
   module: {
     rules: [
       {
         test: /\.css$/,
         use: ExtractTextPlugin.extract({
-          fallback: { loader: 'style-loader' },
+          fallback: { loader: "style-loader" },
           use: {
-            loader: 'css-loader',
-            options: { minimize: true }
+            loader: "css-loader"
           }
         })
-      },
-    ],
+      }
+    ]
   },
-  plugins: [
-    new ExtractTextPlugin('file.css')
-  ],
+  plugins: [new ExtractTextPlugin("file.css")]
 };
diff --git a/test/cases/only-assetNameRegExp-processed/expected/optimize.css b/test/cases/only-assetNameRegExp-processed/expected/optimize.css
@@ -1 +1 @@
-a{color:#00f}body{color:red;margin:0}p{margin:1000px}
+a{color:#00f}body{margin:0;color:red}p{margin:1000px}
diff --git a/test/cases/only-assetNameRegExp-processed/webpack.config.js b/test/cases/only-assetNameRegExp-processed/webpack.config.js
@@ -1,40 +1,38 @@
-import ExtractTextPlugin from 'extract-text-webpack-plugin';
-import OptimizeCssAssetsPlugin from '../../../src/';
+import ExtractTextPlugin from "extract-text-webpack-plugin";
+import OptimizeCssAssetsPlugin from "../../../src/";
 
-const notToProcess = new ExtractTextPlugin('as_is.css');
-const toProcess = new ExtractTextPlugin('optimize.css');
+const notToProcess = new ExtractTextPlugin("as_is.css");
+const toProcess = new ExtractTextPlugin("optimize.css");
 
 module.exports = {
-  entry: './index',
+  entry: "./index",
   module: {
     rules: [
       {
         test: /as-is\.css$/,
         use: notToProcess.extract({
-          fallback: { loader: 'style-loader' },
+          fallback: { loader: "style-loader" },
           use: {
-            loader: 'css-loader',
-            options: { minimize: false }
+            loader: "css-loader"
           }
         })
       },
       {
         test: /optimize-me\.css$/,
         use: toProcess.extract({
-          fallback: { loader: 'style-loader' },
+          fallback: { loader: "style-loader" },
           use: {
-            loader: 'css-loader',
-            options: { minimize: false }
+            loader: "css-loader"
           }
         })
       }
-    ],
+    ]
   },
   plugins: [
     notToProcess,
     toProcess,
     new OptimizeCssAssetsPlugin({
       assetNameRegExp: /optimize\.css/g
     })
-  ],
+  ]
 };
diff --git a/test/cases/removes-duplicate-css/webpack.config.js b/test/cases/removes-duplicate-css/webpack.config.js
@@ -1,24 +1,20 @@
-import ExtractTextPlugin from 'extract-text-webpack-plugin';
-import OptimizeCssAssetsPlugin from '../../../src/';
+import ExtractTextPlugin from "extract-text-webpack-plugin";
+import OptimizeCssAssetsPlugin from "../../../src/";
 
 module.exports = {
-  entry: './index',
+  entry: "./index",
   module: {
     rules: [
       {
         test: /\.css$/,
         use: ExtractTextPlugin.extract({
-          fallback: { loader: 'style-loader' },
+          fallback: { loader: "style-loader" },
           use: {
-            loader: 'css-loader',
-            options: { minimize: true }
+            loader: "css-loader"
           }
         })
-      },
-    ],
+      }
+    ]
   },
-  plugins: [
-    new ExtractTextPlugin('file.css'),
-    new OptimizeCssAssetsPlugin()
-  ],
+  plugins: [new ExtractTextPlugin("file.css"), new OptimizeCssAssetsPlugin()]
 };
diff --git a/test/util/helpers.js b/test/util/helpers.js
@@ -1,40 +1,39 @@
-import fs from 'fs';
-import path from 'path';
-import ExtractTextPlugin from 'extract-text-webpack-plugin';
+import fs from "fs";
+import path from "path";
+import ExtractTextPlugin from "extract-text-webpack-plugin";
 
 export function readFileOrEmpty(path) {
   try {
-    return fs.readFileSync(path, 'utf-8');
+    return fs.readFileSync(path, "utf-8");
   } catch (e) {
-    return '';
+    return "";
   }
 }
 
 export const defaultConfig = {
-  entry: './index',
+  entry: "./index",
   module: {
     rules: [
       {
         test: /\.css$/,
         use: ExtractTextPlugin.extract({
-          fallback: { loader: 'style-loader' },
+          fallback: { loader: "style-loader" },
           use: {
-            loader: 'css-loader',
-            options: { minimize: true }
+            loader: "css-loader"
           }
         })
-      },
-    ],
+      }
+    ]
   },
   plugins: [],
   context: __dirname,
   output: {
-    filename: 'destination.js',
-    path: path.resolve(__dirname, '../', 'js', 'default-exports')
+    filename: "destination.js",
+    path: path.resolve(__dirname, "../", "js", "default-exports")
   }
 };
 
-export function checkForWebpackErrors({err, stats, done}) {
+export function checkForWebpackErrors({ err, stats, done }) {
   if (err) return done(err);
   if (stats.hasErrors()) return done(new Error(stats.toString()));
 }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ p {`
`17`	`17`	`"`
`18`	`18`	`;
`19`	`19`
`20`		-exports[`Webpack Integration Tests only-assetNameRegExp-processed 2`] = `"a{color:#00f}body{color:red;margin:0}p{margin:1000px}"`;
	`20`	+exports[`Webpack Integration Tests only-assetNameRegExp-processed 2`] = `"a{color:#00f}body{margin:0;color:red}p{margin:1000px}"`;
`21`	`21`
`22`	`22`	exports[`Webpack Integration Tests removes-duplicate-css 1`] = `"a{color:#00f}body{color:red}p{color:green}"`;