@umijs/bundler-webpack 4.0.0-beta.7 → 4.0.0-canary.202200505.1

package/compiled/terser-webpack-plugin/utils.js

@@ -1,13 +1,5 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.terserMinify = terserMinify;
-exports.uglifyJsMinify = uglifyJsMinify;
-exports.swcMinify = swcMinify;
-exports.esbuildMinify = esbuildMinify;
-
 /** @typedef {import("source-map").RawSourceMap} RawSourceMap */
 
 /** @typedef {import("terser").FormatOptions} TerserFormatOptions */
@@ -28,14 +20,68 @@ exports.esbuildMinify = esbuildMinify;
 
 /** @typedef {import("./index.js").PredefinedOptions} PredefinedOptions */
 
+/** @typedef {import("./index.js").CustomOptions} CustomOptions */
+
+/**
+ * @typedef {Array<string>} ExtractedComments
+ */
+const notSettled = Symbol(`not-settled`);
 /**
- * @typedef {{ [key: string]: any }} CustomOptions
+ * @template T
+ * @typedef {() => Promise<T>} Task
  */
 
 /**
- * @typedef {Array<string>} ExtractedComments
+ * 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(
+        /** @type{T[]} **/
+        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 */
 
 /**
@@ -45,6 +91,8 @@ exports.esbuildMinify = esbuildMinify;
  * @param {ExtractCommentsOptions | undefined} extractComments
  * @return {Promise<MinimizedResult>}
  */
+
+
 async function terserMinify(input, sourceMap, minimizerOptions, extractComments) {
   /**
    * @param {any} value
@@ -117,21 +165,33 @@ async function terserMinify(input, sourceMap, minimizerOptions, extractComments)
           }
 
           if (condition[key] === "some") {
-            condition[key] = (astNode, comment) => (comment.type === "comment2" || comment.type === "comment1") && /@preserve|@lic|@cc_on|^\**!/i.test(comment.value);
+            condition[key] =
+            /** @type {ExtractCommentsFunction} */
+            (astNode, comment) => (comment.type === "comment2" || comment.type === "comment1") && /@preserve|@lic|@cc_on|^\**!/i.test(comment.value);
 
             break;
           }
 
-          regexStr = condition[key];
+          regexStr =
+          /** @type {string} */
+          condition[key];
 
-          condition[key] = (astNode, comment) => new RegExp(regexStr).test(comment.value);
+          condition[key] =
+          /** @type {ExtractCommentsFunction} */
+          (astNode, comment) => new RegExp(
+          /** @type {string} */
+          regexStr).test(comment.value);
 
           break;
 
         default:
-          regex = condition[key];
+          regex =
+          /** @type {RegExp} */
+          condition[key];
 
-          condition[key] = (astNode, comment) =>
+          condition[key] =
+          /** @type {ExtractCommentsFunction} */
+          (astNode, comment) =>
           /** @type {RegExp} */
           regex.test(comment.value);
 
@@ -227,10 +287,14 @@ async function terserMinify(input, sourceMap, minimizerOptions, extractComments)
     [filename]: code
   }, terserOptions);
   return {
-    code: result.code,
+    code:
+    /** @type {string} **/
+    result.code,
     // @ts-ignore
     // eslint-disable-next-line no-undefined
-    map: result.map ? result.map : undefined,
+    map: result.map ?
+    /** @type {RawSourceMap} **/
+    result.map : undefined,
     extractedComments
   };
 }
@@ -324,21 +388,33 @@ async function uglifyJsMinify(input, sourceMap, minimizerOptions, extractComment
           }
 
           if (condition[key] === "some") {
-            condition[key] = (astNode, comment) => (comment.type === "comment2" || comment.type === "comment1") && /@preserve|@lic|@cc_on|^\**!/i.test(comment.value);
+            condition[key] =
+            /** @type {ExtractCommentsFunction} */
+            (astNode, comment) => (comment.type === "comment2" || comment.type === "comment1") && /@preserve|@lic|@cc_on|^\**!/i.test(comment.value);
 
             break;
           }
 
-          regexStr = condition[key];
+          regexStr =
+          /** @type {string} */
+          condition[key];
 
-          condition[key] = (astNode, comment) => new RegExp(regexStr).test(comment.value);
+          condition[key] =
+          /** @type {ExtractCommentsFunction} */
+          (astNode, comment) => new RegExp(
+          /** @type {string} */
+          regexStr).test(comment.value);
 
           break;
 
         default:
-          regex = condition[key];
+          regex =
+          /** @type {RegExp} */
+          condition[key];
 
-          condition[key] = (astNode, comment) =>
+          condition[key] =
+          /** @type {ExtractCommentsFunction} */
+          (astNode, comment) =>
           /** @type {RegExp} */
           regex.test(comment.value);
 
@@ -556,10 +632,10 @@ async function esbuildMinify(input, sourceMap, minimizerOptions) {
   }; // eslint-disable-next-line import/no-extraneous-dependencies, global-require
 
 
-  const esbuild = require('@umijs/bundler-utils/compiled/esbuild'); // Copy `swc` options
+  const esbuild = require('@umijs/bundler-utils/compiled/esbuild'); // Copy `esbuild` options
 
 
-  const esbuildOptions = buildEsbuildOptions(minimizerOptions); // Let `swc` generate a SourceMap
+  const esbuildOptions = buildEsbuildOptions(minimizerOptions); // Let `esbuild` generate a SourceMap
 
   if (sourceMap) {
     esbuildOptions.sourcemap = true;
@@ -573,7 +649,16 @@ async function esbuildMinify(input, sourceMap, minimizerOptions) {
     code: result.code,
     // eslint-disable-next-line no-undefined
     map: result.map ? JSON.parse(result.map) : undefined,
-    warnings: result.warnings ? result.warnings.map(item => item.toString()) : []
+    warnings: result.warnings.length > 0 ? result.warnings.map(item => {
+      return {
+        name: "Warning",
+        source: item.location && item.location.file,
+        line: item.location && item.location.line,
+        column: item.location && item.location.column,
+        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")}` : ""}`
+      };
+    }) : []
   };
 }
 /**
@@ -591,4 +676,12 @@ esbuildMinify.getMinimizerVersion = () => {
   }
 
   return packageJson && packageJson.version;
+};
+
+module.exports = {
+  throttleAll,
+  terserMinify,
+  uglifyJsMinify,
+  swcMinify,
+  esbuildMinify
 };

package/compiled/webpack/BasicEffectRulePlugin.js

@@ -0,0 +1 @@
+module.exports = require('./').BasicEffectRulePlugin;

package/compiled/webpack/BasicMatcherRulePlugin.js

@@ -0,0 +1 @@
+module.exports = require('./').BasicMatcherRulePlugin;

package/compiled/webpack/HotModuleReplacement.runtime.js

@@ -28,7 +28,8 @@ module.exports = function () {
 	var currentStatus = "idle";
 
 	// while downloading
-	var blockingPromises;
+	var blockingPromises = 0;
+	var blockingPromisesWaiting = [];
 
 	// The update info
 	var currentUpdateApplyHandlers;
@@ -218,17 +219,28 @@ module.exports = function () {
 		return Promise.all(results);
 	}
 
+	function unblock() {
+		if (--blockingPromises === 0) {
+			setStatus("ready").then(function () {
+				if (blockingPromises === 0) {
+					var list = blockingPromisesWaiting;
+					blockingPromisesWaiting = [];
+					for (var i = 0; i < list.length; i++) {
+						list[i]();
+					}
+				}
+			});
+		}
+	}
+
 	function trackBlockingPromise(promise) {
 		switch (currentStatus) {
 			case "ready":
 				setStatus("prepare");
-				blockingPromises.push(promise);
-				waitForBlockingPromises(function () {
-					return setStatus("ready");
-				});
-				return promise;
+			/* fallthrough */
 			case "prepare":
-				blockingPromises.push(promise);
+				blockingPromises++;
+				promise.then(unblock, unblock);
 				return promise;
 			default:
 				return promise;
@@ -236,11 +248,11 @@ module.exports = function () {
 	}
 
 	function waitForBlockingPromises(fn) {
-		if (blockingPromises.length === 0) return fn();
-		var blocker = blockingPromises;
-		blockingPromises = [];
-		return Promise.all(blocker).then(function () {
-			return waitForBlockingPromises(fn);
+		if (blockingPromises === 0) return fn();
+		return new Promise(function (resolve) {
+			blockingPromisesWaiting.push(function () {
+				resolve(fn());
+			});
 		});
 	}
 
@@ -261,7 +273,6 @@ module.exports = function () {
 
 				return setStatus("prepare").then(function () {
 					var updatedModules = [];
-					blockingPromises = [];
 					currentUpdateApplyHandlers = [];
 
 					return Promise.all(
@@ -298,7 +309,11 @@ module.exports = function () {
 	function hotApply(options) {
 		if (currentStatus !== "ready") {
 			return Promise.resolve().then(function () {
-				throw new Error("apply() is only allowed in ready status");
+				throw new Error(
+					"apply() is only allowed in ready status (state: " +
+						currentStatus +
+						")"
+				);
 			});
 		}
 		return internalApply(options);

package/compiled/webpack/JavascriptHotModuleReplacement.runtime.js

@@ -443,15 +443,16 @@ module.exports = function () {
 			) {
 				promises.push($loadUpdateChunk$(chunkId, updatedModulesList));
 				currentUpdateChunks[chunkId] = true;
+			} else {
+				currentUpdateChunks[chunkId] = false;
 			}
 		});
 		if ($ensureChunkHandlers$) {
 			$ensureChunkHandlers$.$key$Hmr = function (chunkId, promises) {
 				if (
 					currentUpdateChunks &&
-					!$hasOwnProperty$(currentUpdateChunks, chunkId) &&
-					$hasOwnProperty$($installedChunks$, chunkId) &&
-					$installedChunks$[chunkId] !== undefined
+					$hasOwnProperty$(currentUpdateChunks, chunkId) &&
+					!currentUpdateChunks[chunkId]
 				) {
 					promises.push($loadUpdateChunk$(chunkId));
 					currentUpdateChunks[chunkId] = true;

package/compiled/webpack/ObjectMatcherRulePlugin.js

@@ -0,0 +1 @@
+module.exports = require('./').ObjectMatcherRulePlugin;

package/compiled/webpack/RuleSetCompiler.js

@@ -0,0 +1 @@
+module.exports = require('./').RuleSetCompiler;

package/compiled/webpack/UseEffectRulePlugin.js

@@ -0,0 +1 @@
+module.exports = require('./').UseEffectRulePlugin;

package/compiled/webpack/deepImports.json

@@ -8,5 +8,10 @@
   "webpack/lib/RuntimeGlobals",
   "webpack/lib/RuntimeModule",
   "webpack/lib/SingleEntryPlugin",
-  "webpack/lib/Template"
+  "webpack/lib/Template",
+  "webpack/lib/rules/BasicEffectRulePlugin",
+  "webpack/lib/rules/BasicMatcherRulePlugin",
+  "webpack/lib/rules/ObjectMatcherRulePlugin",
+  "webpack/lib/rules/RuleSetCompiler",
+  "webpack/lib/rules/UseEffectRulePlugin"
 ]