@umijs/bundler-webpack 4.0.88 → 4.0.90

package/compiled/css-minimizer-webpack-plugin/minify.js

@@ -1,9 +1,6 @@
 "use strict";
 
 /** @typedef {import("./index.js").MinimizedResult} MinimizedResult */
-
-/** @typedef {import("source-map").RawSourceMap} RawSourceMap */
-
 /** @typedef {import("./index.js").InternalResult} InternalResult */
 
 /**
@@ -13,15 +10,14 @@
  */
 const minify = async options => {
   const minifyFns = Array.isArray(options.minimizer.implementation) ? options.minimizer.implementation : [options.minimizer.implementation];
-  /** @type {InternalResult} */
 
+  /** @type {InternalResult} */
   const result = {
     outputs: [],
     warnings: [],
     errors: []
   };
   let needSourceMap = false;
-
   for (let i = 0; i <= minifyFns.length - 1; i++) {
     const minifyFn = minifyFns[i];
     const minifyOptions = Array.isArray(options.minimizer.options) ? options.minimizer.options[i] : options.minimizer.options;
@@ -32,46 +28,38 @@ const minify = async options => {
     const {
       code,
       map
-    } = prevResult; // eslint-disable-next-line no-await-in-loop
-
+    } = prevResult;
+    // eslint-disable-next-line no-await-in-loop
     const minifyResult = await minifyFn({
       [options.name]: code
     }, map, minifyOptions);
-
     if (typeof minifyResult.code !== "string") {
       throw new Error("minimizer function doesn't return the 'code' property or result is not a string value");
     }
-
     if (minifyResult.map) {
       needSourceMap = true;
     }
-
     if (minifyResult.errors) {
       result.errors = result.errors.concat(minifyResult.errors);
     }
-
     if (minifyResult.warnings) {
       result.warnings = result.warnings.concat(minifyResult.warnings);
     }
-
     result.outputs.push({
       code: minifyResult.code,
       map: minifyResult.map
     });
   }
-
   if (!needSourceMap) {
     result.outputs = [result.outputs[result.outputs.length - 1]];
   }
-
   return result;
 };
+
 /**
  * @param {string} options
  * @returns {Promise<InternalResult>}
  */
-
-
 async function transform(options) {
   // 'use strict' => this === undefined (Clean Scope)
   // Safer for possible security issues, albeit not critical at all here
@@ -79,7 +67,6 @@ async function transform(options) {
   const evaluatedOptions = new Function("exports", "require", "module", "__filename", "__dirname", `'use strict'\nreturn ${options}`)(exports, require, module, __filename, __dirname);
   return minify(evaluatedOptions);
 }
-
 module.exports = {
   minify,
   transform

package/compiled/css-minimizer-webpack-plugin/package.json

@@ -1 +1 @@
-{"name":"css-minimizer-webpack-plugin","author":"Loann Neveu","license":"MIT","types":"types/index.d.ts"}
+{"name":"css-minimizer-webpack-plugin","version":"5.0.1","author":"Loann Neveu","license":"MIT","types":"types/index.d.ts"}

package/compiled/css-minimizer-webpack-plugin/utils.js

@@ -1,83 +1,68 @@
 "use strict";
 
 /** @typedef {import("./index.js").Input} Input */
-
-/** @typedef {import("source-map").RawSourceMap} RawSourceMap */
-
-/** @typedef {import("source-map").SourceMapGenerator} SourceMapGenerator */
-
+/** @typedef {import("@jridgewell/trace-mapping").EncodedSourceMap} RawSourceMap */
 /** @typedef {import("./index.js").MinimizedResult} MinimizedResult */
-
 /** @typedef {import("./index.js").CustomOptions} CustomOptions */
-
 /** @typedef {import("postcss").ProcessOptions} ProcessOptions */
-
 /** @typedef {import("postcss").Postcss} Postcss */
+
 const notSettled = Symbol(`not-settled`);
+
 /**
  * @template T
  * @typedef {() => Promise<T>} Task
  */
 
 /**
- * Run tasks with limited concurency.
+ * Run tasks with limited concurrency.
  * @template T
  * @param {number} limit - Limit of tasks that run at once.
  * @param {Task<T>[]} tasks - List of tasks to run.
  * @returns {Promise<T[]>} A promise that fulfills to an array of the results
  */
-
 function throttleAll(limit, tasks) {
   if (!Number.isInteger(limit) || limit < 1) {
     throw new TypeError(`Expected \`limit\` to be a finite number > 0, got \`${limit}\` (${typeof limit})`);
   }
-
   if (!Array.isArray(tasks) || !tasks.every(task => typeof task === `function`)) {
     throw new TypeError(`Expected \`tasks\` to be a list of functions returning a promise`);
   }
-
   return new Promise((resolve, reject) => {
     const result = Array(tasks.length).fill(notSettled);
     const entries = tasks.entries();
-
     const next = () => {
       const {
         done,
         value
       } = entries.next();
-
       if (done) {
         const isLast = !result.includes(notSettled);
         if (isLast) resolve(result);
         return;
       }
-
       const [index, task] = value;
+
       /**
        * @param {T} x
        */
-
       const onFulfilled = x => {
         result[index] = x;
         next();
       };
-
       task().then(onFulfilled, reject);
     };
-
     Array(limit).fill(0).forEach(next);
   });
 }
-/* istanbul ignore next */
 
+/* istanbul ignore next */
 /**
  * @param {Input} input
  * @param {RawSourceMap | undefined} sourceMap
  * @param {CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
-
-
 async function cssnanoMinify(input, sourceMap, minimizerOptions = {
   preset: "default"
 }) {
@@ -88,109 +73,91 @@ async function cssnanoMinify(input, sourceMap, minimizerOptions = {
    */
   const load = async module => {
     let exports;
-
     try {
       // eslint-disable-next-line import/no-dynamic-require, global-require
       exports = require(module);
       return exports;
     } catch (requireError) {
       let importESM;
-
       try {
         // eslint-disable-next-line no-new-func
         importESM = new Function("id", "return import(id);");
       } catch (e) {
         importESM = null;
       }
-
-      if (
-      /** @type {Error & {code: string}} */
+      if ( /** @type {Error & {code: string}} */
       requireError.code === "ERR_REQUIRE_ESM" && importESM) {
         exports = await importESM(module);
         return exports.default;
       }
-
       throw requireError;
     }
   };
-
   const [[name, code]] = Object.entries(input);
   /** @type {ProcessOptions} */
-
   const postcssOptions = {
     from: name,
     ...minimizerOptions.processorOptions
   };
-
   if (typeof postcssOptions.parser === "string") {
     try {
       postcssOptions.parser = await load(postcssOptions.parser);
     } catch (error) {
       throw new Error(`Loading PostCSS "${postcssOptions.parser}" parser failed: ${
-      /** @type {Error} */
-      error.message}\n\n(@${name})`);
+      /** @type {Error} */error.message}\n\n(@${name})`);
     }
   }
-
   if (typeof postcssOptions.stringifier === "string") {
     try {
       postcssOptions.stringifier = await load(postcssOptions.stringifier);
     } catch (error) {
       throw new Error(`Loading PostCSS "${postcssOptions.stringifier}" stringifier failed: ${
-      /** @type {Error} */
-      error.message}\n\n(@${name})`);
+      /** @type {Error} */error.message}\n\n(@${name})`);
     }
   }
-
   if (typeof postcssOptions.syntax === "string") {
     try {
       postcssOptions.syntax = await load(postcssOptions.syntax);
     } catch (error) {
       throw new Error(`Loading PostCSS "${postcssOptions.syntax}" syntax failed: ${
-      /** @type {Error} */
-      error.message}\n\n(@${name})`);
+      /** @type {Error} */error.message}\n\n(@${name})`);
     }
   }
-
   if (sourceMap) {
     postcssOptions.map = {
       annotation: false
     };
   }
+
   /** @type {Postcss} */
   // eslint-disable-next-line global-require
-
-
-  const postcss = require('postcss').default; // @ts-ignore
+  const postcss = require('postcss').default;
+  // @ts-ignore
   // eslint-disable-next-line global-require
-
-
-  const cssnano = require('@umijs/bundler-webpack/compiled/cssnano'); // @ts-ignore
+  const cssnano = require('@umijs/bundler-webpack/compiled/cssnano');
+  // @ts-ignore
   // Types are broken
-
-
   const result = await postcss([cssnano(minimizerOptions)]).process(code, postcssOptions);
   return {
     code: result.css,
-    map: result.map ? result.map.toJSON() : // eslint-disable-next-line no-undefined
+    // @ts-ignore
+    map: result.map ? result.map.toJSON() :
+    // eslint-disable-next-line no-undefined
     undefined,
     warnings: result.warnings().map(String)
   };
 }
-/* istanbul ignore next */
 
+/* istanbul ignore next */
 /**
  * @param {Input} input
  * @param {RawSourceMap | undefined} sourceMap
  * @param {CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
-
-
 async function cssoMinify(input, sourceMap, minimizerOptions) {
   // eslint-disable-next-line global-require,import/no-extraneous-dependencies
   const csso = require("csso");
-
   const [[filename, code]] = Object.entries(input);
   const result = csso.minify(code, {
     filename,
@@ -199,26 +166,23 @@ async function cssoMinify(input, sourceMap, minimizerOptions) {
   });
   return {
     code: result.css,
-    map: result.map ?
-    /** @type {SourceMapGenerator & { toJSON(): RawSourceMap }} */
-    result.map.toJSON() : // eslint-disable-next-line no-undefined
+    map: result.map ? /** @type {any & { toJSON(): RawSourceMap }} */
+    result.map.toJSON() :
+    // eslint-disable-next-line no-undefined
     undefined
   };
 }
-/* istanbul ignore next */
 
+/* istanbul ignore next */
 /**
  * @param {Input} input
  * @param {RawSourceMap | undefined} sourceMap
  * @param {CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
-
-
 async function cleanCssMinify(input, sourceMap, minimizerOptions) {
   // eslint-disable-next-line global-require,import/no-extraneous-dependencies
   const CleanCSS = require("clean-css");
-
   const [[name, code]] = Object.entries(input);
   const result = await new CleanCSS({
     sourceMap: Boolean(sourceMap),
@@ -229,10 +193,10 @@ async function cleanCssMinify(input, sourceMap, minimizerOptions) {
       styles: code
     }
   });
-  const generatedSourceMap = result.sourceMap &&
-  /** @type {SourceMapGenerator & { toJSON(): RawSourceMap }} */
-  result.sourceMap.toJSON(); // workaround for source maps on windows
+  const generatedSourceMap = result.sourceMap && /** @type {any & { toJSON(): RawSourceMap }} */
+  result.sourceMap.toJSON();
 
+  // workaround for source maps on windows
   if (generatedSourceMap) {
     // eslint-disable-next-line global-require
     const isWindowsPathSep = require("path").sep === "\\";
@@ -243,23 +207,20 @@ async function cleanCssMinify(input, sourceMap, minimizerOptions) {
      */
     item => isWindowsPathSep ? item.replace(/\\/g, "/") : item);
   }
-
   return {
     code: result.styles,
     map: generatedSourceMap,
     warnings: result.warnings
   };
 }
-/* istanbul ignore next */
 
+/* istanbul ignore next */
 /**
  * @param {Input} input
  * @param {RawSourceMap | undefined} sourceMap
  * @param {CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
-
-
 async function esbuildMinify(input, sourceMap, minimizerOptions) {
   /**
    * @param {import("esbuild").TransformOptions} [esbuildOptions={}]
@@ -274,19 +235,19 @@ async function esbuildMinify(input, sourceMap, minimizerOptions) {
       ...esbuildOptions,
       sourcemap: false
     };
-  }; // eslint-disable-next-line import/no-extraneous-dependencies, global-require
-
-
-  const esbuild = require('@umijs/bundler-utils/compiled/esbuild'); // Copy `esbuild` options
+  };
 
+  // eslint-disable-next-line import/no-extraneous-dependencies, global-require
+  const esbuild = require('@umijs/bundler-utils/compiled/esbuild');
 
-  const esbuildOptions = buildEsbuildOptions(minimizerOptions); // Let `esbuild` generate a SourceMap
+  // Copy `esbuild` options
+  const esbuildOptions = buildEsbuildOptions(minimizerOptions);
 
+  // Let `esbuild` generate a SourceMap
   if (sourceMap) {
     esbuildOptions.sourcemap = true;
     esbuildOptions.sourcesContent = false;
   }
-
   const [[filename, code]] = Object.entries(input);
   esbuildOptions.sourcefile = filename;
   const result = await esbuild.transform(code, esbuildOptions);
@@ -297,33 +258,33 @@ async function esbuildMinify(input, sourceMap, minimizerOptions) {
     warnings: result.warnings.length > 0 ? result.warnings.map(item => {
       return {
         source: item.location && item.location.file,
+        line: item.location && item.location.line ? item.location.line :
         // eslint-disable-next-line no-undefined
-        line: item.location && item.location.line ? item.location.line : undefined,
+        undefined,
+        column: item.location && item.location.column ? item.location.column :
         // eslint-disable-next-line no-undefined
-        column: item.location && item.location.column ? item.location.column : undefined,
+        undefined,
         plugin: item.pluginName,
         message: `${item.text}${item.detail ? `\nDetails:\n${item.detail}` : ""}${item.notes.length > 0 ? `\n\nNotes:\n${item.notes.map(note => `${note.location ? `[${note.location.file}:${note.location.line}:${note.location.column}] ` : ""}${note.text}${note.location ? `\nSuggestion: ${note.location.suggestion}` : ""}${note.location ? `\nLine text:\n${note.location.lineText}\n` : ""}`).join("\n")}` : ""}`
       };
     }) : []
   };
 }
-/* istanbul ignore next */
 
+// TODO remove in the next major release
+/* istanbul ignore next */
 /**
  * @param {Input} input
  * @param {RawSourceMap | undefined} sourceMap
  * @param {CustomOptions} minimizerOptions
  * @return {Promise<MinimizedResult>}
  */
-
-
 async function parcelCssMinify(input, sourceMap, minimizerOptions) {
   const [[filename, code]] = Object.entries(input);
   /**
-   * @param {Partial<import("@parcel/css").TransformOptions>} [parcelCssOptions={}]
-   * @returns {import("@parcel/css").TransformOptions}
+   * @param {Partial<import("@parcel/css").TransformOptions<any>>} [parcelCssOptions={}]
+   * @returns {import("@parcel/css").TransformOptions<any>}
    */
-
   const buildParcelCssOptions = (parcelCssOptions = {}) => {
     // Need deep copy objects to avoid https://github.com/terser/terser/issues/366
     return {
@@ -333,18 +294,18 @@ async function parcelCssMinify(input, sourceMap, minimizerOptions) {
       filename,
       code: Buffer.from(code)
     };
-  }; // eslint-disable-next-line import/no-extraneous-dependencies, global-require
-
-
-  const parcelCss = require("@parcel/css"); // Copy `esbuild` options
+  };
 
+  // eslint-disable-next-line import/no-extraneous-dependencies, global-require
+  const parcelCss = require("@parcel/css");
 
-  const parcelCssOptions = buildParcelCssOptions(minimizerOptions); // Let `esbuild` generate a SourceMap
+  // Copy `parcel-css` options
+  const parcelCssOptions = buildParcelCssOptions(minimizerOptions);
 
+  // Let `esbuild` generate a SourceMap
   if (sourceMap) {
     parcelCssOptions.sourceMap = true;
   }
-
   const result = await parcelCss.transform(parcelCssOptions);
   return {
     code: result.code.toString(),
@@ -353,11 +314,104 @@ async function parcelCssMinify(input, sourceMap, minimizerOptions) {
   };
 }
 
+/* istanbul ignore next */
+/**
+ * @param {Input} input
+ * @param {RawSourceMap | undefined} sourceMap
+ * @param {CustomOptions} minimizerOptions
+ * @return {Promise<MinimizedResult>}
+ */
+async function lightningCssMinify(input, sourceMap, minimizerOptions) {
+  const [[filename, code]] = Object.entries(input);
+  /**
+   * @param {Partial<import("lightningcss").TransformOptions<any>>} [lightningCssOptions={}]
+   * @returns {import("lightningcss").TransformOptions<any>}
+   */
+  const buildLightningCssOptions = (lightningCssOptions = {}) => {
+    // Need deep copy objects to avoid https://github.com/terser/terser/issues/366
+    return {
+      minify: true,
+      ...lightningCssOptions,
+      sourceMap: false,
+      filename,
+      code: Buffer.from(code)
+    };
+  };
+
+  // eslint-disable-next-line import/no-extraneous-dependencies, global-require
+  const lightningCss = require("lightningcss");
+
+  // Copy `lightningCss` options
+  const lightningCssOptions = buildLightningCssOptions(minimizerOptions);
+
+  // Let `esbuild` generate a SourceMap
+  if (sourceMap) {
+    lightningCssOptions.sourceMap = true;
+  }
+  const result = await lightningCss.transform(lightningCssOptions);
+  return {
+    code: result.code.toString(),
+    // eslint-disable-next-line no-undefined
+    map: result.map ? JSON.parse(result.map.toString()) : undefined
+  };
+}
+
+/* istanbul ignore next */
+/**
+ * @param {Input} input
+ * @param {RawSourceMap | undefined} sourceMap
+ * @param {CustomOptions} minimizerOptions
+ * @return {Promise<MinimizedResult>}
+ */
+async function swcMinify(input, sourceMap, minimizerOptions) {
+  const [[filename, code]] = Object.entries(input);
+  /**
+   * @param {Partial<import("@swc/css").Options>} [swcOptions={}]
+   * @returns {import("@swc/css").Options}
+   */
+  const buildSwcOptions = (swcOptions = {}) => {
+    // Need deep copy objects to avoid https://github.com/terser/terser/issues/366
+    return {
+      ...swcOptions,
+      filename
+    };
+  };
+
+  // eslint-disable-next-line import/no-extraneous-dependencies, global-require
+  const swc = require("@swc/css");
+
+  // Copy `swc` options
+  const swcOptions = buildSwcOptions(minimizerOptions);
+
+  // Let `swc` generate a SourceMap
+  if (sourceMap) {
+    swcOptions.sourceMap = true;
+  }
+  const result = await swc.minify(Buffer.from(code), swcOptions);
+  return {
+    code: result.code.toString(),
+    // eslint-disable-next-line no-undefined
+    map: result.map ? JSON.parse(result.map.toString()) : undefined,
+    errors: result.errors ? result.errors.map(diagnostic => {
+      const error = new Error(diagnostic.message);
+
+      // @ts-ignore
+      error.span = diagnostic.span;
+      // @ts-ignore
+      error.level = diagnostic.level;
+      return error;
+    }) :
+    // eslint-disable-next-line no-undefined
+    undefined
+  };
+}
 module.exports = {
   throttleAll,
   cssnanoMinify,
   cssoMinify,
   cleanCssMinify,
   esbuildMinify,
-  parcelCssMinify
+  parcelCssMinify,
+  lightningCssMinify,
+  swcMinify
 };

package/dist/config/compressPlugin.js

@@ -107,7 +107,7 @@ async function addCompressPlugin(opts) {
   } else if (cssMinifier === import_types.CSSMinifier.cssnano) {
     cssMinify = import_css_minimizer_webpack_plugin.default.cssnanoMinify;
   } else if (cssMinifier === import_types.CSSMinifier.parcelCSS) {
-    cssMinify = import_css_minimizer_webpack_plugin.default.parcelCssMinify;
+    cssMinify = import_css_minimizer_webpack_plugin.default.lightningCssMinify;
   } else if (cssMinifier !== import_types.CSSMinifier.none) {
     throw new Error(`Unsupported cssMinifier ${userConfig.cssMinifier}.`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.88",
+  "version": "4.0.90",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -32,16 +32,16 @@
     "es5-imcompatible-versions": "^0.1.78",
     "fork-ts-checker-webpack-plugin": "8.0.0",
     "jest-worker": "29.4.3",
-    "lightningcss": "1.19.0",
+    "lightningcss": "1.22.1",
     "node-libs-browser": "2.2.1",
     "postcss": "^8.4.21",
     "postcss-preset-env": "7.5.0",
     "react-error-overlay": "6.0.9",
     "react-refresh": "0.14.0",
-    "@umijs/babel-preset-umi": "4.0.88",
-    "@umijs/mfsu": "4.0.88",
-    "@umijs/utils": "4.0.88",
-    "@umijs/bundler-utils": "4.0.88"
+    "@umijs/babel-preset-umi": "4.0.90",
+    "@umijs/bundler-utils": "4.0.90",
+    "@umijs/utils": "4.0.90",
+    "@umijs/mfsu": "4.0.90"
   },
   "devDependencies": {
     "@swc/core": "1.3.67",
@@ -54,7 +54,7 @@
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
     "copy-webpack-plugin": "10.2.4",
-    "css-minimizer-webpack-plugin": "4.0.0",
+    "css-minimizer-webpack-plugin": "5.0.1",
     "cssnano": "5.1.7",
     "file-loader": "6.2.0",
     "less-loader": "11.1.0",