webpack 5.35.1 → 5.37.0

package/lib/runtime/CreateScriptUrlRuntimeModule.js

@@ -0,0 +1,61 @@
+/*
+	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 CreateScriptUrlRuntimeModule extends HelperRuntimeModule {
+	constructor() {
+		super("trusted types");
+	}
+
+	/**
+	 * @returns {string} runtime code
+	 */
+	generate() {
+		const { compilation } = this;
+		const { runtimeTemplate, outputOptions } = compilation;
+		const { trustedTypes } = outputOptions;
+		const fn = RuntimeGlobals.createScriptUrl;
+
+		if (!trustedTypes) {
+			// Skip Trusted Types logic.
+			return Template.asString([
+				`${fn} = ${runtimeTemplate.returningFunction("url", "url")};`
+			]);
+		}
+
+		return Template.asString([
+			"var policy;",
+			`${fn} = ${runtimeTemplate.basicFunction("url", [
+				"// Create Trusted Type policy if Trusted Types are available and the policy doesn't exist yet.",
+				"if (policy === undefined) {",
+				Template.indent([
+					"policy = {",
+					Template.indent([
+						`createScriptURL: ${runtimeTemplate.returningFunction(
+							"url",
+							"url"
+						)}`
+					]),
+					"};",
+					'if (typeof trustedTypes !== "undefined" && trustedTypes.createPolicy) {',
+					Template.indent([
+						`policy = trustedTypes.createPolicy(${JSON.stringify(
+							trustedTypes.policyName
+						)}, policy);`
+					]),
+					"}"
+				]),
+				"}",
+				"return policy.createScriptURL(url);"
+			])};`
+		]);
+	}
+}
+
+module.exports = CreateScriptUrlRuntimeModule;

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -42,8 +42,12 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 		return hooks;
 	}
 
-	constructor() {
+	/**
+	 * @param {boolean=} withCreateScriptUrl use create script url for trusted types
+	 */
+	constructor(withCreateScriptUrl) {
 		super("load script");
+		this._withCreateScriptUrl = withCreateScriptUrl;
 	}
 
 	/**
@@ -78,7 +82,11 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 			uniqueName
 				? 'script.setAttribute("data-webpack", dataWebpackPrefix + key);'
 				: "",
-			`script.src = url;`,
+			`script.src = ${
+				this._withCreateScriptUrl
+					? `${RuntimeGlobals.createScriptUrl}(url)`
+					: "url"
+			};`,
 			crossOriginLoading
 				? Template.asString([
 						"if (script.src.indexOf(window.location.origin + '/') !== 0) {",

package/lib/util/AsyncQueue.js

@@ -119,7 +119,12 @@ class AsyncQueue {
 			const entry = this._entries.get(key);
 			if (entry !== undefined) {
 				if (entry.state === DONE_STATE) {
-					process.nextTick(() => callback(entry.error, entry.result));
+					if (inHandleResult++ > 3) {
+						process.nextTick(() => callback(entry.error, entry.result));
+					} else {
+						callback(entry.error, entry.result);
+					}
+					inHandleResult--;
 				} else if (entry.callbacks === undefined) {
 					entry.callbacks = [callback];
 				} else {

package/lib/util/comparators.js

@@ -433,21 +433,27 @@ exports.compareLocations = (a, b) => {
 		if (isObjectB) return -1;
 		return 0;
 	}
-	if ("start" in a && "start" in b) {
-		const ap = a.start;
-		const bp = b.start;
-		if (ap.line < bp.line) return -1;
-		if (ap.line > bp.line) return 1;
-		if (ap.column < bp.column) return -1;
-		if (ap.column > bp.column) return 1;
-	}
-	if ("name" in a && "name" in b) {
-		if (a.name < b.name) return -1;
-		if (a.name > b.name) return 1;
-	}
-	if ("index" in a && "index" in b) {
-		if (a.index < b.index) return -1;
-		if (a.index > b.index) return 1;
-	}
+	if ("start" in a) {
+		if ("start" in b) {
+			const ap = a.start;
+			const bp = b.start;
+			if (ap.line < bp.line) return -1;
+			if (ap.line > bp.line) return 1;
+			if (ap.column < bp.column) return -1;
+			if (ap.column > bp.column) return 1;
+		} else return -1;
+	} else if ("start" in b) return 1;
+	if ("name" in a) {
+		if ("name" in b) {
+			if (a.name < b.name) return -1;
+			if (a.name > b.name) return 1;
+		} else return -1;
+	} else if ("name" in b) return 1;
+	if ("index" in a) {
+		if ("index" in b) {
+			if (a.index < b.index) return -1;
+			if (a.index > b.index) return 1;
+		} else return -1;
+	} else if ("index" in b) return 1;
 	return 0;
 };

package/lib/util/fs.js

@@ -51,14 +51,14 @@ const path = require("path");
  * @property {string | Buffer} name
  */
 
-/** @typedef {function(NodeJS.ErrnoException=): void} Callback */
-/** @typedef {function(NodeJS.ErrnoException=, Buffer=): void} BufferCallback */
-/** @typedef {function(NodeJS.ErrnoException=, Buffer|string=): void} BufferOrStringCallback */
-/** @typedef {function(NodeJS.ErrnoException=, (string | Buffer)[] | IDirent[]=): void} DirentArrayCallback */
-/** @typedef {function(NodeJS.ErrnoException=, string=): void} StringCallback */
-/** @typedef {function(NodeJS.ErrnoException=, number=): void} NumberCallback */
-/** @typedef {function(NodeJS.ErrnoException=, IStats=): void} StatsCallback */
-/** @typedef {function((NodeJS.ErrnoException | Error)=, any=): void} ReadJsonCallback */
+/** @typedef {function((NodeJS.ErrnoException | null)=): void} Callback */
+/** @typedef {function((NodeJS.ErrnoException | null)=, Buffer=): void} BufferCallback */
+/** @typedef {function((NodeJS.ErrnoException | null)=, Buffer|string=): void} BufferOrStringCallback */
+/** @typedef {function((NodeJS.ErrnoException | null)=, (string | Buffer)[] | IDirent[]=): void} DirentArrayCallback */
+/** @typedef {function((NodeJS.ErrnoException | null)=, string=): void} StringCallback */
+/** @typedef {function((NodeJS.ErrnoException | null)=, number=): void} NumberCallback */
+/** @typedef {function((NodeJS.ErrnoException | null)=, IStats=): void} StatsCallback */
+/** @typedef {function((NodeJS.ErrnoException | Error | null)=, any=): void} ReadJsonCallback */
 
 /**
  * @typedef {Object} Watcher

package/lib/util/internalSerializables.js

@@ -45,6 +45,8 @@ module.exports = {
 		require("../dependencies/AMDRequireItemDependency"),
 	"dependencies/CachedConstDependency": () =>
 		require("../dependencies/CachedConstDependency"),
+	"dependencies/CreateScriptUrlDependency": () =>
+		require("../dependencies/CreateScriptUrlDependency"),
 	"dependencies/CommonJsRequireContextDependency": () =>
 		require("../dependencies/CommonJsRequireContextDependency"),
 	"dependencies/CommonJsExportRequireDependency": () =>

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const RuntimeGlobals = require("../RuntimeGlobals");
+const CreateScriptUrlRuntimeModule = require("../runtime/CreateScriptUrlRuntimeModule");
 const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenciesPlugin");
 const ImportScriptsChunkLoadingRuntimeModule = require("./ImportScriptsChunkLoadingRuntimeModule");
 
@@ -39,11 +40,13 @@ class ImportScriptsChunkLoadingPlugin {
 					if (onceForChunkSet.has(chunk)) return;
 					onceForChunkSet.add(chunk);
 					if (!isEnabledForChunk(chunk)) return;
+					const withCreateScriptUrl = !!compilation.outputOptions.trustedTypes;
 					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
 					set.add(RuntimeGlobals.hasOwnProperty);
+					if (withCreateScriptUrl) set.add(RuntimeGlobals.createScriptUrl);
 					compilation.addRuntimeModule(
 						chunk,
-						new ImportScriptsChunkLoadingRuntimeModule(set)
+						new ImportScriptsChunkLoadingRuntimeModule(set, withCreateScriptUrl)
 					);
 				};
 				compilation.hooks.runtimeRequirementInTree
@@ -58,6 +61,15 @@ class ImportScriptsChunkLoadingPlugin {
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.baseURI)
 					.tap("ImportScriptsChunkLoadingPlugin", handler);
+				compilation.hooks.runtimeRequirementInTree
+					.for(RuntimeGlobals.createScriptUrl)
+					.tap("RuntimePlugin", (chunk, set) => {
+						compilation.addRuntimeModule(
+							chunk,
+							new CreateScriptUrlRuntimeModule()
+						);
+						return true;
+					});
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.ensureChunkHandlers)

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -16,9 +16,10 @@ const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { getUndoPath } = require("../util/identifier");
 
 class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
-	constructor(runtimeRequirements) {
+	constructor(runtimeRequirements, withCreateScriptUrl) {
 		super("importScripts chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
+		this._withCreateScriptUrl = withCreateScriptUrl;
 	}
 
 	/**
@@ -31,7 +32,8 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 			compilation: {
 				runtimeTemplate,
 				outputOptions: { globalObject, chunkLoadingGlobal, hotUpdateGlobal }
-			}
+			},
+			_withCreateScriptUrl: withCreateScriptUrl
 		} = this;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
@@ -121,7 +123,11 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 												? "if(true) { // all chunks have JS"
 												: `if(${hasJsMatcher("chunkId")}) {`,
 											Template.indent(
-												`importScripts(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId));`
+												`importScripts(${
+													withCreateScriptUrl
+														? `${RuntimeGlobals.createScriptUrl}(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId))`
+														: `${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId)`
+												});`
 											),
 											"}"
 										]),
@@ -158,7 +164,11 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 								"success = true;"
 							])};`,
 							"// start update chunk loading",
-							`importScripts(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId));`,
+							`importScripts(${
+								withCreateScriptUrl
+									? `${RuntimeGlobals.createScriptUrl}(${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId))`
+									: `${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId)`
+							});`,
 							'if(!success) throw new Error("Loading update chunk failed for unknown reason");'
 						]),
 						"}",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.35.1",
+  "version": "5.37.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",
@@ -10,7 +10,7 @@
     "@webassemblyjs/ast": "1.11.0",
     "@webassemblyjs/wasm-edit": "1.11.0",
     "@webassemblyjs/wasm-parser": "1.11.0",
-    "acorn": "^8.0.4",
+    "acorn": "^8.2.1",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^5.8.0",
@@ -39,7 +39,7 @@
     "@babel/preset-react": "^7.10.4",
     "@types/es-module-lexer": "^0.3.0",
     "@types/jest": "^26.0.15",
-    "@types/node": "^14.14.10",
+    "@types/node": "^15.0.1",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
@@ -55,7 +55,7 @@
     "eslint": "^7.14.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-jsdoc": "^32.0.2",
+    "eslint-plugin-jsdoc": "^33.0.0",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.1.4",
     "file-loader": "^6.0.0",
@@ -92,7 +92,7 @@
     "style-loader": "^2.0.0",
     "terser": "^5.5.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.17.0",
+    "tooling": "webpack/tooling#v1.19.0",
     "ts-loader": "^8.0.2",
     "typescript": "^4.2.0-beta",
     "url-loader": "^4.1.0",