fix: polyfill instancing bug (#220)

guybedford · Nov 5, 2021 · 77020fd · 77020fd
1 parent 1fc26eb
commit 77020fd
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 4 deletions.
diff --git a/src/es-module-shims.js b/src/es-module-shims.js
@@ -133,7 +133,7 @@ async function topLevelLoad (url, fetchOpts, source, nativelyLoaded, lastStaticL
     if (revokeBlobURLs) revokeObjectURLs(Object.keys(seen));
     return module;
   }
-  const module = await dynamicImport((shimMode || load.n) ? load.b : load.u, { errUrl: load.u });
+  const module = await dynamicImport(!shimMode && !load.n && nativelyLoaded ? load.u : load.b, { errUrl: load.u });
   // if the top-level load is a shell, run its update function
   if (load.s)
     (await dynamicImport(load.s)).u$_(module);

diff --git a/test/fixtures/instance-case-a.js b/test/fixtures/instance-case-a.js
@@ -0,0 +1,3 @@
+import { common } from "./instance-case-common.js";
+
+window.common_a = common;
diff --git a/test/fixtures/instance-case-b.js b/test/fixtures/instance-case-b.js
@@ -0,0 +1,3 @@
+import { common } from "./instance-case-common.js";
+
+window.common_b = common;
diff --git a/test/fixtures/instance-case-common.js b/test/fixtures/instance-case-common.js
@@ -0,0 +1 @@
+export const common = {};
diff --git a/test/fixtures/instance-case.js b/test/fixtures/instance-case.js
@@ -0,0 +1,8 @@
+import 'a';
+
+const bPromise = import('b');
+
+export async function check () {
+  await bPromise;
+  return window.common_a === window.common_b;
+}
diff --git a/test/polyfill.js b/test/polyfill.js
@@ -39,4 +39,10 @@ suite('Polyfill tests', () => {
   test('import maps passthrough polyfill mode', async function () {
     await importShim('test');
   });
+
+  test('Shared instances', async function () {
+    const { check } = await importShim('./fixtures/instance-case.js');
+    const result = await check();
+    assert.equal(result, true);
+  });
 });
diff --git a/test/test-csp.html b/test/test-csp.html
@@ -10,7 +10,9 @@
     "test/": "/test/fixtures/",
     "global1": "/test/fixtures/es-modules/global1.js",
     "/test/fixtures/es-modules/dynamic.js": "/test/fixtures/es-modules/dynamic-url-map.js",
-    "data": "data:text/javascript,"
+    "data": "data:text/javascript,",
+    "a": "/test/fixtures/instance-case-a.js",
+    "b": "/test/fixtures/instance-case-b.js"
   }
 }
 </script>

diff --git a/test/test-polyfill-wasm.html b/test/test-polyfill-wasm.html
@@ -8,7 +8,9 @@
     "test": "/test/fixtures/es-modules/es6-file.js",
     "test/": "/test/fixtures/",
     "global1": "/test/fixtures/es-modules/global1.js",
-    "/test/fixtures/es-modules/dynamic.js": "/test/fixtures/es-modules/dynamic-url-map.js"
+    "/test/fixtures/es-modules/dynamic.js": "/test/fixtures/es-modules/dynamic-url-map.js",
+    "a": "/test/fixtures/instance-case-a.js",
+    "b": "/test/fixtures/instance-case-b.js"
   }
 }
 </script>

diff --git a/test/test-polyfill.html b/test/test-polyfill.html
@@ -8,7 +8,9 @@
     "test": "/test/fixtures/es-modules/es6-file.js",
     "test/": "/test/fixtures/",
     "global1": "/test/fixtures/es-modules/global1.js",
-    "/test/fixtures/es-modules/dynamic.js": "/test/fixtures/es-modules/dynamic-url-map.js"
+    "/test/fixtures/es-modules/dynamic.js": "/test/fixtures/es-modules/dynamic-url-map.js",
+    "a": "/test/fixtures/instance-case-a.js",
+    "b": "/test/fixtures/instance-case-b.js"
   }
 }
 </script>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { common } from "./instance-case-common.js";

		window.common_a = common;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { common } from "./instance-case-common.js";

		window.common_b = common;