Merge pull request #14782 from tanhauhau/tanhauhau/show-which-contain…

…er-loaded-singleton-version feat: show which singleton loaded version
webpack · Nov 25, 2021 · ac9a2c8 · ac9a2c8
2 parents 68c4a2a + ce0f0b3
commit ac9a2c8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/lib/sharing/ConsumeSharedRuntimeModule.js b/lib/sharing/ConsumeSharedRuntimeModule.js
@@ -103,17 +103,17 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				]
 			)};`,
 			`var getInvalidSingletonVersionMessage = ${runtimeTemplate.basicFunction(
-				"key, version, requiredVersion",
+				"scope, key, version, requiredVersion",
 				[
-					`return "Unsatisfied version " + version + " of shared singleton module " + key + " (required " + rangeToString(requiredVersion) + ")"`
+					`return "Unsatisfied version " + version + " from " + (version && scope[key][version].from) + " of shared singleton module " + key + " (required " + rangeToString(requiredVersion) + ")"`
 				]
 			)};`,
 			`var getSingletonVersion = ${runtimeTemplate.basicFunction(
 				"scope, scopeName, key, requiredVersion",
 				[
 					"var version = findSingletonVersionKey(scope, key);",
 					"if (!satisfy(requiredVersion, version)) " +
-						'typeof console !== "undefined" && console.warn && console.warn(getInvalidSingletonVersionMessage(key, version, requiredVersion));',
+						'typeof console !== "undefined" && console.warn && console.warn(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));',
 					"return get(scope[key][version]);"
 				]
 			)};`,
@@ -122,7 +122,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				[
 					"var version = findSingletonVersionKey(scope, key);",
 					"if (!satisfy(requiredVersion, version)) " +
-						"throw new Error(getInvalidSingletonVersionMessage(key, version, requiredVersion));",
+						"throw new Error(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));",
 					"return get(scope[key][version]);"
 				]
 			)};`,

diff --git a/test/configCases/container/1-container-full/webpack.config.js b/test/configCases/container/1-container-full/webpack.config.js
@@ -7,7 +7,8 @@ module.exports = {
 		bundle0: "./index.js"
 	},
 	output: {
-		filename: "[name].js"
+		filename: "[name].js",
+		uniqueName: "1-container-full"
 	},
 	plugins: [
 		new ModuleFederationPlugin({

diff --git a/test/configCases/container/2-container-full/index.js b/test/configCases/container/2-container-full/index.js
@@ -30,7 +30,7 @@ const expectWarning = regexp => {
 it("should load the component from container", () => {
 	return import("./App").then(({ default: App }) => {
 		expectWarning(
-			/Unsatisfied version 8 of shared singleton module react \(required \^2\)/
+			/Unsatisfied version 8 from 2-container-full of shared singleton module react \(required \^2\)/
 		);
 		const rendered = App();
 		expect(rendered).toBe(

diff --git a/test/configCases/container/2-container-full/webpack.config.js b/test/configCases/container/2-container-full/webpack.config.js
@@ -3,6 +3,9 @@ const { ModuleFederationPlugin } = require("../../../../").container;
 
 /** @type {import("../../../../").Configuration} */
 module.exports = {
+	output: {
+		uniqueName: "2-container-full"
+	},
 	plugins: [
 		new ModuleFederationPlugin({
 			name: "main",

diff --git a/test/configCases/sharing/consume-module/index.js b/test/configCases/sharing/consume-module/index.js
@@ -193,7 +193,8 @@ it("should handle version matching correctly in strict and singleton mode", asyn
 		},
 		singleton: {
 			"1.1.1": {
-				get: () => () => "shared singleton"
+				get: () => () => "shared singleton",
+				from: 'container-a'
 			}
 		}
 	};
@@ -230,7 +231,7 @@ it("should handle version matching correctly in strict and singleton mode", asyn
 		const result = await import("singleton");
 		expect(result.default).toBe("shared singleton");
 		expectWarning(
-			/Unsatisfied version 1\.1\.1 of shared singleton module singleton \(required =1\.1\.0\)/
+			/Unsatisfied version 1\.1\.1 from container-a of shared singleton module singleton \(required =1\.1\.0\)/
 		);
 	}
 });