Added testing for new singleton logic (and caught a typo in the process!)

colacadstink · colacadstink · commit bbe72b3eae52 · 2021-12-02T11:44:23.000-05:00
diff --git a/lib/sharing/ConsumeSharedRuntimeModule.js b/lib/sharing/ConsumeSharedRuntimeModule.js
@@ -248,7 +248,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				"scopeName, scope, key, fallback",
 				[
 					`if(!scope || !${RuntimeGlobals.hasOwnProperty}(scope, key)) return fallback();`,
-					"return getSingletonVersion(scope, scopeName, key);"
+					"return getSingleton(scope, scopeName, key);"
 				]
 			)});`,
 			`var loadSingletonVersionCheckFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
diff --git a/test/configCases/sharing/consume-module/index.js b/test/configCases/sharing/consume-module/index.js
@@ -196,6 +196,15 @@ it("should handle version matching correctly in strict and singleton mode", asyn
 				get: () => () => "shared singleton",
 				from: 'container-a'
 			}
+		},
+		singletonWithoutVersion: {
+			"1.0.0": {
+				get: () => () => "shared singleton v1.0.0",
+				loaded: true
+			},
+			"2.0.0": {
+				get: () => () => "shared singleton v2.0.0"
+			}
 		}
 	};
 	{
@@ -235,3 +244,21 @@ it("should handle version matching correctly in strict and singleton mode", asyn
 		);
 	}
 });
+
+it("should not instantiate multiple singletons even if a higher version exists", async () => {
+	__webpack_share_scopes__["default"] = {
+		singletonWithoutVersion: {
+			"1.0.0": {
+				get: () => () => "shared singleton v1.0.0",
+				loaded: true
+			},
+			"2.0.0": {
+				get: () => () => "shared singleton v2.0.0"
+			}
+		}
+	};
+	{
+		const result = await import("singletonWithoutVersion");
+		expect(result.default).toBe("shared singleton v1.0.0");
+	}
+});
diff --git a/test/configCases/sharing/consume-module/node_modules/singletonWithoutVersion.js b/test/configCases/sharing/consume-module/node_modules/singletonWithoutVersion.js
diff --git a/test/configCases/sharing/consume-module/webpack.config.js b/test/configCases/sharing/consume-module/webpack.config.js
@@ -54,6 +54,10 @@ module.exports = {
 					requiredVersion: "1.1.0",
 					singleton: true,
 					strictVersion: false
+				},
+				singletonWithoutVersion: {
+					requiredVersion: false,
+					singleton: true
 				}
 			}
 		})

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {`
`248`	`248`	`"scopeName, scope, key, fallback",`
`249`	`249`	`[`
`250`	`250`	`if(!scope \|\| !${RuntimeGlobals.hasOwnProperty}(scope, key)) return fallback();`,
`251`		`- "return getSingletonVersion(scope, scopeName, key);"`
	`251`	`+ "return getSingleton(scope, scopeName, key);"`
`252`	`252`	`]`
`253`	`253`	)});`,
`254`	`254`	`var loadSingletonVersionCheckFallback = /#__PURE__/ init(${runtimeTemplate.basicFunction(
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ module.exports = {`
`54`	`54`	`requiredVersion: "1.1.0",`
`55`	`55`	`singleton: true,`
`56`	`56`	`strictVersion: false`
	`57`	`+ },`
	`58`	`+ singletonWithoutVersion: {`
	`59`	`+ requiredVersion: false,`
	`60`	`+ singleton: true`
`57`	`61`	`}`
`58`	`62`	`}`
`59`	`63`	`})`