webpack 5.76.3 → 5.78.0

package/lib/ProvidePlugin.js

@@ -5,12 +5,19 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const ConstDependency = require("./dependencies/ConstDependency");
 const ProvidedDependency = require("./dependencies/ProvidedDependency");
 const { approve } = require("./javascript/JavascriptParserHelpers");
 
 /** @typedef {import("./Compiler")} Compiler */
 
+const PLUGIN_NAME = "ProvidePlugin";
+
 class ProvidePlugin {
 	/**
 	 * @param {Record<string, string | string[]>} definitions the provided identifiers
@@ -27,7 +34,7 @@ class ProvidePlugin {
 	apply(compiler) {
 		const definitions = this.definitions;
 		compiler.hooks.compilation.tap(
-			"ProvidePlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -48,11 +55,11 @@ class ProvidePlugin {
 						if (splittedName.length > 0) {
 							splittedName.slice(1).forEach((_, i) => {
 								const name = splittedName.slice(0, i + 1).join(".");
-								parser.hooks.canRename.for(name).tap("ProvidePlugin", approve);
+								parser.hooks.canRename.for(name).tap(PLUGIN_NAME, approve);
 							});
 						}
 
-						parser.hooks.expression.for(name).tap("ProvidePlugin", expr => {
+						parser.hooks.expression.for(name).tap(PLUGIN_NAME, expr => {
 							const nameIdentifier = name.includes(".")
 								? `__webpack_provided_${name.replace(/\./g, "_dot_")}`
 								: name;
@@ -67,7 +74,7 @@ class ProvidePlugin {
 							return true;
 						});
 
-						parser.hooks.call.for(name).tap("ProvidePlugin", expr => {
+						parser.hooks.call.for(name).tap(PLUGIN_NAME, expr => {
 							const nameIdentifier = name.includes(".")
 								? `__webpack_provided_${name.replace(/\./g, "_dot_")}`
 								: name;
@@ -85,14 +92,14 @@ class ProvidePlugin {
 					});
 				};
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("ProvidePlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("ProvidePlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("ProvidePlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/RawModule.js

@@ -7,6 +7,7 @@
 
 const { OriginalSource, RawSource } = require("webpack-sources");
 const Module = require("./Module");
+const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -35,7 +36,7 @@ class RawModule extends Module {
 	 * @param {ReadonlySet<string>=} runtimeRequirements runtime requirements needed for the source code
 	 */
 	constructor(source, identifier, readableIdentifier, runtimeRequirements) {
-		super("javascript/dynamic", null);
+		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);
 		this.sourceStr = source;
 		this.identifierStr = identifier || this.sourceStr;
 		this.readableIdentifierStr = readableIdentifier || this.identifierStr;

package/lib/RequireJsStuffPlugin.js

@@ -5,6 +5,10 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const ConstDependency = require("./dependencies/ConstDependency");
 const {
@@ -13,6 +17,8 @@ const {
 
 /** @typedef {import("./Compiler")} Compiler */
 
+const PLUGIN_NAME = "RequireJsStuffPlugin";
+
 module.exports = class RequireJsStuffPlugin {
 	/**
 	 * Apply the plugin
@@ -21,7 +27,7 @@ module.exports = class RequireJsStuffPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"RequireJsStuffPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyTemplates.set(
 					ConstDependency,
@@ -37,27 +43,21 @@ module.exports = class RequireJsStuffPlugin {
 
 					parser.hooks.call
 						.for("require.config")
-						.tap(
-							"RequireJsStuffPlugin",
-							toConstantDependency(parser, "undefined")
-						);
+						.tap(PLUGIN_NAME, toConstantDependency(parser, "undefined"));
 					parser.hooks.call
 						.for("requirejs.config")
-						.tap(
-							"RequireJsStuffPlugin",
-							toConstantDependency(parser, "undefined")
-						);
+						.tap(PLUGIN_NAME, toConstantDependency(parser, "undefined"));
 
 					parser.hooks.expression
 						.for("require.version")
 						.tap(
-							"RequireJsStuffPlugin",
+							PLUGIN_NAME,
 							toConstantDependency(parser, JSON.stringify("0.0.0"))
 						);
 					parser.hooks.expression
 						.for("requirejs.onError")
 						.tap(
-							"RequireJsStuffPlugin",
+							PLUGIN_NAME,
 							toConstantDependency(
 								parser,
 								RuntimeGlobals.uncaughtErrorHandler,
@@ -66,11 +66,11 @@ module.exports = class RequireJsStuffPlugin {
 						);
 				};
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("RequireJsStuffPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("RequireJsStuffPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/UseStrictPlugin.js

@@ -5,10 +5,17 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const ConstDependency = require("./dependencies/ConstDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
 
+const PLUGIN_NAME = "UseStrictPlugin";
+
 class UseStrictPlugin {
 	/**
 	 * Apply the plugin
@@ -17,10 +24,10 @@ class UseStrictPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"UseStrictPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				const handler = parser => {
-					parser.hooks.program.tap("UseStrictPlugin", ast => {
+					parser.hooks.program.tap(PLUGIN_NAME, ast => {
 						const firstNode = ast.body[0];
 						if (
 							firstNode &&
@@ -40,14 +47,14 @@ class UseStrictPlugin {
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("UseStrictPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("UseStrictPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("UseStrictPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/WebpackIsIncludedPlugin.js

@@ -6,6 +6,11 @@
 "use strict";
 
 const IgnoreErrorModuleFactory = require("./IgnoreErrorModuleFactory");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("./ModuleTypeConstants");
 const WebpackIsIncludedDependency = require("./dependencies/WebpackIsIncludedDependency");
 const {
 	toConstantDependency
@@ -16,6 +21,8 @@ const {
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 
+const PLUGIN_NAME = "WebpackIsIncludedPlugin";
+
 class WebpackIsIncludedPlugin {
 	/**
 	 * @param {Compiler} compiler the compiler instance
@@ -23,7 +30,7 @@ class WebpackIsIncludedPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"WebpackIsIncludedPlugin",
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				compilation.dependencyFactories.set(
 					WebpackIsIncludedDependency,
@@ -41,7 +48,7 @@ class WebpackIsIncludedPlugin {
 				const handler = parser => {
 					parser.hooks.call
 						.for("__webpack_is_included__")
-						.tap("WebpackIsIncludedPlugin", expr => {
+						.tap(PLUGIN_NAME, expr => {
 							if (
 								expr.type !== "CallExpression" ||
 								expr.arguments.length !== 1 ||
@@ -64,19 +71,19 @@ class WebpackIsIncludedPlugin {
 					parser.hooks.typeof
 						.for("__webpack_is_included__")
 						.tap(
-							"WebpackIsIncludedPlugin",
+							PLUGIN_NAME,
 							toConstantDependency(parser, JSON.stringify("function"))
 						);
 				};
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("WebpackIsIncludedPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("WebpackIsIncludedPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/esm")
-					.tap("WebpackIsIncludedPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_ESM)
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/WebpackOptionsApply.js

@@ -391,7 +391,8 @@ class WebpackOptionsApply extends OptionsApply {
 		new WorkerPlugin(
 			options.output.workerChunkLoading,
 			options.output.workerWasmLoading,
-			options.output.module
+			options.output.module,
+			options.output.workerPublicPath
 		).apply(compiler);
 
 		new DefaultStatsFactoryPlugin().apply(compiler);

package/lib/config/defaults.js

@@ -7,6 +7,14 @@
 
 const fs = require("fs");
 const path = require("path");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JSON_MODULE_TYPE,
+	WEBASSEMBLY_MODULE_TYPE_ASYNC,
+	JAVASCRIPT_MODULE_TYPE_ESM,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	WEBASSEMBLY_MODULE_TYPE_SYNC
+} = require("../ModuleTypeConstants");
 const Template = require("../Template");
 const { cleverMerge } = require("../util/cleverMerge");
 const {
@@ -517,7 +525,7 @@ const applyModuleDefaults = (
 
 	A(module, "defaultRules", () => {
 		const esm = {
-			type: "javascript/esm",
+			type: JAVASCRIPT_MODULE_TYPE_ESM,
 			resolve: {
 				byDependency: {
 					esm: {
@@ -527,21 +535,21 @@ const applyModuleDefaults = (
 			}
 		};
 		const commonjs = {
-			type: "javascript/dynamic"
+			type: JAVASCRIPT_MODULE_TYPE_DYNAMIC
 		};
 		/** @type {RuleSetRules} */
 		const rules = [
 			{
 				mimetype: "application/node",
-				type: "javascript/auto"
+				type: JAVASCRIPT_MODULE_TYPE_AUTO
 			},
 			{
 				test: /\.json$/i,
-				type: "json"
+				type: JSON_MODULE_TYPE
 			},
 			{
 				mimetype: "application/json",
-				type: "json"
+				type: JSON_MODULE_TYPE
 			},
 			{
 				test: /\.mjs$/i,
@@ -574,7 +582,7 @@ const applyModuleDefaults = (
 		];
 		if (asyncWebAssembly) {
 			const wasm = {
-				type: "webassembly/async",
+				type: WEBASSEMBLY_MODULE_TYPE_ASYNC,
 				rules: [
 					{
 						descriptionData: {
@@ -596,7 +604,7 @@ const applyModuleDefaults = (
 			});
 		} else if (syncWebAssembly) {
 			const wasm = {
-				type: "webassembly/sync",
+				type: WEBASSEMBLY_MODULE_TYPE_SYNC,
 				rules: [
 					{
 						descriptionData: {
@@ -667,7 +675,7 @@ const applyModuleDefaults = (
 			},
 			{
 				assert: { type: "json" },
-				type: "json"
+				type: JSON_MODULE_TYPE
 			}
 		);
 		return rules;
@@ -916,6 +924,7 @@ const applyOutputDefaults = (
 			? "auto"
 			: ""
 	);
+	D(output, "workerPublicPath", "");
 	D(output, "chunkLoadTimeout", 120000);
 	D(output, "hashFunction", futureDefaults ? "xxhash64" : "md4");
 	D(output, "hashDigest", "hex");

package/lib/config/normalization.js

@@ -340,6 +340,10 @@ const getNormalizedWebpackOptions = config => {
 						output.auxiliaryComment !== undefined
 							? output.auxiliaryComment
 							: libraryBase.auxiliaryComment,
+					amdContainer:
+						output.amdContainer !== undefined
+							? output.amdContainer
+							: libraryBase.amdContainer,
 					export:
 						output.libraryExport !== undefined
 							? output.libraryExport
@@ -369,6 +373,7 @@ const getNormalizedWebpackOptions = config => {
 				uniqueName: output.uniqueName,
 				wasmLoading: output.wasmLoading,
 				webassemblyModuleFilename: output.webassemblyModuleFilename,
+				workerPublicPath: output.workerPublicPath,
 				workerChunkLoading: output.workerChunkLoading,
 				workerWasmLoading: output.workerWasmLoading
 			};

package/lib/container/ContainerEntryModule.js

@@ -8,6 +8,7 @@
 const { OriginalSource, RawSource } = require("webpack-sources");
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Module = require("../Module");
+const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
@@ -44,7 +45,7 @@ class ContainerEntryModule extends Module {
 	 * @param {string} shareScope name of the share scope
 	 */
 	constructor(name, exposes, shareScope) {
-		super("javascript/dynamic", null);
+		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);
 		this._name = name;
 		this._exposes = exposes;
 		this._shareScope = shareScope;

package/lib/css/CssParser.js

@@ -138,6 +138,7 @@ class CssParser extends Parser {
 		let singleClassSelector = undefined;
 		let lastIdentifier = undefined;
 		const modeStack = [];
+		let awaitRightParenthesis = false;
 		const isTopLevelLocal = () =>
 			modeData === "local" ||
 			(this.defaultMode === "local" && modeData === undefined);
@@ -296,6 +297,7 @@ class CssParser extends Parser {
 				module.addDependency(dep);
 			}
 		};
+		const eatAtRuleNested = eatUntil("{};/");
 		const eatKeyframes = eatUntil("{};/");
 		const eatNameInVar = eatUntil(",)};/");
 		walkCssTokens(source, {
@@ -380,6 +382,18 @@ class CssParser extends Parser {
 					modeNestingLevel = 1;
 					return pos + 1;
 				}
+				if (name === "@media" || name === "@supports") {
+					let pos = end;
+					const [newPos] = eatText(input, pos, eatAtRuleNested);
+					pos = newPos;
+					if (pos === input.length) return pos;
+					if (input.charCodeAt(pos) !== CC_LEFT_CURLY) {
+						throw new Error(
+							`Unexpected ${input[pos]} at ${pos} during parsing of @media or @supports (expected '{')`
+						);
+					}
+					return pos + 1;
+				}
 				return end;
 			},
 			semicolon: (input, start, end) => {
@@ -511,6 +525,9 @@ class CssParser extends Parser {
 			rightParenthesis: (input, start, end) => {
 				switch (mode) {
 					case CSS_MODE_TOP_LEVEL: {
+						if (awaitRightParenthesis) {
+							awaitRightParenthesis = false;
+						}
 						const newModeData = modeStack.pop();
 						if (newModeData !== false) {
 							modeData = newModeData;
@@ -561,6 +578,7 @@ class CssParser extends Parser {
 							const dep = new ConstDependency("", [start, end]);
 							module.addPresentationalDependency(dep);
 						} else {
+							awaitRightParenthesis = true;
 							modeStack.push(false);
 						}
 						break;
@@ -597,8 +615,10 @@ class CssParser extends Parser {
 			comma: (input, start, end) => {
 				switch (mode) {
 					case CSS_MODE_TOP_LEVEL:
-						modeData = undefined;
-						modeStack.length = 0;
+						if (!awaitRightParenthesis) {
+							modeData = undefined;
+							modeStack.length = 0;
+						}
 						break;
 					case CSS_MODE_IN_LOCAL_RULE:
 						processDeclarationValueDone(input, start);

package/lib/debug/ProfilingPlugin.js

@@ -5,6 +5,14 @@
 "use strict";
 
 const { Tracer } = require("chrome-trace-event");
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM,
+	WEBASSEMBLY_MODULE_TYPE_ASYNC,
+	WEBASSEMBLY_MODULE_TYPE_SYNC,
+	JSON_MODULE_TYPE
+} = require("../ModuleTypeConstants");
 const createSchemaValidation = require("../util/create-schema-validation");
 const { dirname, mkdirpSync } = require("../util/fs");
 
@@ -182,7 +190,7 @@ const createTrace = (fs, outputPath) => {
 	};
 };
 
-const pluginName = "ProfilingPlugin";
+const PLUGIN_NAME = "ProfilingPlugin";
 
 class ProfilingPlugin {
 	/**
@@ -216,7 +224,7 @@ class ProfilingPlugin {
 		});
 
 		compiler.hooks.compilation.tap(
-			pluginName,
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory, contextModuleFactory }) => {
 				interceptAllHooksFor(compilation, tracer, "Compilation");
 				interceptAllHooksFor(
@@ -237,7 +245,7 @@ class ProfilingPlugin {
 		// We need to write out the CPU profile when we are all done.
 		compiler.hooks.done.tapAsync(
 			{
-				name: pluginName,
+				name: PLUGIN_NAME,
 				stage: Infinity
 			},
 			(stats, callback) => {
@@ -312,18 +320,18 @@ const interceptAllHooksFor = (instance, tracer, logLabel) => {
 
 const interceptAllParserHooks = (moduleFactory, tracer) => {
 	const moduleTypes = [
-		"javascript/auto",
-		"javascript/dynamic",
-		"javascript/esm",
-		"json",
-		"webassembly/async",
-		"webassembly/sync"
+		JAVASCRIPT_MODULE_TYPE_AUTO,
+		JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+		JAVASCRIPT_MODULE_TYPE_ESM,
+		JSON_MODULE_TYPE,
+		WEBASSEMBLY_MODULE_TYPE_ASYNC,
+		WEBASSEMBLY_MODULE_TYPE_SYNC
 	];
 
 	moduleTypes.forEach(moduleType => {
 		moduleFactory.hooks.parser
 			.for(moduleType)
-			.tap("ProfilingPlugin", (parser, parserOpts) => {
+			.tap(PLUGIN_NAME, (parser, parserOpts) => {
 				interceptAllHooksFor(parser, tracer, "Parser");
 			});
 	});
@@ -347,7 +355,7 @@ const makeInterceptorFor = (instance, tracer) => hookName => ({
 		const { name, type, fn } = tapInfo;
 		const newFn =
 			// Don't tap our own hooks to ensure stream can close cleanly
-			name === pluginName
+			name === PLUGIN_NAME
 				? fn
 				: makeNewProfiledTapFn(hookName, tracer, {
 						name,
@@ -418,7 +426,7 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 				const id = ++tracer.counter;
 				// Do not instrument ourself due to the CPU
 				// profile needing to be the last event in the trace.
-				if (name === pluginName) {
+				if (name === PLUGIN_NAME) {
 					return fn(...args);
 				}