webpack 5.22.0 → 5.23.0

package/lib/RuntimeGlobals.js

@@ -304,6 +304,11 @@ exports.systemContext = "__webpack_require__.y";
  */
 exports.baseURI = "__webpack_require__.b";
 
+/**
+ * a RelativeURL class when relative URLs are used
+ */
+exports.relativeUrl = "__webpack_require__.U";
+
 /**
  * Creates an async module. The body function must be a async function.
  * "module.exports" will be decorated with an AsyncModulePromise.

package/lib/RuntimePlugin.js

@@ -22,6 +22,7 @@ const HasOwnPropertyRuntimeModule = require("./runtime/HasOwnPropertyRuntimeModu
 const LoadScriptRuntimeModule = require("./runtime/LoadScriptRuntimeModule");
 const MakeNamespaceObjectRuntimeModule = require("./runtime/MakeNamespaceObjectRuntimeModule");
 const PublicPathRuntimeModule = require("./runtime/PublicPathRuntimeModule");
+const RelativeUrlRuntimeModule = require("./runtime/RelativeUrlRuntimeModule");
 const RuntimeIdRuntimeModule = require("./runtime/RuntimeIdRuntimeModule");
 const SystemContextRuntimeModule = require("./runtime/SystemContextRuntimeModule");
 const ShareRuntimeModule = require("./sharing/ShareRuntimeModule");
@@ -48,6 +49,7 @@ const GLOBALS_ON_REQUIRE = [
 	RuntimeGlobals.interceptModuleExecution,
 	RuntimeGlobals.publicPath,
 	RuntimeGlobals.baseURI,
+	RuntimeGlobals.relativeUrl,
 	RuntimeGlobals.scriptNonce,
 	RuntimeGlobals.uncaughtErrorHandler,
 	RuntimeGlobals.asyncModule,
@@ -313,6 +315,12 @@ class RuntimePlugin {
 					compilation.addRuntimeModule(chunk, new LoadScriptRuntimeModule());
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.relativeUrl)
+				.tap("RuntimePlugin", (chunk, set) => {
+					compilation.addRuntimeModule(chunk, new RelativeUrlRuntimeModule());
+					return true;
+				});
 			// TODO webpack 6: remove CompatRuntimeModule
 			compilation.hooks.additionalTreeRuntimeRequirements.tap(
 				"RuntimePlugin",

package/lib/WebpackOptionsApply.js

@@ -43,6 +43,7 @@ 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");
 
@@ -312,11 +313,10 @@ 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);

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/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/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;
 						}

package/lib/node/NodeTargetPlugin.js

@@ -52,7 +52,7 @@ const builtins = [
 	"util",
 	"v8",
 	"vm",
-	"wasi", // cSpell:ignore wasi
+	"wasi",
 	"worker_threads",
 	"zlib"
 ];

package/lib/runtime/RelativeUrlRuntimeModule.js

@@ -0,0 +1,41 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
+const HelperRuntimeModule = require("./HelperRuntimeModule");
+
+class RelativeUrlRuntimeModule extends HelperRuntimeModule {
+	constructor() {
+		super("relative url");
+	}
+
+	/**
+	 * @returns {string} runtime code
+	 */
+	generate() {
+		const { runtimeTemplate } = this.compilation;
+		return Template.asString([
+			`${RuntimeGlobals.relativeUrl} = function RelativeURL(url) {`,
+			Template.indent([
+				'var realUrl = new URL(url, "x:/");',
+				"var values = {};",
+				"for (var key in realUrl) values[key] = realUrl[key];",
+				"values.href = url;",
+				'values.pathname = url.replace(/[?#].*/, "");',
+				'values.origin = values.protocol = "";',
+				`values.toString = values.toJSON = ${runtimeTemplate.returningFunction(
+					"url"
+				)};`,
+				"for (var key in values) Object.defineProperty(this, key, Object.assign({ enumerable: true, configurable: true, value: values[key] }));"
+			]),
+			"};",
+			`${RuntimeGlobals.relativeUrl}.prototype = URL.prototype;`
+		]);
+	}
+}
+
+module.exports = RelativeUrlRuntimeModule;

package/lib/runtime/StartupChunkDependenciesPlugin.js

@@ -56,6 +56,7 @@ class StartupChunkDependenciesPlugin {
 					.for(RuntimeGlobals.startupEntrypoint)
 					.tap("StartupChunkDependenciesPlugin", (chunk, set) => {
 						if (!isEnabledForChunk(chunk)) return;
+						set.add(RuntimeGlobals.require);
 						set.add(RuntimeGlobals.ensureChunk);
 						set.add(RuntimeGlobals.ensureChunkIncludeEntries);
 						compilation.addRuntimeModule(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.22.0",
+  "version": "5.23.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -55,7 +55,7 @@
     "eslint": "^7.14.0",
     "eslint-config-prettier": "^7.0.0",
     "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-jsdoc": "^31.0.3",
+    "eslint-plugin-jsdoc": "^32.0.2",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.1.4",
     "file-loader": "^6.0.0",

package/schemas/WebpackOptions.json

@@ -1269,7 +1269,14 @@
         },
         "url": {
           "description": "Enable/disable parsing of new URL() syntax.",
-          "type": "boolean"
+          "anyOf": [
+            {
+              "enum": ["relative"]
+            },
+            {
+              "type": "boolean"
+            }
+          ]
         },
         "worker": {
           "description": "Disable or configure parsing of WebWorker syntax like new Worker() or navigator.serviceWorker.register().",

package/types.d.ts

@@ -4899,7 +4899,7 @@ declare interface JavascriptParserOptions {
 	/**
 	 * Enable/disable parsing of new URL() syntax.
 	 */
-	url?: boolean;
+	url?: boolean | "relative";
 
 	/**
 	 * Disable or configure parsing of WebWorker syntax like new Worker() or navigator.serviceWorker.register().
@@ -10476,7 +10476,7 @@ declare interface UpdateHashContextGenerator {
 	chunkGraph: ChunkGraph;
 	runtime: RuntimeSpec;
 }
-type UsageStateType = 0 | 2 | 3 | 1 | 4;
+type UsageStateType = 0 | 1 | 2 | 3 | 4;
 declare interface UserResolveOptions {
 	/**
 	 * A list of module alias configurations or an object which maps key to value
@@ -11201,6 +11201,7 @@ declare namespace exports {
 		export let hasOwnProperty: string;
 		export let systemContext: string;
 		export let baseURI: string;
+		export let relativeUrl: string;
 		export let asyncModule: string;
 	}
 	export const UsageState: Readonly<{
@@ -11482,6 +11483,7 @@ declare namespace exports {
 		WebpackPluginInstance,
 		Asset,
 		AssetInfo,
+		MultiStats,
 		ParserState,
 		StatsCompilation
 	};