webpack 5.21.0 → 5.23.0

package/lib/Watching.js

@@ -34,6 +34,10 @@ class Watching {
 		this._closeCallbacks = undefined;
 		this.closed = false;
 		this.suspended = false;
+		this.blocked = false;
+		this._isBlocked = () => false;
+		this._onChange = () => {};
+		this._onInvalid = () => {};
 		if (typeof watchOptions === "number") {
 			this.watchOptions = {
 				aggregateTimeout: watchOptions
@@ -47,27 +51,59 @@ class Watching {
 			this.watchOptions.aggregateTimeout = 200;
 		}
 		this.compiler = compiler;
-		this.running = true;
+		this.running = false;
+		this._initial = true;
+		this._needRecords = true;
+		this._needWatcherInfo = false;
 		this.watcher = undefined;
 		this.pausedWatcher = undefined;
 		this._done = this._done.bind(this);
-		this.compiler.readRecords(err => {
-			if (err) return this._done(err);
-
-			this._go();
+		process.nextTick(() => {
+			if (this._initial) this._invalidate();
 		});
 	}
 
 	_go() {
+		this._initial = false;
 		this.startTime = Date.now();
 		this.running = true;
-		this.invalid = false;
 		const run = () => {
+			if (this.compiler.idle) {
+				return this.compiler.cache.endIdle(err => {
+					if (err) return this._done(err);
+					this.compiler.idle = false;
+					run();
+				});
+			}
+			if (this._needRecords) {
+				return this.compiler.readRecords(err => {
+					if (err) return this._done(err);
+
+					this._needRecords = false;
+					run();
+				});
+			}
+			this.invalid = false;
+			if (this._needWatcherInfo) {
+				this._needWatcherInfo = false;
+				const watcher = this.pausedWatcher;
+				if (watcher) {
+					this.compiler.modifiedFiles = watcher.aggregatedChanges;
+					this.compiler.removedFiles = watcher.aggregatedRemovals;
+					this.compiler.fileTimestamps = watcher.getFileTimeInfoEntries();
+					this.compiler.contextTimestamps = watcher.getContextTimeInfoEntries();
+				} else {
+					this.compiler.modifiedFiles = undefined;
+					this.compiler.removedFiles = undefined;
+					this.compiler.fileTimestamps = undefined;
+					this.compiler.contextTimestamps = undefined;
+				}
+			}
 			this.compiler.hooks.watchRun.callAsync(this.compiler, err => {
 				if (err) return this._done(err);
 				const onCompiled = (err, compilation) => {
 					if (err) return this._done(err, compilation);
-					if (this.invalid) return this._done();
+					if (this.invalid) return this._done(null, compilation);
 
 					if (this.compiler.hooks.shouldEmit.call(compilation) === false) {
 						return this._done(null, compilation);
@@ -113,15 +149,7 @@ class Watching {
 			});
 		};
 
-		if (this.compiler.idle) {
-			this.compiler.cache.endIdle(err => {
-				if (err) return this._done(err);
-				this.compiler.idle = false;
-				run();
-			});
-		} else {
-			run();
-		}
+		run();
 	}
 
 	/**
@@ -154,7 +182,12 @@ class Watching {
 			this.callbacks.length = 0;
 		};
 
-		if (this.invalid) {
+		if (
+			this.invalid &&
+			!this.suspended &&
+			!this.blocked &&
+			!(this._isBlocked() && (this.blocked = true))
+		) {
 			if (compilation) {
 				logger.time("storeBuildDependencies");
 				this.compiler.cache.storeBuildDependencies(
@@ -244,12 +277,12 @@ class Watching {
 				this.compiler.contextTimestamps = contextTimeInfoEntries;
 				this.compiler.removedFiles = removedFiles;
 				this.compiler.modifiedFiles = changedFiles;
-				if (!this.suspended) {
-					this._invalidate();
-				}
+				this._invalidate();
+				this._onChange();
 			},
 			(fileName, changeTime) => {
 				this.compiler.hooks.invalid.call(fileName, changeTime);
+				this._onInvalid();
 			}
 		);
 	}
@@ -262,17 +295,19 @@ class Watching {
 		if (callback) {
 			this.callbacks.push(callback);
 		}
-		if (this.watcher) {
-			this.compiler.modifiedFiles = this.watcher.aggregatedChanges;
-			this.compiler.removedFiles = this.watcher.aggregatedRemovals;
-			this.compiler.fileTimestamps = this.watcher.getFileTimeInfoEntries();
-			this.compiler.contextTimestamps = this.watcher.getContextTimeInfoEntries();
+		if (!this._initial) {
+			this.compiler.hooks.invalid.call(null, Date.now());
+			this._needWatcherInfo = true;
 		}
-		this.compiler.hooks.invalid.call(null, Date.now());
 		this._invalidate();
 	}
 
 	_invalidate() {
+		if (this.suspended) return;
+		if (this._isBlocked()) {
+			this.blocked = true;
+			return;
+		}
 		if (this.watcher) {
 			this.pausedWatcher = this.watcher;
 			this.watcher.pause();
@@ -288,12 +323,20 @@ class Watching {
 
 	suspend() {
 		this.suspended = true;
-		this.invalid = false;
 	}
 
 	resume() {
 		if (this.suspended) {
 			this.suspended = false;
+			this._needWatcherInfo = true;
+			this._invalidate();
+		}
+	}
+
+	_checkUnblocked() {
+		if (this.blocked && !this._isBlocked()) {
+			this.blocked = false;
+			this._needWatcherInfo = true;
 			this._invalidate();
 		}
 	}

package/lib/WebpackOptionsApply.js

@@ -43,10 +43,11 @@ const RequireEnsurePlugin = require("./dependencies/RequireEnsurePlugin");
 const RequireIncludePlugin = require("./dependencies/RequireIncludePlugin");
 const SystemPlugin = require("./dependencies/SystemPlugin");
 const URLPlugin = require("./dependencies/URLPlugin");
+const WorkerPlugin = require("./dependencies/WorkerPlugin");
 
 const InferAsyncModulesPlugin = require("./async-modules/InferAsyncModulesPlugin");
 
-const FlagUsingEvalPlugin = require("./FlagUsingEvalPlugin");
+const JavascriptMetaInfoPlugin = require("./JavascriptMetaInfoPlugin");
 const DefaultStatsFactoryPlugin = require("./stats/DefaultStatsFactoryPlugin");
 const DefaultStatsPresetPlugin = require("./stats/DefaultStatsPresetPlugin");
 const DefaultStatsPrinterPlugin = require("./stats/DefaultStatsPrinterPlugin");
@@ -312,17 +313,16 @@ class WebpackOptionsApply extends OptionsApply {
 		new SystemPlugin().apply(compiler);
 		new ImportMetaPlugin().apply(compiler);
 		new URLPlugin().apply(compiler);
-
-		if (options.output.workerChunkLoading) {
-			const WorkerPlugin = require("./dependencies/WorkerPlugin");
-			new WorkerPlugin(options.output.workerChunkLoading).apply(compiler);
-		}
+		new WorkerPlugin(
+			options.output.workerChunkLoading,
+			options.output.workerWasmLoading
+		).apply(compiler);
 
 		new DefaultStatsFactoryPlugin().apply(compiler);
 		new DefaultStatsPresetPlugin().apply(compiler);
 		new DefaultStatsPrinterPlugin().apply(compiler);
 
-		new FlagUsingEvalPlugin().apply(compiler);
+		new JavascriptMetaInfoPlugin().apply(compiler);
 
 		if (typeof options.mode !== "string") {
 			const WarnNoModeSetPlugin = require("./WarnNoModeSetPlugin");

package/lib/config/defaults.js

@@ -622,11 +622,19 @@ const applyOutputDefaults = (
 	});
 	F(output, "chunkLoading", () => {
 		if (tp) {
-			if (tp.document) return "jsonp";
-			if (tp.require) return "require";
-			if (tp.nodeBuiltins) return "async-node";
-			if (tp.importScripts) return "import-scripts";
-			if (tp.dynamicImport && output.module) return "import";
+			switch (output.chunkFormat) {
+				case "array-push":
+					if (tp.document) return "jsonp";
+					if (tp.importScripts) return "import-scripts";
+					break;
+				case "commonjs":
+					if (tp.require) return "require";
+					if (tp.nodeBuiltins) return "async-node";
+					break;
+				case "module":
+					if (tp.dynamicImport) return "import";
+					break;
+			}
 			if (
 				tp.require === null ||
 				tp.nodeBuiltins === null ||
@@ -640,10 +648,18 @@ const applyOutputDefaults = (
 	});
 	F(output, "workerChunkLoading", () => {
 		if (tp) {
-			if (tp.require) return "require";
-			if (tp.nodeBuiltins) return "async-node";
-			if (tp.importScriptsInWorker) return "import-scripts";
-			if (tp.dynamicImportInWorker && output.module) return "import";
+			switch (output.chunkFormat) {
+				case "array-push":
+					if (tp.importScriptsInWorker) return "import-scripts";
+					break;
+				case "commonjs":
+					if (tp.require) return "require";
+					if (tp.nodeBuiltins) return "async-node";
+					break;
+				case "module":
+					if (tp.dynamicImportInWorker) return "import";
+					break;
+			}
 			if (
 				tp.require === null ||
 				tp.nodeBuiltins === null ||
@@ -656,8 +672,8 @@ const applyOutputDefaults = (
 	});
 	F(output, "wasmLoading", () => {
 		if (tp) {
-			if (tp.nodeBuiltins) return "async-node";
 			if (tp.fetchWasm) return "fetch";
+			if (tp.nodeBuiltins) return "async-node";
 			if (tp.nodeBuiltins === null || tp.fetchWasm === null) {
 				return "universal";
 			}

package/lib/config/target.js

@@ -197,7 +197,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				document: context === "renderer",
 				fetchWasm: context === "renderer",
 				importScripts: false,
-				importScriptsInWorker: false,
+				importScriptsInWorker: true,
 
 				globalThis: v(5),
 				const: v(1, 1),

package/lib/container/ContainerEntryModule.js

@@ -101,7 +101,8 @@ class ContainerEntryModule extends Module {
 	build(options, compilation, resolver, fs, callback) {
 		this.buildMeta = {};
 		this.buildInfo = {
-			strict: true
+			strict: true,
+			topLevelDeclarations: new Set(["moduleMap", "get", "init"])
 		};
 
 		this.clearDependenciesAndBlocks();

package/lib/dependencies/AMDDefineDependency.js

@@ -68,7 +68,7 @@ const DEFINITIONS = {
 	lf: {
 		definition: "var XXX, XXXmodule;",
 		content:
-			"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = #.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))",
+			"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))",
 		requests: [RuntimeGlobals.require, RuntimeGlobals.module]
 	},
 	lo: {

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -276,6 +276,10 @@ class AMDDefineDependencyParserPlugin {
 				}
 				parser.scope.inTry = inTry;
 				if (fn.body.type === "BlockStatement") {
+					parser.detectMode(fn.body.body);
+					const prev = parser.prevStatement;
+					parser.preWalkStatement(fn.body);
+					parser.prevStatement = prev;
 					parser.walkStatement(fn.body);
 				} else {
 					parser.walkExpression(fn.body);
@@ -293,6 +297,10 @@ class AMDDefineDependencyParserPlugin {
 					}
 					parser.scope.inTry = inTry;
 					if (fn.callee.object.body.type === "BlockStatement") {
+						parser.detectMode(fn.callee.object.body.body);
+						const prev = parser.prevStatement;
+						parser.preWalkStatement(fn.callee.object.body);
+						parser.prevStatement = prev;
 						parser.walkStatement(fn.callee.object.body);
 					} else {
 						parser.walkExpression(fn.callee.object.body);

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -11,6 +11,7 @@ const HarmonyLinkingError = require("../HarmonyLinkingError");
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const { first } = require("../util/SetHelpers");
 const makeSerializable = require("../util/makeSerializable");
 const propertyAccess = require("../util/propertyAccess");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
@@ -921,7 +922,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 						".indexOf(__WEBPACK_IMPORT_KEY__) < 0) ";
 				} else if (ignored.size === 1) {
 					content += `if(__WEBPACK_IMPORT_KEY__ !== ${JSON.stringify(
-						ignored.values().next().value
+						first(ignored)
 					)}) `;
 				}
 

package/lib/dependencies/HarmonyExportInitFragment.js

@@ -7,6 +7,7 @@
 
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
+const { first } = require("../util/SetHelpers");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
@@ -91,9 +92,7 @@ class HarmonyExportInitFragment extends InitFragment {
 						this.unusedExports
 				  )} */\n`
 				: this.unusedExports.size > 0
-				? `/* unused harmony export ${
-						this.unusedExports.values().next().value
-				  } */\n`
+				? `/* unused harmony export ${first(this.unusedExports)} */\n`
 				: "";
 		const definitions = [];
 		for (const [key, value] of this.exportMap) {

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -111,7 +111,9 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		let ids = this.getIds(moduleGraph);
-		if (ids.length > 0 && ids[0] === "default") {
+		if (ids.length === 0) return Dependency.EXPORTS_OBJECT_REFERENCED;
+		let namespaceObjectAsContext = this.namespaceObjectAsContext;
+		if (ids[0] === "default") {
 			const selfModule = moduleGraph.getParentModule(this);
 			const importedModule = moduleGraph.getModule(this);
 			switch (
@@ -124,13 +126,18 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
 				case "default-with-named":
 					if (ids.length === 1) return Dependency.EXPORTS_OBJECT_REFERENCED;
 					ids = ids.slice(1);
+					namespaceObjectAsContext = true;
 					break;
 				case "dynamic":
 					return Dependency.EXPORTS_OBJECT_REFERENCED;
 			}
 		}
 
-		if (this.namespaceObjectAsContext) {
+		if (
+			this.call &&
+			!this.directImport &&
+			(namespaceObjectAsContext || ids.length > 1)
+		) {
 			if (ids.length === 1) return Dependency.EXPORTS_OBJECT_REFERENCED;
 			ids = ids.slice(0, -1);
 		}

package/lib/dependencies/LoaderPlugin.js

@@ -74,10 +74,17 @@ class LoaderPlugin {
 								if (!referencedModule) {
 									return callback(new Error("Cannot load the module"));
 								}
+								if (referencedModule.getNumberOfErrors() > 0) {
+									return callback(
+										new Error("The loaded module contains errors")
+									);
+								}
 								const moduleSource = referencedModule.originalSource();
 								if (!moduleSource) {
-									throw new Error(
-										"The module created for a LoaderDependency must have an original source"
+									return callback(
+										new Error(
+											"The module created for a LoaderDependency must have an original source"
+										)
 									);
 								}
 								let source, map;

package/lib/dependencies/URLDependency.js

@@ -28,11 +28,13 @@ class URLDependency extends ModuleDependency {
 	 * @param {string} request request
 	 * @param {[number, number]} range range of the arguments of new URL( |> ... <| )
 	 * @param {[number, number]} outerRange range of the full |> new URL(...) <|
+	 * @param {boolean=} relative use relative urls instead of absolute with base uri
 	 */
-	constructor(request, range, outerRange) {
+	constructor(request, range, outerRange, relative) {
 		super(request);
 		this.range = range;
 		this.outerRange = outerRange;
+		this.relative = relative || false;
 		/** @type {Set<string> | boolean} */
 		this.usedByExports = undefined;
 	}
@@ -60,6 +62,7 @@ class URLDependency extends ModuleDependency {
 	serialize(context) {
 		const { write } = context;
 		write(this.outerRange);
+		write(this.relative);
 		write(this.usedByExports);
 		super.serialize(context);
 	}
@@ -67,6 +70,7 @@ class URLDependency extends ModuleDependency {
 	deserialize(context) {
 		const { read } = context;
 		this.outerRange = read();
+		this.relative = read();
 		this.usedByExports = read();
 		super.deserialize(context);
 	}
@@ -101,20 +105,38 @@ URLDependency.Template = class URLDependencyTemplate extends (
 			return;
 		}
 
-		runtimeRequirements.add(RuntimeGlobals.baseURI);
 		runtimeRequirements.add(RuntimeGlobals.require);
 
-		source.replace(
-			dep.range[0],
-			dep.range[1] - 1,
-			`/* asset import */ ${runtimeTemplate.moduleRaw({
-				chunkGraph,
-				module: moduleGraph.getModule(dep),
-				request: dep.request,
-				runtimeRequirements,
-				weak: false
-			})}, ${RuntimeGlobals.baseURI}`
-		);
+		if (dep.relative) {
+			runtimeRequirements.add(RuntimeGlobals.relativeUrl);
+			source.replace(
+				dep.outerRange[0],
+				dep.outerRange[1] - 1,
+				`/* asset import */ new ${
+					RuntimeGlobals.relativeUrl
+				}(${runtimeTemplate.moduleRaw({
+					chunkGraph,
+					module: moduleGraph.getModule(dep),
+					request: dep.request,
+					runtimeRequirements,
+					weak: false
+				})})`
+			);
+		} else {
+			runtimeRequirements.add(RuntimeGlobals.baseURI);
+
+			source.replace(
+				dep.range[0],
+				dep.range[1] - 1,
+				`/* asset import */ ${runtimeTemplate.moduleRaw({
+					chunkGraph,
+					module: moduleGraph.getModule(dep),
+					request: dep.request,
+					runtimeRequirements,
+					weak: false
+				})}, ${RuntimeGlobals.baseURI}`
+			);
+		}
 	}
 };
 

package/lib/dependencies/URLPlugin.js

@@ -33,6 +33,7 @@ class URLPlugin {
 				 */
 				const parserCallback = (parser, parserOptions) => {
 					if (parserOptions.url === false) return;
+					const relative = parserOptions.url === "relative";
 
 					/**
 					 * @param {NewExpressionNode} expr expression
@@ -77,7 +78,8 @@ class URLPlugin {
 						const dep = new URLDependency(
 							request,
 							[arg1.range[0], arg2.range[1]],
-							expr.range
+							expr.range,
+							relative
 						);
 						dep.loc = expr.loc;
 						parser.state.module.addDependency(dep);

package/lib/dependencies/WorkerPlugin.js

@@ -13,6 +13,7 @@ const formatLocation = require("../formatLocation");
 const EnableChunkLoadingPlugin = require("../javascript/EnableChunkLoadingPlugin");
 const { equals } = require("../util/ArrayHelpers");
 const { contextify } = require("../util/identifier");
+const EnableWasmLoadingPlugin = require("../wasm/EnableWasmLoadingPlugin");
 const {
 	harmonySpecifierTag
 } = require("./HarmonyImportDependencyParserPlugin");
@@ -37,8 +38,9 @@ const DEFAULT_SYNTAX = [
 ];
 
 class WorkerPlugin {
-	constructor(chunkLoading) {
+	constructor(chunkLoading, wasmLoading) {
 		this._chunkLoading = chunkLoading;
+		this._wasmLoading = wasmLoading;
 	}
 	/**
 	 * Apply the plugin
@@ -49,6 +51,9 @@ class WorkerPlugin {
 		if (this._chunkLoading) {
 			new EnableChunkLoadingPlugin(this._chunkLoading).apply(compiler);
 		}
+		if (this._wasmLoading) {
+			new EnableWasmLoadingPlugin(this._wasmLoading).apply(compiler);
+		}
 		const cachedContextify = contextify.bindContextCache(
 			compiler.context,
 			compiler.root
@@ -227,6 +232,7 @@ class WorkerPlugin {
 								name: entryOptions.name,
 								entryOptions: {
 									chunkLoading: this._chunkLoading,
+									wasmLoading: this._wasmLoading,
 									...entryOptions
 								}
 							});

package/lib/hmr/LazyCompilationPlugin.js

@@ -199,9 +199,9 @@ class LazyCompilationProxyModule extends Module {
 			`var data = ${JSON.stringify(this.data)};`
 		]);
 		const keepActive = Template.asString([
-			`var dispose = client.keepAlive({ data, active: ${JSON.stringify(
+			`var dispose = client.keepAlive({ data: data, active: ${JSON.stringify(
 				!!block
-			)}, module, onError });`
+			)}, module: module, onError: onError });`
 		]);
 		let source;
 		if (block) {

package/lib/index.js

@@ -25,6 +25,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginInstance} WebpackPluginInstance */
 /** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
+/** @typedef {import("./MultiStats")} MultiStats */
 /** @typedef {import("./Parser").ParserState} ParserState */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -115,18 +115,29 @@ class CommonJsChunkFormatPlugin {
 							entrySource.add(
 								`${RuntimeGlobals.externalInstallChunk}(exports);\n`
 							);
+							const startupSource = new ConcatSource();
 							for (let i = 0; i < entries.length; i++) {
 								const [module, entrypoint] = entries[i];
-								entrySource.add(
-									`${i === entries.length - 1 ? "return " : ""}${
-										RuntimeGlobals.startupEntrypoint
-									}(${JSON.stringify(
+								startupSource.add(
+									`${
+										i === entries.length - 1 ? "var __webpack_exports__ = " : ""
+									}${RuntimeGlobals.startupEntrypoint}(${JSON.stringify(
 										entrypoint.chunks
 											.filter(c => c !== chunk && c !== runtimeChunk)
 											.map(c => c.id)
 									)}, ${JSON.stringify(chunkGraph.getModuleId(module))});\n`
 								);
 							}
+							entrySource.add(
+								hooks.renderStartup.call(
+									startupSource,
+									entries[entries.length - 1][0],
+									{
+										...renderContext,
+										inlined: false
+									}
+								)
+							);
 							entrySource.add("})()");
 							return entrySource;
 						}