Merge 51619a8f1a into c7dd066327

examples/asset/README.md

@@ -300,7 +300,7 @@ module.exports = __webpack_require__.tb("PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmc
 /******/ 	
 /******/ 	/* webpack/runtime/jsonp chunk loading */
 /******/ 	(() => {
-/******/ 		__webpack_require__.b = (document && document.baseURI) || self.location.href;
+/******/ 		__webpack_require__.b = (typeof document !== 'undefined' && document.baseURI) || self.location.href;
 /******/ 		
 /******/ 		// object to store loaded and loading chunks
 /******/ 		// undefined = chunk not loaded, null = chunk preloaded/prefetched
@@ -476,10 +476,10 @@ files.forEach(item => {
 asset output.js 19.2 KiB [emitted] (name: main)
 asset images/89a353e9c515885abd8e.png 14.6 KiB [emitted] [immutable] [from: images/file.png] (auxiliary name: main)
 asset images/afc10c70ed4ce2b33593.svg 656 bytes [emitted] [immutable] [from: images/url.svg] (auxiliary name: main)
-chunk (runtime: main) output.js (main) 12.4 KiB (javascript) 15.2 KiB (asset) 1.46 KiB (runtime) [entry] [rendered]
+chunk (runtime: main) output.js (main) 12.4 KiB (javascript) 15.2 KiB (asset) 1.48 KiB (runtime) [entry] [rendered]
   > ./example.js main
   dependent modules 9.59 KiB (javascript) 15.2 KiB (asset) [dependent] 6 modules
-  runtime modules 1.46 KiB 5 modules
+  runtime modules 1.48 KiB 5 modules
   ./example.js 2.85 KiB [built] [code generated]
     [no exports]
     [used exports unknown]

examples/worker/README.md

@@ -286,7 +286,7 @@ export const add = (content, from) => {
 /******/ 	
 /******/ 	/* webpack/runtime/jsonp chunk loading */
 /******/ 	(() => {
-/******/ 		__webpack_require__.b = (document && document.baseURI) || self.location.href;
+/******/ 		__webpack_require__.b = (typeof document !== 'undefined' && document.baseURI) || self.location.href;
 /******/ 		
 /******/ 		// object to store loaded and loading chunks
 /******/ 		// undefined = chunk not loaded, null = chunk preloaded/prefetched
@@ -722,7 +722,7 @@ function fibonacci(n) {
 ## Unoptimized
 
 ```
-asset main.js 11.8 KiB [emitted] (name: main)
+asset main.js 11.9 KiB [emitted] (name: main)
 asset workers/fibonacci.js 4.99 KiB [emitted] (name: fibonacci)
 asset chat.js 839 bytes [emitted] (name: chat)
 asset 129.js 741 bytes [emitted]
@@ -746,9 +746,9 @@ chunk (runtime: 9a81d90cfd0dfd13d748) workers/fibonacci.js (fibonacci) 176 bytes
   ./fib-worker.js 176 bytes [built] [code generated]
     [no exports used]
     new Worker() ./fib-worker.js ./example.js 80:18-84:2
-chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.4 KiB (runtime) [entry] [rendered]
+chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.42 KiB (runtime) [entry] [rendered]
   > ./example.js main
-  runtime modules 5.4 KiB 7 modules
+  runtime modules 5.42 KiB 7 modules
   ./example.js 2.25 KiB [built] [code generated]
     [no exports used]
     entry ./example.js main
@@ -758,7 +758,7 @@ webpack X.X.X compiled successfully
 ## Production mode
 
 ```
-asset main.js 3.27 KiB [emitted] [minimized] (name: main)
+asset main.js 3.29 KiB [emitted] [minimized] (name: main)
 asset workers/fibonacci.js 776 bytes [emitted] [minimized] (name: fibonacci)
 asset chat.js 270 bytes [emitted] [minimized] (name: chat)
 asset 129.js 159 bytes [emitted] [minimized]
@@ -782,9 +782,9 @@ chunk (runtime: 9a81d90cfd0dfd13d748) workers/fibonacci.js (fibonacci) 176 bytes
   ./fib-worker.js 176 bytes [built] [code generated]
     [no exports used]
     new Worker() ./fib-worker.js ./example.js 80:18-84:2
-chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.4 KiB (runtime) [entry] [rendered]
+chunk (runtime: main) main.js (main) 2.25 KiB (javascript) 5.42 KiB (runtime) [entry] [rendered]
   > ./example.js main
-  runtime modules 5.4 KiB 7 modules
+  runtime modules 5.42 KiB 7 modules
   ./example.js 2.25 KiB [built] [code generated]
     [no exports used]
     entry ./example.js main

lib/Compilation.js

@@ -1042,6 +1042,9 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 			logger: this.getLogger("webpack.FileSystemInfo"),
 			hashFunction: compiler.options.output.hashFunction
 		});
+		if (compiler.watchMode) {
+			this.fileSystemInfo._checkContextTimestampHash = false;
+		}
 		if (compiler.fileTimestamps) {
 			this.fileSystemInfo.addFileTimestamps(compiler.fileTimestamps, true);
 		}

lib/ContextModule.js

@@ -254,10 +254,12 @@ class ContextModule extends Module {
 		} else if (this.options.namespaceObject) {
 			identifier += "|namespace object";
 		}
+		if (this.options.attributes) {
+			identifier += `|importAttributes: ${JSON.stringify(this.options.attributes)}`;
+		}
 		if (this.layer) {
 			identifier += `|layer: ${this.layer}`;
 		}
-
 		return identifier;
 	}
 

lib/FileSystemInfo.js

@@ -1245,6 +1245,7 @@ class FileSystemInfo {
 		this._cachedDeprecatedContextTimestamps = undefined;
 
 		this._warnAboutExperimentalEsmTracking = false;
+		this._checkContextTimestampHash = true;
 
 		this._statCreatedSnapshots = 0;
 		this._statTestedSnapshotsCached = 0;
@@ -2918,6 +2919,7 @@ class FileSystemInfo {
 				}
 				const snap = /** @type {ResolvedContextFileSystemInfoEntry} */ (s);
 				if (
+					this._checkContextTimestampHash &&
 					snap.timestampHash !== undefined &&
 					c.timestampHash !== snap.timestampHash
 				) {

lib/asset/AssetBytesGenerator.js

@@ -53,6 +53,7 @@ class AssetSourceGenerator extends Generator {
 
 				const encodedSource = originalSource.buffer().toString("base64");
 
+				runtimeRequirements.add(RuntimeGlobals.requireScope);
 				runtimeRequirements.add(RuntimeGlobals.toBinary);
 
 				let sourceContent;

lib/dependencies/ContextElementDependency.js

@@ -68,8 +68,8 @@ class ContextElementDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (this.attributes !== undefined) {
+		if (this.attributes) {
-			str += JSON.stringify(this.attributes);
+			str += `|importAttributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}

lib/dependencies/HarmonyImportDependency.js

@@ -79,8 +79,11 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (this.attributes !== undefined) {
+		if (this.defer) {
-			str += JSON.stringify(this.attributes);
+			str += "|defer";
+		}
+		if (this.attributes) {
+			str += `|importAttributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}

lib/dependencies/ImportContextDependency.js

@@ -35,6 +35,19 @@ class ImportContextDependency extends ContextDependency {
 		return "esm";
 	}
 
+	/**
+	 * @returns {string | null} an identifier to merge equal requests
+	 */
+	getResourceIdentifier() {
+		let str = super.getResourceIdentifier();
+
+		if (this.options.attributes) {
+			str += `|importAttributes${JSON.stringify(this.options.attributes)}`;
+		}
+
+		return str;
+	}
+
 	/**
 	 * @param {ObjectSerializerContext} context context
 	 */

lib/dependencies/ImportDependency.js

@@ -50,8 +50,8 @@ class ImportDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (this.attributes !== undefined) {
+		if (this.attributes) {
-			str += JSON.stringify(this.attributes);
+			str += `|importAttributes${JSON.stringify(this.attributes)}`;
 		}
 		return str;
 	}

lib/library/SystemLibraryPlugin.js

@@ -134,11 +134,21 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 										);
 										if (used) {
 											if (otherUnused || used !== exportInfo.name) {
+												if (exportInfo.name === "default") {
+													// Ideally we should use `module && module.__esModule ? module['default'] : module`
+													// But we need to keep compatibility with SystemJS format libraries (they are using `default`) and bundled SystemJS libraries from commonjs format
+													instructions.push(
+														`${external}${propertyAccess([
+															used
+														])} = module["default"] || module;`
+													);
+												} else {
 													instructions.push(
 														`${external}${propertyAccess([
 															used
 														])} = module${propertyAccess([exportInfo.name])};`
 													);
+												}
 												handledNames.push(exportInfo.name);
 											}
 										} else {

test/configCases/asset-modules/bytes/index.js

@@ -1,12 +1,17 @@
 import * as style from "./style.css";
 import file from "./file.text" with { type: "bytes" };
 
-it("should work", () => {
+it("should work", async () => {
 	const decoder = new TextDecoder('utf-8');
 	const text = decoder.decode(file);
 
 	expect(text).toBe("a Ā 𐀀 文 🦄 Text");
 
+	const dyn = (await import("./file.text?other", { with: { type: "bytes" } })).default;
+	const dynText = decoder.decode(dyn);
+
+	expect(dynText).toBe("a Ā 𐀀 文 🦄 Text");
+
 	if (typeof getComputedStyle === "function") {
 		const style = getComputedStyle(document.body);
 		expect(style.getPropertyValue("--my-url")).toBe(" url(data:application/octet-stream;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MDAgNjAwIj48dGl0bGU+aWNvbi1zcXVhcmUtc21hbGw8L3RpdGxlPjxwYXRoIGZpbGw9IiNGRkYiIGQ9Ik0zMDAgLjFMNTY1IDE1MHYyOTkuOUwzMDAgNTk5LjggMzUgNDQ5LjlWMTUweiIvPjxwYXRoIGZpbGw9IiM4RUQ2RkIiIGQ9Ik01MTcuNyA0MzkuNUwzMDguOCA1NTcuOHYtOTJMNDM5IDM5NC4xbDc4LjcgNDUuNHptMTQuMy0xMi45VjE3OS40bC03Ni40IDQ0LjF2MTU5bDc2LjQgNDQuMXpNODEuNSA0MzkuNWwyMDguOSAxMTguMnYtOTJsLTEzMC4yLTcxLjYtNzguNyA0NS40em0tMTQuMy0xMi45VjE3OS40bDc2LjQgNDQuMXYxNTlsLTc2LjQgNDQuMXptOC45LTI2My4yTDI5MC40IDQyLjJ2ODlsLTEzNy4zIDc1LjUtMS4xLjYtNzUuOS00My45em00NDYuOSAwTDMwOC44IDQyLjJ2ODlMNDQ2IDIwNi44bDEuMS42IDc1LjktNDR6Ii8+PHBhdGggZmlsbD0iIzFDNzhDMCIgZD0iTTI5MC40IDQ0NC44TDE2MiAzNzQuMVYyMzQuMmwxMjguNCA3NC4xdjEzNi41em0xOC40IDBsMTI4LjQtNzAuNnYtMTQwbC0xMjguNCA3NC4xdjEzNi41ek0yOTkuNiAzMDN6bS0xMjktODVsMTI5LTcwLjlMNDI4LjUgMjE4bC0xMjguOSA3NC40LTEyOS03NC40eiIvPjwvc3ZnPg==)");

test/configCases/asset-modules/bytes/test.config.js

@@ -14,5 +14,15 @@ module.exports = {
 		scope.window.document.head.appendChild(link);
 
 		run++;
+	},
+	findBundle(i) {
+		if (i === 2) {
+			return ["bundle2.mjs"];
+		}
+
+		return [
+			`file_text_other.bundle${i}.${i === 2 ? "mjs" : "js"}`,
+			`bundle${i}.${i === 2 ? "mjs" : "js"}`
+		];
 	}
 };

test/configCases/context-modules/import-attributes/files/file.ext

@@ -0,0 +1,3 @@
+{
+	"foo": "bar"
+}

test/configCases/context-modules/import-attributes/index.js

@@ -0,0 +1,12 @@
+it("show override request", async () => {
+	const decoder = new TextDecoder('utf-8');
+	const mod = "file.ext";
+	const loadedMod = (await import(`./files/${mod}`, { with: { type: "bytes" } })).default;
+	const text = decoder.decode(loadedMod);
+
+	expect(JSON.parse(text)).toEqual({ foo: "bar" });
+
+	const otherLoadedMod = (await import(`./files/${mod}`, { with: { type: "json" } })).default;
+
+	expect(otherLoadedMod.foo).toBe("bar");
+});

test/configCases/context-modules/import-attributes/test.filter.js

@@ -0,0 +1,5 @@
+"use strict";
+
+const supportsTextDecoder = require("../../../helpers/supportsTextDecoder");
+
+module.exports = () => supportsTextDecoder();

test/configCases/context-modules/import-attributes/webpack.config.js

@@ -0,0 +1,4 @@
+"use strict";
+
+/** @type {import("../../../../").Configuration} */
+module.exports = {};

test/configCases/library/0-create-library/commonjs.js

@@ -0,0 +1,12 @@
+const a = 10;
+const b = 20;
+
+class MyClass {
+	getValue() {
+		return "my-class";
+	}
+}
+
+module.exports = MyClass;
+module.exports.a = a;
+module.exports.b = b;

test/configCases/library/0-create-library/esm.js

@@ -0,0 +1,11 @@
+const a = 10;
+const b = 20;
+
+class MyClass {
+	getValue() {
+		return "my-class";
+	}
+}
+
+export default MyClass;
+export { a, b };

test/configCases/library/0-create-library/webpack.config.js

@@ -914,5 +914,25 @@ module.exports = (env, { testPath }) => [
 		experiments: {
 			outputModule: true
 		}
+	},
+	{
+		entry: "./esm.js",
+		output: {
+			uniqueName: "system-esm",
+			filename: "system-esm.js",
+			library: {
+				type: "system"
+			}
+		}
+	},
+	{
+		entry: "./commonjs.js",
+		output: {
+			uniqueName: "system-commonjs",
+			filename: "system-commonjs.js",
+			library: {
+				type: "system"
+			}
+		}
 	}
 ];

test/configCases/library/1-systemjs-external-commonjs/system-external-commonjs.js

@@ -0,0 +1,7 @@
+import MyClass, {a, b} from "library-commonjs";
+
+it("should get exports from systemjs library (" + NAME + ")", function() {
+	expect(new MyClass().getValue()).toBe("my-class")
+	expect(a).toBe(10);
+	expect(b).toBe(20);
+});

test/configCases/library/1-systemjs-external-commonjs/test.config.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const System = require("../../../helpers/fakeSystem");
+
+module.exports = {
+	beforeExecute: () => {
+		System.init();
+	},
+	moduleScope(scope) {
+		scope.System = System;
+		scope.System.setRequire(scope.require);
+	},
+	afterExecute() {
+		delete global.webpackChunk;
+		System.execute("(anonym)");
+	}
+};

test/configCases/library/1-systemjs-external-commonjs/webpack.config.js

@@ -0,0 +1,27 @@
+"use strict";
+
+const path = require("path");
+const webpack = require("../../../../");
+
+/** @type {(env: Env, options: TestOptions) => import("../../../../").Configuration[]} */
+module.exports = (env, { testPath }) => [
+	{
+		entry: "./system-external-commonjs.js",
+		output: {
+			library: {
+				type: "system"
+			}
+		},
+		externals: {
+			"library-commonjs": path.resolve(
+				testPath,
+				"../0-create-library/system-commonjs.js"
+			)
+		},
+		plugins: [
+			new webpack.DefinePlugin({
+				NAME: JSON.stringify("systemjs with external from commonjs format")
+			})
+		]
+	}
+];

test/configCases/library/1-systemjs-external-esm/system-external-esm.js

@@ -0,0 +1,7 @@
+import MyClass, {a, b} from "library-esm";
+
+it("should get exports from systemjs library (" + NAME + ")", function() {
+	expect(new MyClass().getValue()).toBe("my-class")
+	expect(a).toBe(10);
+	expect(b).toBe(20);
+});

test/configCases/library/1-systemjs-external-esm/test.config.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const System = require("../../../helpers/fakeSystem");
+
+module.exports = {
+	beforeExecute: () => {
+		System.init();
+	},
+	moduleScope(scope) {
+		scope.System = System;
+		scope.System.setRequire(scope.require);
+	},
+	afterExecute() {
+		delete global.webpackChunk;
+		System.execute("(anonym)");
+	}
+};

test/configCases/library/1-systemjs-external-esm/webpack.config.js

@@ -0,0 +1,24 @@
+"use strict";
+
+const path = require("path");
+const webpack = require("../../../../");
+
+/** @type {(env: Env, options: TestOptions) => import("../../../../").Configuration[]} */
+module.exports = (env, { testPath }) => [
+	{
+		entry: "./system-external-esm.js",
+		output: {
+			library: {
+				type: "system"
+			}
+		},
+		externals: {
+			"library-esm": path.resolve(testPath, "../0-create-library/system-esm.js")
+		},
+		plugins: [
+			new webpack.DefinePlugin({
+				NAME: JSON.stringify("systemjs with external from ES module format")
+			})
+		]
+	}
+];