webpack 5.76.1 → 5.88.0

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -16,8 +16,14 @@ const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { getUndoPath } = require("../util/identifier");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
 
 class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
+	/**
+	 * @param {Set<string>} runtimeRequirements runtime requirements
+	 * @param {boolean} withCreateScriptUrl with createScriptUrl support
+	 */
 	constructor(runtimeRequirements, withCreateScriptUrl) {
 		super("importScripts chunk loading", RuntimeModule.STAGE_ATTACH);
 		this.runtimeRequirements = runtimeRequirements;
@@ -34,8 +40,9 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
-		const outputName = this.compilation.getPath(
-			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const outputName = compilation.getPath(
+			getChunkFilenameTemplate(chunk, compilation.outputOptions),
 			{
 				chunk,
 				contentHashType: "javascript"
@@ -43,7 +50,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			this.compilation.outputOptions.path,
+			/** @type {string} */ (compilation.outputOptions.path),
 			false
 		);
 		return `${RuntimeGlobals.baseURI} = self.location + ${JSON.stringify(
@@ -52,19 +59,10 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const {
-			chunk,
-			chunkGraph,
-			compilation: {
-				runtimeTemplate,
-				outputOptions: { chunkLoadingGlobal, hotUpdateGlobal }
-			},
-			_withCreateScriptUrl: withCreateScriptUrl
-		} = this;
-		const globalObject = runtimeTemplate.globalObject;
+		const compilation = /** @type {Compilation} */ (this.compilation);
 		const fn = RuntimeGlobals.ensureChunkHandlers;
 		const withBaseURI = this.runtimeRequirements.has(RuntimeGlobals.baseURI);
 		const withLoading = this.runtimeRequirements.has(
@@ -76,9 +74,12 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const withHmrManifest = this.runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadManifest
 		);
+		const globalObject = compilation.runtimeTemplate.globalObject;
 		const chunkLoadingGlobalExpr = `${globalObject}[${JSON.stringify(
-			chunkLoadingGlobal
+			compilation.outputOptions.chunkLoadingGlobal
 		)}]`;
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
+		const chunk = /** @type {Chunk} */ (this.chunk);
 		const hasJsMatcher = compileBooleanMatcher(
 			chunkGraph.getChunkConditionMap(chunk, chunkHasJs)
 		);
@@ -87,6 +88,8 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		const stateExpression = withHmr
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_importScripts`
 			: undefined;
+		const runtimeTemplate = compilation.runtimeTemplate;
+		const { _withCreateScriptUrl: withCreateScriptUrl } = this;
 
 		return Template.asString([
 			withBaseURI ? this._generateBaseUri(chunk) : "// no baseURI",
@@ -120,7 +123,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 								"}"
 							]),
 							"}",
-							"if(runtime) runtime(__webpack_require__);",
+							`if(runtime) runtime(${RuntimeGlobals.require});`,
 							"while(chunkIds.length)",
 							Template.indent("installedChunks[chunkIds.pop()] = 1;"),
 							"parentChunkLoadingFunction(data);"
@@ -165,7 +168,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 						Template.indent([
 							"var success = false;",
 							`${globalObject}[${JSON.stringify(
-								hotUpdateGlobal
+								compilation.outputOptions.hotUpdateGlobal
 							)}] = ${runtimeTemplate.basicFunction("_, moreModules, runtime", [
 								"for(var moduleId in moreModules) {",
 								Template.indent([

package/module.d.ts

@@ -1,45 +1,55 @@
 declare namespace webpack {
-	type HotEvent =
-		| {
-				type: "disposed";
-				/** The module in question. */
-				moduleId: number;
-		  }
-		| {
-				type: "self-declined" | "unaccepted";
-				/** The module in question. */
-				moduleId: number;
-				/** the chain from where the update was propagated. */
-				chain: number[];
-		  }
+	type DeclinedEvent =
 		| {
 				type: "declined";
 				/** The module in question. */
-				moduleId: number;
+				moduleId: number | string;
 				/** the chain from where the update was propagated. */
-				chain: number[];
+				chain: (number | string)[];
 				/** the module id of the declining parent */
-				parentId: number;
+				parentId: number | string;
 		  }
 		| {
-				type: "accepted";
+				type: "self-declined";
 				/** The module in question. */
-				moduleId: number;
+				moduleId: number | string;
 				/** the chain from where the update was propagated. */
-				chain: number[];
-				/** the modules that are outdated and will be disposed */
-				outdatedModules: number[];
-				/** the accepted dependencies that are outdated */
-				outdatedDependencies: {
-					[id: number]: number[];
-				};
-		  }
+				chain: (number | string)[];
+		  };
+
+	type UnacceptedEvent = {
+		type: "unaccepted";
+		/** The module in question. */
+		moduleId: number | string;
+		/** the chain from where the update was propagated. */
+		chain: (number | string)[];
+	};
+
+	type AcceptedEvent = {
+		type: "accepted";
+		/** The module in question. */
+		moduleId: number | string;
+		/** the modules that are outdated and will be disposed */
+		outdatedModules: (number | string)[];
+		/** the accepted dependencies that are outdated */
+		outdatedDependencies: {
+			[id: number]: (number | string)[];
+		};
+	};
+
+	type DisposedEvent = {
+		type: "disposed";
+		/** The module in question. */
+		moduleId: number | string;
+	};
+
+	type ErroredEvent =
 		| {
 				type: "accept-error-handler-errored";
 				/** The module in question. */
-				moduleId: number;
+				moduleId: number | string;
 				/** the module id owning the accept handler. */
-				dependencyId: number;
+				dependencyId: number | string;
 				/** the thrown error */
 				error: Error;
 				/** the error thrown by the module before the error handler tried to handle it. */
@@ -48,7 +58,7 @@ declare namespace webpack {
 		| {
 				type: "self-accept-error-handler-errored";
 				/** The module in question. */
-				moduleId: number;
+				moduleId: number | string;
 				/** the thrown error */
 				error: Error;
 				/** the error thrown by the module before the error handler tried to handle it. */
@@ -57,29 +67,36 @@ declare namespace webpack {
 		| {
 				type: "accept-errored";
 				/** The module in question. */
-				moduleId: number;
+				moduleId: number | string;
 				/** the module id owning the accept handler. */
-				dependencyId: number;
+				dependencyId: number | string;
 				/** the thrown error */
 				error: Error;
 		  }
 		| {
 				type: "self-accept-errored";
 				/** The module in question. */
-				moduleId: number;
+				moduleId: number | string;
 				/** the thrown error */
 				error: Error;
 		  };
 
+	type HotEvent =
+		| DeclinedEvent
+		| UnacceptedEvent
+		| AcceptedEvent
+		| DisposedEvent
+		| ErroredEvent;
+
 	interface ApplyOptions {
 		ignoreUnaccepted?: boolean;
 		ignoreDeclined?: boolean;
 		ignoreErrored?: boolean;
-		onDeclined?(callback: (info: HotEvent) => void): void;
-		onUnaccepted?(callback: (info: HotEvent) => void): void;
-		onAccepted?(callback: (info: HotEvent) => void): void;
-		onDisposed?(callback: (info: HotEvent) => void): void;
-		onErrored?(callback: (info: HotEvent) => void): void;
+		onDeclined?: (event: DeclinedEvent) => void;
+		onUnaccepted?: (event: UnacceptedEvent) => void;
+		onAccepted?: (event: AcceptedEvent) => void;
+		onDisposed?: (event: DisposedEvent) => void;
+		onErrored?: (event: ErroredEvent) => void;
 	}
 
 	const enum HotUpdateStatus {
@@ -157,6 +174,7 @@ interface ImportMeta {
 			exclude?: RegExp;
 			preload?: boolean | number;
 			prefetch?: boolean | number;
+			fetchPriority?: "low" | "high" | "auto";
 			chunkName?: string;
 			exports?: string | string[][];
 			mode?: "sync" | "eager" | "weak" | "lazy" | "lazy-once";

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "webpack",
-  "version": "5.76.1",
+  "version": "5.88.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.",
+  "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
     "@types/eslint-scope": "^3.7.3",
-    "@types/estree": "^0.0.51",
-    "@webassemblyjs/ast": "1.11.1",
-    "@webassemblyjs/wasm-edit": "1.11.1",
-    "@webassemblyjs/wasm-parser": "1.11.1",
+    "@types/estree": "^1.0.0",
+    "@webassemblyjs/ast": "^1.11.5",
+    "@webassemblyjs/wasm-edit": "^1.11.5",
+    "@webassemblyjs/wasm-parser": "^1.11.5",
     "acorn": "^8.7.1",
-    "acorn-import-assertions": "^1.7.6",
+    "acorn-import-assertions": "^1.9.0",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.10.0",
-    "es-module-lexer": "^0.9.0",
+    "enhanced-resolve": "^5.15.0",
+    "es-module-lexer": "^1.2.1",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
     "glob-to-regexp": "^0.4.1",
@@ -24,9 +24,9 @@
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
-    "schema-utils": "^3.1.0",
+    "schema-utils": "^3.2.0",
     "tapable": "^2.1.1",
-    "terser-webpack-plugin": "^5.1.3",
+    "terser-webpack-plugin": "^5.3.7",
     "watchpack": "^2.4.0",
     "webpack-sources": "^3.2.3"
   },
@@ -36,12 +36,12 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.11.1",
-    "@babel/preset-react": "^7.10.4",
-    "@types/es-module-lexer": "^0.4.1",
-    "@types/jest": "^27.4.0",
-    "@types/node": "^17.0.16",
-    "assemblyscript": "^0.19.16",
+    "@babel/core": "^7.21.4",
+    "@babel/preset-react": "^7.18.6",
+    "@types/jest": "^29.5.0",
+    "@types/mime-types": "^2.1.1",
+    "@types/node": "^20.1.7",
+    "assemblyscript": "^0.27.2",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
@@ -49,65 +49,65 @@
     "coffeescript": "^2.5.1",
     "core-js": "^3.6.5",
     "coveralls": "^3.1.0",
-    "cspell": "^4.0.63",
+    "cspell": "^6.31.1",
     "css-loader": "^5.0.1",
     "date-fns": "^2.15.0",
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^7.14.0",
+    "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-jest": "^24.7.0",
-    "eslint-plugin-jsdoc": "^33.0.0",
+    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-jsdoc": "^43.0.5",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "file-loader": "^6.0.0",
-    "fork-ts-checker-webpack-plugin": "^6.0.5",
+    "fork-ts-checker-webpack-plugin": "^8.0.0",
     "hash-wasm": "^4.9.0",
-    "husky": "^6.0.0",
+    "husky": "^8.0.3",
     "is-ci": "^3.0.0",
     "istanbul": "^0.4.5",
-    "jest": "^27.5.0",
-    "jest-circus": "^27.5.0",
-    "jest-cli": "^27.5.0",
-    "jest-diff": "^27.5.0",
-    "jest-junit": "^13.0.0",
+    "jest": "^29.5.0",
+    "jest-circus": "^29.5.0",
+    "jest-cli": "^29.5.0",
+    "jest-diff": "^29.5.0",
+    "jest-environment-node": "^29.5.0",
+    "jest-junit": "^16.0.0",
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
     "less": "^4.0.0",
     "less-loader": "^8.0.0",
-    "lint-staged": "^11.0.0",
-    "loader-utils": "^2.0.3",
+    "lint-staged": "^13.2.1",
     "lodash": "^4.17.19",
     "lodash-es": "^4.17.15",
-    "memfs": "^3.2.0",
+    "memfs": "^3.5.0",
     "mini-css-extract-plugin": "^1.6.1",
     "mini-svg-data-uri": "^1.2.3",
     "nyc": "^15.1.0",
-    "open-cli": "^6.0.1",
+    "open-cli": "^7.2.0",
     "prettier": "^2.7.1",
-    "pretty-format": "^27.0.2",
+    "pretty-format": "^29.5.0",
     "pug": "^3.0.0",
     "pug-loader": "^2.4.0",
     "raw-loader": "^4.0.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
     "script-loader": "^0.7.2",
-    "simple-git": "^2.17.0",
+    "simple-git": "^3.17.0",
     "strip-ansi": "^6.0.0",
     "style-loader": "^2.0.0",
-    "terser": "^5.7.0",
+    "terser": "^5.17.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.22.0",
-    "ts-loader": "^8.0.2",
-    "typescript": "^4.8.4",
+    "tooling": "webpack/tooling#v1.23.0",
+    "ts-loader": "^9.4.2",
+    "typescript": "^5.0.4",
     "url-loader": "^4.1.0",
-    "wast-loader": "^1.11.0",
+    "wast-loader": "^1.11.5",
     "webassembly-feature": "1.3.0",
-    "webpack-cli": "^4.3.0",
+    "webpack-cli": "^5.0.1",
     "xxhashjs": "^0.2.2",
     "yamljs": "^0.3.0",
-    "yarn-deduplicate": "^3.1.0"
+    "yarn-deduplicate": "^6.0.1"
   },
   "engines": {
     "node": ">=10.13.0"
@@ -149,18 +149,17 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn special-lint && yarn type-lint && yarn typings-test && yarn module-typings-test && yarn yarn-lint && yarn pretty-lint && yarn spellcheck",
-    "code-lint": "eslint . --ext '.js' --cache",
+    "code-lint": "eslint --cache .",
     "type-lint": "tsc",
     "typings-test": "tsc -p tsconfig.types.test.json",
     "module-typings-test": "tsc -p tsconfig.module.test.json",
-    "spellcheck": "cspell \"**/*\"",
+    "spellcheck": "cspell --no-progress \"**\"",
     "special-lint": "node node_modules/tooling/lockfile-lint && node node_modules/tooling/schemas-lint && node node_modules/tooling/inherit-types && node node_modules/tooling/format-schemas && node tooling/generate-runtime-code.js && node tooling/generate-wasm-code.js && node node_modules/tooling/format-file-header && node node_modules/tooling/compile-to-definitions && node node_modules/tooling/precompile-schemas && node node_modules/tooling/generate-types --no-template-literals",
     "special-lint-fix": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node tooling/generate-wasm-code.js --write && node node_modules/tooling/format-file-header --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/precompile-schemas --write && node node_modules/tooling/generate-types --no-template-literals --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix && yarn pretty-lint-fix",
     "prepare": "husky install",
-    "pretty-lint-base": "prettier \"*.{ts,json,yml,yaml,md}\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.json\" \"examples/*.md\"",
-    "pretty-lint-base-all": "yarn pretty-lint-base \"*.js\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.js\" \"module.d.ts\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases,benchmarkCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
-    "pretty-lint-fix": "yarn pretty-lint-base-all --loglevel warn --write",
+    "pretty-lint-base": "prettier --cache .",
+    "pretty-lint-fix": "yarn pretty-lint-base --loglevel warn --write",
     "pretty-lint": "yarn pretty-lint-base --check",
     "yarn-lint": "yarn-deduplicate --fail --list -s highest yarn.lock",
     "yarn-lint-fix": "yarn-deduplicate -s highest yarn.lock",
@@ -175,14 +174,14 @@
     "cover:unit": "node --max-old-space-size=4096 --experimental-vm-modules node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.unittest.js\" --coverage",
     "cover:types": "node node_modules/tooling/type-coverage",
     "cover:merge": "yarn mkdirp .nyc_output && nyc merge .nyc_output coverage/coverage-nyc.json && rimraf .nyc_output",
-    "cover:report": "nyc report -t coverage"
+    "cover:report": "nyc report --reporter=lcov  --reporter=text -t coverage"
   },
   "lint-staged": {
-    "*.js|{lib,setup,bin,hot,tooling,schemas}/**/*.js|test/*.js|{test,examples}/**/webpack.config.js}": [
-      "eslint --cache"
+    "*.{js,cjs,mjs}": [
+      "eslint --cache --fix"
     ],
-    "*.{ts,json,yml,yaml,md}|examples/*.md": [
-      "prettier --check"
+    "*": [
+      "prettier --cache --ignore-unknown"
     ],
     "*.md|{.github,benchmark,bin,examples,hot,lib,schemas,setup,tooling}/**/*.{md,yml,yaml,js,json}": [
       "cspell"
@@ -235,9 +234,13 @@
       "<rootDir>/schemas",
       "<rootDir>/node_modules"
     ],
-    "testEnvironment": "node",
+    "testEnvironment": "./test/patch-node-env.js",
     "coverageReporters": [
       "json"
-    ]
+    ],
+    "snapshotFormat": {
+      "escapeString": true,
+      "printBasicPrototype": true
+    }
   }
 }