@umijs/bundler-webpack 4.0.0-rc.1 → 4.0.0-rc.2

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

@@ -1,7 +1,20 @@
 "use strict";
 
+/** @typedef {import("./index.js").MinimizedResult} MinimizedResult */
+
+/** @typedef {import("source-map").RawSourceMap} RawSourceMap */
+
+/** @typedef {import("./index.js").InternalResult} InternalResult */
+
+/**
+ * @template T
+ * @param {import("./index.js").InternalOptions<T>} options
+ * @returns {Promise<InternalResult>}
+ */
 const minify = async options => {
-  const minifyFns = typeof options.minify === "function" ? [options.minify] : options.minify;
+  const minifyFns = Array.isArray(options.minimizer.implementation) ? options.minimizer.implementation : [options.minimizer.implementation];
+  /** @type {InternalResult} */
+
   const result = {
     outputs: [],
     warnings: [],
@@ -11,7 +24,7 @@ const minify = async options => {
 
   for (let i = 0; i <= minifyFns.length - 1; i++) {
     const minifyFn = minifyFns[i];
-    const minifyOptions = Array.isArray(options.minifyOptions) ? options.minifyOptions[i] : options.minifyOptions;
+    const minifyOptions = Array.isArray(options.minimizer.options) ? options.minimizer.options[i] : options.minimizer.options;
     const prevResult = result.outputs.length > 0 ? result.outputs[result.outputs.length - 1] : {
       code: options.input,
       map: options.inputSourceMap
@@ -53,20 +66,21 @@ const minify = async options => {
 
   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
   // eslint-disable-next-line no-new-func, no-param-reassign
   const evaluatedOptions = new Function("exports", "require", "module", "__filename", "__dirname", `'use strict'\nreturn ${options}`)(exports, require, module, __filename, __dirname);
-  const result = await minify(evaluatedOptions);
-
-  if (result.error) {
-    throw result.error;
-  } else {
-    return result;
-  }
+  return minify(evaluatedOptions);
 }
 
-module.exports.minify = minify;
-module.exports.transform = transform;
+module.exports = {
+  minify,
+  transform
+};

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

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

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

@@ -1,17 +1,91 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.cssnanoMinify = cssnanoMinify;
-exports.cssoMinify = cssoMinify;
-exports.cleanCssMinify = cleanCssMinify;
-exports.esbuildMinify = esbuildMinify;
+/** @typedef {import("./index.js").Input} Input */
 
+/** @typedef {import("source-map").RawSourceMap} RawSourceMap */
+
+/** @typedef {import("source-map").SourceMapGenerator} SourceMapGenerator */
+
+/** @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.
+ * @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 */
-async function cssnanoMinify(input, inputSourceMap, minimizerOptions = {
+
+/**
+ * @param {Input} input
+ * @param {RawSourceMap | undefined} sourceMap
+ * @param {CustomOptions} minimizerOptions
+ * @return {Promise<MinimizedResult>}
+ */
+
+
+async function cssnanoMinify(input, sourceMap, minimizerOptions = {
   preset: "default"
 }) {
+  /**
+   * @template T
+   * @param {string} module
+   * @returns {Promise<T>}
+   */
   const load = async module => {
     let exports;
 
@@ -29,7 +103,9 @@ async function cssnanoMinify(input, inputSourceMap, minimizerOptions = {
         importESM = null;
       }
 
-      if (requireError.code === "ERR_REQUIRE_ESM" && importESM) {
+      if (
+      /** @type {Error & {code: string}} */
+      requireError.code === "ERR_REQUIRE_ESM" && importESM) {
         exports = await importESM(module);
         return exports.default;
       }
@@ -39,8 +115,9 @@ async function cssnanoMinify(input, inputSourceMap, minimizerOptions = {
   };
 
   const [[name, code]] = Object.entries(input);
+  /** @type {ProcessOptions} */
+
   const postcssOptions = {
-    to: name,
     from: name,
     ...minimizerOptions.processorOptions
   };
@@ -49,7 +126,9 @@ async function cssnanoMinify(input, inputSourceMap, minimizerOptions = {
     try {
       postcssOptions.parser = await load(postcssOptions.parser);
     } catch (error) {
-      throw new Error(`Loading PostCSS "${postcssOptions.parser}" parser failed: ${error.message}\n\n(@${name})`);
+      throw new Error(`Loading PostCSS "${postcssOptions.parser}" parser failed: ${
+      /** @type {Error} */
+      error.message}\n\n(@${name})`);
     }
   }
 
@@ -57,7 +136,9 @@ async function cssnanoMinify(input, inputSourceMap, minimizerOptions = {
     try {
       postcssOptions.stringifier = await load(postcssOptions.stringifier);
     } catch (error) {
-      throw new Error(`Loading PostCSS "${postcssOptions.stringifier}" stringifier failed: ${error.message}\n\n(@${name})`);
+      throw new Error(`Loading PostCSS "${postcssOptions.stringifier}" stringifier failed: ${
+      /** @type {Error} */
+      error.message}\n\n(@${name})`);
     }
   }
 
@@ -65,73 +146,125 @@ async function cssnanoMinify(input, inputSourceMap, minimizerOptions = {
     try {
       postcssOptions.syntax = await load(postcssOptions.syntax);
     } catch (error) {
-      throw new Error(`Loading PostCSS "${postcssOptions.syntax}" syntax failed: ${error.message}\n\n(@${name})`);
+      throw new Error(`Loading PostCSS "${postcssOptions.syntax}" syntax failed: ${
+      /** @type {Error} */
+      error.message}\n\n(@${name})`);
     }
   }
 
-  if (inputSourceMap) {
+  if (sourceMap) {
     postcssOptions.map = {
       annotation: false
     };
-  } // eslint-disable-next-line global-require
+  }
+  /** @type {Postcss} */
+  // eslint-disable-next-line global-require
 
 
-  const postcss = require('postcss'); // eslint-disable-next-line global-require
+  const postcss = require('postcss').default; // @ts-ignore
+  // eslint-disable-next-line global-require
 
 
-  const cssnano = require('@umijs/bundler-webpack/compiled/cssnano');
+  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.toString(),
+    map: result.map ? result.map.toJSON() : // eslint-disable-next-line no-undefined
+    undefined,
     warnings: result.warnings().map(String)
   };
 }
 /* istanbul ignore next */
 
+/**
+ * @param {Input} input
+ * @param {RawSourceMap | undefined} sourceMap
+ * @param {CustomOptions} minimizerOptions
+ * @return {Promise<MinimizedResult>}
+ */
+
 
-async function cssoMinify(input, inputSourceMap, minimizerOptions) {
+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,
-    sourceMap: Boolean(inputSourceMap),
+    sourceMap: Boolean(sourceMap),
     ...minimizerOptions
   });
   return {
     code: result.css,
-    map: result.map && result.map.toJSON()
+    map: result.map ?
+    /** @type {SourceMapGenerator & { toJSON(): RawSourceMap }} */
+    result.map.toJSON() : // eslint-disable-next-line no-undefined
+    undefined
   };
 }
 /* istanbul ignore next */
 
+/**
+ * @param {Input} input
+ * @param {RawSourceMap | undefined} sourceMap
+ * @param {CustomOptions} minimizerOptions
+ * @return {Promise<MinimizedResult>}
+ */
+
 
-async function cleanCssMinify(input, inputSourceMap, minimizerOptions) {
+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(inputSourceMap),
-    ...minimizerOptions
+    sourceMap: Boolean(sourceMap),
+    ...minimizerOptions,
+    returnPromise: true
   }).minify({
     [name]: {
       styles: code
     }
   });
+  const generatedSourceMap = result.sourceMap &&
+  /** @type {SourceMapGenerator & { toJSON(): RawSourceMap }} */
+  result.sourceMap.toJSON(); // workaround for source maps on windows
+
+  if (generatedSourceMap) {
+    // eslint-disable-next-line global-require
+    const isWindowsPathSep = require("path").sep === "\\";
+    generatedSourceMap.sources = generatedSourceMap.sources.map(
+    /**
+     * @param {string} item
+     * @returns {string}
+     */
+    item => isWindowsPathSep ? item.replace(/\\/g, "/") : item);
+  }
+
   return {
     code: result.styles,
-    map: result.sourceMap && result.sourceMap.toJSON(),
+    map: generatedSourceMap,
     warnings: result.warnings
   };
 }
 /* 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={}]
+   * @returns {import("esbuild").TransformOptions}
+   */
   const buildEsbuildOptions = (esbuildOptions = {}) => {
     // Need deep copy objects to avoid https://github.com/terser/terser/issues/366
     return {
@@ -160,7 +293,71 @@ async function esbuildMinify(input, sourceMap, minimizerOptions) {
   return {
     code: result.code,
     // eslint-disable-next-line no-undefined
-    map: result.map ? result.map : undefined,
-    warnings: result.warnings ? result.warnings.map(item => item.toString()) : []
+    map: result.map ? JSON.parse(result.map) : undefined,
+    warnings: result.warnings.length > 0 ? result.warnings.map(item => {
+      return {
+        source: item.location && item.location.file,
+        // eslint-disable-next-line no-undefined
+        line: item.location && item.location.line ? item.location.line : undefined,
+        // eslint-disable-next-line no-undefined
+        column: item.location && item.location.column ? item.location.column : 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 */
+
+/**
+ * @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}
+   */
+
+  const buildParcelCssOptions = (parcelCssOptions = {}) => {
+    // Need deep copy objects to avoid https://github.com/terser/terser/issues/366
+    return {
+      minify: true,
+      ...parcelCssOptions,
+      sourceMap: false,
+      filename,
+      code: Buffer.from(code)
+    };
+  }; // eslint-disable-next-line import/no-extraneous-dependencies, global-require
+
+
+  const parcelCss = require("@parcel/css"); // Copy `esbuild` 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(),
+    // eslint-disable-next-line no-undefined
+    map: result.map ? JSON.parse(result.map.toString()) : undefined
   };
-}
+}
+
+module.exports = {
+  throttleAll,
+  cssnanoMinify,
+  cssoMinify,
+  cleanCssMinify,
+  esbuildMinify,
+  parcelCssMinify
+};