webpack 5.68.0 → 5.70.0

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -51,6 +51,20 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 		this._runtimeRequirements = runtimeRequirements;
 	}
 
+	/**
+	 * @private
+	 * @param {Chunk} chunk chunk
+	 * @returns {string} generated code
+	 */
+	_generateBaseUri(chunk) {
+		const options = chunk.getEntryOptions();
+		if (options && options.baseUri) {
+			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
+		} else {
+			return `${RuntimeGlobals.baseURI} = document.baseURI || self.location.href;`;
+		}
+	}
+
 	/**
 	 * @returns {string} runtime code
 	 */
@@ -103,11 +117,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 			: undefined;
 
 		return Template.asString([
-			withBaseURI
-				? Template.asString([
-						`${RuntimeGlobals.baseURI} = document.baseURI || self.location.href;`
-				  ])
-				: "// no baseURI",
+			withBaseURI ? this._generateBaseUri(chunk) : "// no baseURI",
 			"",
 			"// object to store loaded and loading chunks",
 			"// undefined = chunk not loaded, null = chunk preloaded/prefetched",

package/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js

@@ -15,6 +15,8 @@ const { getInitialChunkIds } = require("../javascript/StartupHelpers");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { getUndoPath } = require("../util/identifier");
 
+/** @typedef {import("../Chunk")} Chunk */
+
 class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 	constructor(runtimeRequirements, withCreateScriptUrl) {
 		super("importScripts chunk loading", RuntimeModule.STAGE_ATTACH);
@@ -22,6 +24,33 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		this._withCreateScriptUrl = withCreateScriptUrl;
 	}
 
+	/**
+	 * @private
+	 * @param {Chunk} chunk chunk
+	 * @returns {string} generated code
+	 */
+	_generateBaseUri(chunk) {
+		const options = chunk.getEntryOptions();
+		if (options && options.baseUri) {
+			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
+		}
+		const outputName = this.compilation.getPath(
+			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),
+			{
+				chunk,
+				contentHashType: "javascript"
+			}
+		);
+		const rootOutputDir = getUndoPath(
+			outputName,
+			this.compilation.outputOptions.path,
+			false
+		);
+		return `${RuntimeGlobals.baseURI} = self.location + ${JSON.stringify(
+			rootOutputDir ? "/../" + rootOutputDir : ""
+		)};`;
+	}
+
 	/**
 	 * @returns {string} runtime code
 	 */
@@ -55,31 +84,12 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const initialChunkIds = getInitialChunkIds(chunk, chunkGraph, chunkHasJs);
 
-		const outputName = this.compilation.getPath(
-			getChunkFilenameTemplate(chunk, this.compilation.outputOptions),
-			{
-				chunk,
-				contentHashType: "javascript"
-			}
-		);
-		const rootOutputDir = getUndoPath(
-			outputName,
-			this.compilation.outputOptions.path,
-			false
-		);
-
 		const stateExpression = withHmr
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_importScripts`
 			: undefined;
 
 		return Template.asString([
-			withBaseURI
-				? Template.asString([
-						`${RuntimeGlobals.baseURI} = self.location + ${JSON.stringify(
-							rootOutputDir ? "/../" + rootOutputDir : ""
-						)};`
-				  ])
-				: "// no baseURI",
+			withBaseURI ? this._generateBaseUri(chunk) : "// no baseURI",
 			"",
 			"// object to store loaded chunks",
 			'// "1" means "already loaded"',

package/module.d.ts

@@ -129,6 +129,7 @@ declare namespace webpack {
 		used: boolean;
 		provideInfo: boolean | null | undefined;
 		useInfo: boolean | null | undefined;
+		canMangle: boolean;
 	}
 
 	interface ExportsInfo {
@@ -147,6 +148,20 @@ interface ImportMeta {
 	url: string;
 	webpack: number;
 	webpackHot: webpack.Hot;
+	webpackContext: (
+		request: string,
+		options?: {
+			recursive?: boolean;
+			regExp?: RegExp;
+			include?: RegExp;
+			exclude?: RegExp;
+			preload?: boolean | number;
+			prefetch?: boolean | number;
+			chunkName?: string;
+			exports?: string | string[][];
+			mode?: "sync" | "eager" | "weak" | "lazy" | "lazy-once";
+		}
+	) => webpack.Context;
 }
 
 declare const __resourceQuery: string;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "webpack",
-  "version": "5.68.0",
+  "version": "5.70.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",
   "dependencies": {
-    "@types/eslint-scope": "^3.7.0",
-    "@types/estree": "^0.0.50",
+    "@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",
@@ -14,7 +14,7 @@
     "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.8.3",
+    "enhanced-resolve": "^5.9.2",
     "es-module-lexer": "^0.9.0",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
@@ -39,8 +39,8 @@
     "@babel/core": "^7.11.1",
     "@babel/preset-react": "^7.10.4",
     "@types/es-module-lexer": "^0.4.1",
-    "@types/jest": "^27.0.2",
-    "@types/node": "^15.0.1",
+    "@types/jest": "^27.4.0",
+    "@types/node": "^17.0.16",
     "assemblyscript": "^0.19.16",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
@@ -56,7 +56,7 @@
     "es6-promise-polyfill": "^1.2.0",
     "eslint": "^7.14.0",
     "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-jest": "^24.3.6",
+    "eslint-plugin-jest": "^24.7.0",
     "eslint-plugin-jsdoc": "^33.0.0",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -66,10 +66,10 @@
     "husky": "^6.0.0",
     "is-ci": "^3.0.0",
     "istanbul": "^0.4.5",
-    "jest": "^27.3.1",
-    "jest-circus": "^27.3.1",
-    "jest-cli": "^27.3.1",
-    "jest-diff": "^27.3.1",
+    "jest": "^27.5.0",
+    "jest-circus": "^27.5.0",
+    "jest-cli": "^27.5.0",
+    "jest-diff": "^27.5.0",
     "jest-junit": "^13.0.0",
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
@@ -98,9 +98,9 @@
     "style-loader": "^2.0.0",
     "terser": "^5.7.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.20.1",
+    "tooling": "webpack/tooling#v1.21.0",
     "ts-loader": "^8.0.2",
-    "typescript": "^4.2.0-beta",
+    "typescript": "^4.5.5",
     "url-loader": "^4.1.0",
     "wast-loader": "^1.11.0",
     "webassembly-feature": "1.3.0",