refactor: code

Author: cap-Bernardito

README.md

@@ -188,17 +188,17 @@ module.exports = {
 ### `minify`
 
 Type: `Function|Array<Function>`
-Default: `CssMinimizerPlugin.cssnano`
+Default: `CssMinimizerPlugin.cssnanoMinify`
 
 Allows to override default minify function.
 By default plugin uses [cssnano](https://github.com/cssnano/cssnano) package.
 Useful for using and testing unpublished versions or forks.
 
 Possible options:
 
-- CssMinimizerPlugin.cssnano
-- CssMinimizerPlugin.csso
-- CssMinimizerPlugin.cleanCss
+- CssMinimizerPlugin.cssnanoMinify
+- CssMinimizerPlugin.cssoMinify
+- CssMinimizerPlugin.cleanCssMinify
 - async (data, inputMap, minimizerOptions) => {return {code: `a{color: red}`, map: `...`, warnings: []}}
 
 > ⚠️ **Always use `require` inside `minify` function when `parallel` option enabled**.
@@ -263,13 +263,13 @@ module.exports = {
     minimizer: [
       new CssMinimizerPlugin({
         minimizerOptions: [
-          {}, // Options for the first function (CssMinimizerPlugin.cssnano)
-          {}, // Options for the second function (CssMinimizerPlugin.cssClean)
+          {}, // Options for the first function (CssMinimizerPlugin.cssnanoMinify)
+          {}, // Options for the second function (CssMinimizerPlugin.cleanCssMinify)
           {}, // Options for the third function
         ],
         minify: [
-          CssMinimizerPlugin.cssnano,
-          CssMinimizerPlugin.cssClean,
+          CssMinimizerPlugin.cssnanoMinify,
+          CssMinimizerPlugin.cleanCssMinify,
           async (data, inputMap, minimizerOptions) => {
             // To do something
             return {

package-lock.json

@@ -38,8 +38,6 @@
     "dist"
   ],
   "peerDependencies": {
-    "clean-css": "^5.1.2",
-    "csso": "^4.2.0",
     "webpack": "^5.0.0"
   },
   "peerDependenciesMeta": {

package.json

@@ -449,8 +449,8 @@ class CssMinimizerPlugin {
   }
 }
 
-CssMinimizerPlugin.cssnano = cssnanoMinify;
-CssMinimizerPlugin.csso = cssoMinify;
-CssMinimizerPlugin.cleanCss = cleanCssMinify;
+CssMinimizerPlugin.cssnanoMinify = cssnanoMinify;
+CssMinimizerPlugin.cssoMinify = cssoMinify;
+CssMinimizerPlugin.cleanCssMinify = cleanCssMinify;
 
 export default CssMinimizerPlugin;

src/index.js

@@ -89,7 +89,7 @@ async function cssnanoMinify(
 
 /* istanbul ignore next */
 async function cssoMinify(data, inputSourceMap, minimizerOptions) {
-  // eslint-disable-next-line global-require
+  // eslint-disable-next-line global-require,import/no-extraneous-dependencies
   const csso = require('csso');
   // eslint-disable-next-line global-require
   const sourcemap = require('source-map');
@@ -115,7 +115,7 @@ async function cssoMinify(data, inputSourceMap, minimizerOptions) {
 
 /* istanbul ignore next */
 async function cleanCssMinify(data, inputSourceMap, minimizerOptions) {
-  // eslint-disable-next-line global-require
+  // eslint-disable-next-line global-require,import/no-extraneous-dependencies
   const CleanCSS = require('clean-css');
   const [[name, input]] = Object.entries(data);
   const result = await new CleanCSS({

src/utils.js

@@ -60,45 +60,45 @@ exports[`"minify" option should work if minify is array && minimizerOptions is o
 
 exports[`"minify" option should work if minify is array && minimizerOptions is object: warning 1`] = `Array []`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cleanCss" minifier: assets 1`] = `
+exports[`"minify" option should work with "CssMinimizerPlugin.cleanCssMinify" minifier: assets 1`] = `
 Object {
   "foo.css": "body{color:red}a{color:#00f}
 /*# sourceMappingURL=foo.css.map*/",
   "foo.css.map": "{\\"version\\":3,\\"sources\\":[\\"webpack:///./foo.css\\"],\\"names\\":[],\\"mappings\\":\\"AAAA,KACE,MAAO,IAET,EACE,MAAO\\",\\"file\\":\\"foo.css\\",\\"sourcesContent\\":[\\"body {\\\\n  color: red;\\\\n}\\\\na {\\\\n  color: blue;\\\\n}\\"],\\"sourceRoot\\":\\"\\"}",
 }
 `;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cleanCss" minifier: error 1`] = `Array []`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cleanCssMinify" minifier: error 1`] = `Array []`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cleanCss" minifier: warning 1`] = `Array []`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cleanCssMinify" minifier: warning 1`] = `Array []`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cssnano" and parser option as "String": entry.js.map 1`] = `"{\\"version\\":3,\\"sources\\":[\\"webpack:///webpack/bootstrap\\",\\"webpack:///webpack/runtime/define property getters\\",\\"webpack:///webpack/runtime/hasOwnProperty shorthand\\",\\"webpack:///webpack/runtime/make namespace object\\",\\"webpack:///./sugarss.js\\"],\\"names\\":[],\\"mappings\\":\\";;UAAA;UACA;;;;;WCDA;WACA;WACA;WACA;WACA,wCAAwC,yCAAyC;WACjF;WACA;WACA,E;;;;;WCPA,wF;;;;;WCAA;WACA;WACA;WACA,sDAAsD,kBAAkB;WACxE;WACA,+CAA+C,cAAc;WAC7D,E;;;;;;;;;;;;ACNO\\",\\"file\\":\\"entry.js\\",\\"sourcesContent\\":[\\"// The require scope\\\\nvar __webpack_require__ = {};\\\\n\\\\n\\",\\"// define getter functions for harmony exports\\\\n__webpack_require__.d = (exports, definition) => {\\\\n\\\\tfor(var key in definition) {\\\\n\\\\t\\\\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\\\\n\\\\t\\\\t\\\\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\\\\n\\\\t\\\\t}\\\\n\\\\t}\\\\n};\\",\\"__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))\\",\\"// define __esModule on exports\\\\n__webpack_require__.r = (exports) => {\\\\n\\\\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\\\\n\\\\t\\\\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\\\\n\\\\t}\\\\n\\\\tObject.defineProperty(exports, '__esModule', { value: true });\\\\n};\\",\\"export const foo = 'foo';\\\\n\\"],\\"sourceRoot\\":\\"\\"}"`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cssnanoMinify" and parser option as "String": entry.js.map 1`] = `"{\\"version\\":3,\\"sources\\":[\\"webpack:///webpack/bootstrap\\",\\"webpack:///webpack/runtime/define property getters\\",\\"webpack:///webpack/runtime/hasOwnProperty shorthand\\",\\"webpack:///webpack/runtime/make namespace object\\",\\"webpack:///./sugarss.js\\"],\\"names\\":[],\\"mappings\\":\\";;UAAA;UACA;;;;;WCDA;WACA;WACA;WACA;WACA,wCAAwC,yCAAyC;WACjF;WACA;WACA,E;;;;;WCPA,wF;;;;;WCAA;WACA;WACA;WACA,sDAAsD,kBAAkB;WACxE;WACA,+CAA+C,cAAc;WAC7D,E;;;;;;;;;;;;ACNO\\",\\"file\\":\\"entry.js\\",\\"sourcesContent\\":[\\"// The require scope\\\\nvar __webpack_require__ = {};\\\\n\\\\n\\",\\"// define getter functions for harmony exports\\\\n__webpack_require__.d = (exports, definition) => {\\\\n\\\\tfor(var key in definition) {\\\\n\\\\t\\\\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\\\\n\\\\t\\\\t\\\\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\\\\n\\\\t\\\\t}\\\\n\\\\t}\\\\n};\\",\\"__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))\\",\\"// define __esModule on exports\\\\n__webpack_require__.r = (exports) => {\\\\n\\\\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\\\\n\\\\t\\\\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\\\\n\\\\t}\\\\n\\\\tObject.defineProperty(exports, '__esModule', { value: true });\\\\n};\\",\\"export const foo = 'foo';\\\\n\\"],\\"sourceRoot\\":\\"\\"}"`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cssnano" and parser option as "String": index.sss 1`] = `"a{color:#000}"`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cssnanoMinify" and parser option as "String": index.sss 1`] = `"a{color:#000}"`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cssnano": assets 1`] = `
+exports[`"minify" option should work with "CssMinimizerPlugin.cssnanoMinify": assets 1`] = `
 Object {
   "foo.css": "body{font-weight:700;color:red}body a{text-align:center}
 /*# sourceMappingURL=foo.css.map*/",
   "foo.css.map": "{\\"version\\":3,\\"sources\\":[\\"webpack:///./sourcemap/bar.scss\\",\\"webpack:///./sourcemap/foo.scss\\"],\\"names\\":[],\\"mappings\\":\\"AAAA,KACE,gBCEA,SADF,CAEE,OACE,iBAIJ\\",\\"file\\":\\"foo.css\\",\\"sourcesContent\\":[\\"body {\\\\n  font-weight: bold;\\\\n}\\",\\"@import 'bar';\\\\n\\\\nbody {\\\\n  color: red;\\\\n  a {\\\\n    text-align: center;\\\\n  }\\\\n}\\"],\\"sourceRoot\\":\\"\\"}",
 }
 `;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cssnano": error 1`] = `Array []`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cssnanoMinify": error 1`] = `Array []`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.cssnano": warning 1`] = `Array []`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cssnanoMinify": warning 1`] = `Array []`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.csso" minifier: assets 1`] = `
+exports[`"minify" option should work with "CssMinimizerPlugin.cssoMinify" minifier: assets 1`] = `
 Object {
   "foo.css": "body{font-weight:700;color:red}body a{text-align:center}
 /*# sourceMappingURL=foo.css.map*/",
   "foo.css.map": "{\\"version\\":3,\\"sources\\":[\\"webpack:///./sourcemap/bar.scss\\",\\"webpack:///./sourcemap/foo.scss\\"],\\"names\\":[],\\"mappings\\":\\"AAAA,I,CACE,e,CCEA,S,CACA,M,CACE,iB\\",\\"file\\":\\"foo.css\\",\\"sourcesContent\\":[\\"body {\\\\n  font-weight: bold;\\\\n}\\",\\"@import 'bar';\\\\n\\\\nbody {\\\\n  color: red;\\\\n  a {\\\\n    text-align: center;\\\\n  }\\\\n}\\"],\\"sourceRoot\\":\\"\\"}",
 }
 `;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.csso" minifier: error 1`] = `Array []`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cssoMinify" minifier: error 1`] = `Array []`;
 
-exports[`"minify" option should work with "CssMinimizerPlugin.csso" minifier: warning 1`] = `Array []`;
+exports[`"minify" option should work with "CssMinimizerPlugin.cssoMinify" minifier: warning 1`] = `Array []`;
 
 exports[`"minify" option should work with "clean-css" minifier: assets 1`] = `
 Object {

test/__snapshots__/minify-option.test.js.snap

@@ -225,7 +225,7 @@ describe('"minify" option', () => {
     expect(getWarnings(stats)).toMatchSnapshot('warning');
   });
 
-  it('should work with "CssMinimizerPlugin.cssnano"', async () => {
+  it('should work with "CssMinimizerPlugin.cssnanoMinify"', async () => {
     const compiler = getCompiler({
       devtool: 'source-map',
       entry: {
@@ -249,7 +249,7 @@ describe('"minify" option', () => {
       minimizerOptions: {
         preset: 'default',
       },
-      minify: [CssMinimizerPlugin.cssnano],
+      minify: [CssMinimizerPlugin.cssnanoMinify],
     }).apply(compiler);
 
     const stats = await compile(compiler);
@@ -261,7 +261,7 @@ describe('"minify" option', () => {
     expect(getWarnings(stats)).toMatchSnapshot('warning');
   });
 
-  it('should work with "CssMinimizerPlugin.cssnano" and parser option as "String"', async () => {
+  it('should work with "CssMinimizerPlugin.cssnanoMinify" and parser option as "String"', async () => {
     const compiler = getCompiler({
       devtool: 'source-map',
       entry: {
@@ -290,7 +290,7 @@ describe('"minify" option', () => {
           parser: 'sugarss',
         },
       },
-      minify: [CssMinimizerPlugin.cssnano],
+      minify: [CssMinimizerPlugin.cssnanoMinify],
     }).apply(compiler);
 
     return compile(compiler).then((stats) => {
@@ -305,7 +305,7 @@ describe('"minify" option', () => {
     });
   });
 
-  it('should work with "CssMinimizerPlugin.csso" minifier', async () => {
+  it('should work with "CssMinimizerPlugin.cssoMinify" minifier', async () => {
     const compiler = getCompiler({
       devtool: 'source-map',
       entry: {
@@ -326,7 +326,7 @@ describe('"minify" option', () => {
     });
 
     new CssMinimizerPlugin({
-      minify: CssMinimizerPlugin.csso,
+      minify: CssMinimizerPlugin.cssoMinify,
     }).apply(compiler);
 
     const stats = await compile(compiler);
@@ -338,7 +338,7 @@ describe('"minify" option', () => {
     expect(getWarnings(stats)).toMatchSnapshot('warning');
   });
 
-  it('should work with "CssMinimizerPlugin.cleanCss" minifier', async () => {
+  it('should work with "CssMinimizerPlugin.cleanCssMinify" minifier', async () => {
     const compiler = getCompiler({
       devtool: 'source-map',
       entry: {
@@ -347,7 +347,7 @@ describe('"minify" option', () => {
     });
 
     new CssMinimizerPlugin({
-      minify: CssMinimizerPlugin.cleanCss,
+      minify: CssMinimizerPlugin.cleanCssMinify,
     }).apply(compiler);
 
     const stats = await compile(compiler);

test/minify-option.test.js

@@ -20,7 +20,7 @@ describe('worker', () => {
         sourcesContent: ['.foo{color:red;}', '.bar{color:coral;}'],
       },
       minimizerOptions: { discardComments: false },
-      minify: CssMinimizerPlugin.cssnano,
+      minify: CssMinimizerPlugin.cssnanoMinify,
     };
     const { code, map } = await transform(serialize(options));
 
@@ -41,7 +41,7 @@ describe('worker', () => {
         file: 'x',
         sourcesContent: ['.foo{color:red;}', '.bar{color:coral;}'],
       },
-      minify: CssMinimizerPlugin.cssnano,
+      minify: CssMinimizerPlugin.cssnanoMinify,
     };
     const { code, map } = await transform(serialize(options));
 
@@ -69,7 +69,7 @@ describe('worker', () => {
       name: 'entry.css',
       input: false,
       minimizerOptions: { preset: 'default' },
-      minify: CssMinimizerPlugin.cssnano,
+      minify: CssMinimizerPlugin.cssnanoMinify,
     };
 
     try {