es-module-shims 2.3.1 → 2.4.1

package/README.md

@@ -30,7 +30,7 @@ Because we are still using the native module loader the edge cases work out comp
 Include ES Module Shims with a `async` attribute on the script, then include an import map and module scripts normally:
 
 ```html
-<script async src="https://ga.jspm.io/npm:es-module-shims@2.3.1/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@2.4.1/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">
@@ -701,6 +701,7 @@ Provide a `esmsInitOptions` on the global scope before `es-module-shims` is load
 * [revokeBlobURLs](#revoke-blob-urls)
 * [shimMode](#shim-mode-option)
 * [skip](#skip)
+* [version](#version)
 
 ```html
 <script>
@@ -739,6 +740,8 @@ window.esmsInitOptions = {
   meta: (meta, url) => void // default is noop
   // Hook top-level imports
   onimport: (url, options, parentUrl, source) => void // default is noop
+  // Ensure only the exact provided version of es-module-shims registered
+  version: '2.4.0' // default is empty
 }
 </script>
 <script async src="es-module-shims.js"></script>
@@ -888,6 +891,14 @@ When passing an array, relative URLs or paths ending in `/` can be provided:
 <script async src="es-module-shims.js"></script>
 ```
 
+### Version
+
+When there is a risk of multiple versions of ES Module Shims on the same page, deconflicting is managed by logic that will opt-out of initializing ES Module Shims if it has already been initialized. In addition, ES Module Shims itself is frozen and locked from further mutations.
+
+To better support cooporative multi-version cases, as of version 2.4.0, we support a `version` option, which when set will skip initialization if the current version of ES Module Shims does not match this exact expected version.
+
+This way, any other old versions after version 2.4.0 running on the page can effectively be turned off, ensuring only the defined version of the polyfill initiates the polyfill.
+
 ### Revoke Blob URLs
 
 When polyfilling the missing features `es-module-shims` would create in-memory blobs using `URL.createObjectURL()` for each processed module.

package/dist/es-module-shims.debug.js

@@ -1,4 +1,4 @@
-/** ES Module Shims 2.3.1 */
+/** ES Module Shims @version 2.4.1 */
 (function (exports) {
 
   let invalidate;
@@ -162,13 +162,6 @@
     ];
   };
 
-  if (self.importShim) {
-    console.info(
-        `es-module-shims: skipping initialization as importShim was already registered by another polyfill instance`
-      );
-    return;
-  }
-
   const hasDocument = typeof document !== 'undefined';
 
   const noop = () => {};
@@ -181,11 +174,24 @@
 
   const dynamicImport = (u, errUrl) => import(u);
 
+  const defineValue = (obj, prop, value) =>
+    Object.defineProperty(obj, prop, { writable: false, configurable: false, value });
+
   const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
   Object.assign(esmsInitOptions, self.esmsInitOptions || {});
 
+  const version = "2.4.1";
+
+  const r$1 = esmsInitOptions.version;
+  if (self.importShim || (r$1 && r$1 !== version)) {
+    console.info(
+        `es-module-shims: skipping initialization as ${r$1 ? `configured for ${r$1}` : 'another instance has already registered'}`
+      );
+    return;
+  }
+
   // shim mode is determined on initialization, no late shim mode
   const shimMode =
     esmsInitOptions.shimMode ||
@@ -379,9 +385,9 @@
 
   const resolveAndComposeImportMap = (json, baseUrl, parentMap) => {
     const outMap = {
-      imports: Object.assign({}, parentMap.imports),
-      scopes: Object.assign({}, parentMap.scopes),
-      integrity: Object.assign({}, parentMap.integrity)
+      imports: { ...parentMap.imports },
+      scopes: { ...parentMap.scopes },
+      integrity: { ...parentMap.integrity }
     };
 
     if (json.imports) resolveAndComposePackages(json.imports, outMap.imports, baseUrl, parentMap);
@@ -470,120 +476,121 @@
     }
   };
 
-  // support browsers without dynamic import support (eg Firefox 6x)
-  let supportsJsonType = false;
-  let supportsCssType = false;
-
-  const supports = hasDocument && HTMLScriptElement.supports;
-
-  let supportsImportMaps = supports && supports.name === 'supports' && supports('importmap');
-  let supportsWasmInstancePhase = false;
-  let supportsWasmSourcePhase = false;
-  let supportsMultipleImportMaps = false;
-
-  const wasmBytes = [0, 97, 115, 109, 1, 0, 0, 0];
-
-  let featureDetectionPromise = (async function () {
-    if (!hasDocument)
-      return Promise.all([
-        import(createBlob(`import"${createBlob('{}', 'text/json')}"with{type:"json"}`)).then(
-          () => (
-            (supportsJsonType = true),
-            import(createBlob(`import"${createBlob('', 'text/css')}"with{type:"css"}`)).then(
-              () => (supportsCssType = true),
-              noop
-            )
-          ),
-          noop
-        ),
-        wasmInstancePhaseEnabled &&
-          import(createBlob(`import"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
-            () => (supportsWasmInstancePhase = true),
-            noop
-          ),
-        wasmSourcePhaseEnabled &&
-          import(createBlob(`import source x from"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
-            () => (supportsWasmSourcePhase = true),
-            noop
-          )
-      ]);
-
-    return new Promise(resolve => {
-      const iframe = document.createElement('iframe');
-      iframe.style.display = 'none';
-      iframe.setAttribute('nonce', nonce);
-      function cb({ data }) {
-        const isFeatureDetectionMessage = Array.isArray(data) && data[0] === 'esms';
-        if (!isFeatureDetectionMessage) return;
-        [
-          ,
-          supportsImportMaps,
-          supportsMultipleImportMaps,
-          supportsJsonType,
-          supportsCssType,
-          supportsWasmSourcePhase,
-          supportsWasmInstancePhase
-        ] = data;
-        resolve();
-        document.head.removeChild(iframe);
-        window.removeEventListener('message', cb, false);
-      }
-      window.addEventListener('message', cb, false);
-
-      // Feature checking with careful avoidance of unnecessary work - all gated on initial import map supports check. CSS gates on JSON feature check, Wasm instance phase gates on wasm source phase check.
-      const importMapTest = `<script nonce=${nonce || ''}>b=(s,type='text/javascript')=>URL.createObjectURL(new Blob([s],{type}));c=u=>import(u).then(()=>true,()=>false);i=innerText=>document.head.appendChild(Object.assign(document.createElement('script'),{type:'importmap',nonce:"${nonce}",innerText}));i(\`{"imports":{"x":"\${b('')}"}}\`);i(\`{"imports":{"y":"\${b('')}"}}\`);cm=${
-      supportsImportMaps ? `c(b(\`import"\${b('{}','text/json')}"with{type:"json"}\`))` : 'false'
-    };sp=${
-      supportsImportMaps && wasmSourcePhaseEnabled ?
-        `c(b(\`import source x from "\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))`
-      : 'false'
-    };Promise.all([${supportsImportMaps ? 'true' : "c('x')"},${supportsImportMaps ? "c('y')" : false},cm,${
-      supportsImportMaps ? `cm.then(s=>s?c(b(\`import"\${b('','text/css')\}"with{type:"css"}\`)):false)` : 'false'
-    },sp,${
-      supportsImportMaps && wasmInstancePhaseEnabled ?
-        `${wasmSourcePhaseEnabled ? 'sp.then(s=>s?' : ''}c(b(\`import"\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))${wasmSourcePhaseEnabled ? ':false)' : ''}`
-      : 'false'
-    }]).then(a=>parent.postMessage(['esms'].concat(a),'*'))<${''}/script>`;
-
-      // Safari will call onload eagerly on head injection, but we don't want the Wechat
-      // path to trigger before setting srcdoc, therefore we track the timing
-      let readyForOnload = false,
-        onloadCalledWhileNotReady = false;
-      function doOnload() {
-        if (!readyForOnload) {
-          onloadCalledWhileNotReady = true;
-          return;
-        }
-        // WeChat browser doesn't support setting srcdoc scripts
-        // But iframe sandboxes don't support contentDocument so we do this as a fallback
-        const doc = iframe.contentDocument;
-        if (doc && doc.head.childNodes.length === 0) {
-          const s = doc.createElement('script');
-          if (nonce) s.setAttribute('nonce', nonce);
-          s.innerHTML = importMapTest.slice(15 + (nonce ? nonce.length : 0), -9);
-          doc.head.appendChild(s);
-        }
-      }
-
-      iframe.onload = doOnload;
-      // WeChat browser requires append before setting srcdoc
-      document.head.appendChild(iframe);
-
-      // setting srcdoc is not supported in React native webviews on iOS
-      // setting src to a blob URL results in a navigation event in webviews
-      // document.write gives usability warnings
-      readyForOnload = true;
-      if ('srcdoc' in iframe) iframe.srcdoc = importMapTest;
-      else iframe.contentDocument.write(importMapTest);
-      // retrigger onload for Safari only if necessary
-      if (onloadCalledWhileNotReady) doOnload();
-    });
-  })();
-
-  featureDetectionPromise = featureDetectionPromise.then(() => {
-      console.info(
-        `es-module-shims: detected native support - module types: (${[...(supportsJsonType ? ['json'] : []), ...(supportsCssType ? ['css'] : []), ...(supportsWasmInstancePhase ? ['wasm'] : [])].join(', ')}), ${supportsWasmSourcePhase ? 'source phase' : 'no source phase'}, ${supportsMultipleImportMaps ? '' : 'no '}multiple import maps, ${supportsImportMaps ? '' : 'no '}import maps`
-      );
+  // support browsers without dynamic import support (eg Firefox 6x)
+  let supportsJsonType = false;
+  let supportsCssType = false;
+
+  const supports = hasDocument && HTMLScriptElement.supports;
+
+  let supportsImportMaps = supports && supports.name === 'supports' && supports('importmap');
+  let supportsWasmInstancePhase = false;
+  let supportsWasmSourcePhase = false;
+  let supportsMultipleImportMaps = false;
+
+  const wasmBytes = [0, 97, 115, 109, 1, 0, 0, 0];
+
+  let featureDetectionPromise = (async function () {
+    if (!hasDocument)
+      return Promise.all([
+        import(createBlob(`import"${createBlob('{}', 'text/json')}"with{type:"json"}`)).then(
+          () => (
+            (supportsJsonType = true),
+            import(createBlob(`import"${createBlob('', 'text/css')}"with{type:"css"}`)).then(
+              () => (supportsCssType = true),
+              noop
+            )
+          ),
+          noop
+        ),
+        wasmInstancePhaseEnabled &&
+          import(createBlob(`import"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
+            () => (supportsWasmInstancePhase = true),
+            noop
+          ),
+        wasmSourcePhaseEnabled &&
+          import(createBlob(`import source x from"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
+            () => (supportsWasmSourcePhase = true),
+            noop
+          )
+      ]);
+
+    const msgTag = `s${version}`;
+    return new Promise(resolve => {
+      const iframe = document.createElement('iframe');
+      iframe.style.display = 'none';
+      iframe.setAttribute('nonce', nonce);
+      function cb({ data }) {
+        const isFeatureDetectionMessage = Array.isArray(data) && data[0] === msgTag;
+        if (!isFeatureDetectionMessage) return;
+        [
+          ,
+          supportsImportMaps,
+          supportsMultipleImportMaps,
+          supportsJsonType,
+          supportsCssType,
+          supportsWasmSourcePhase,
+          supportsWasmInstancePhase
+        ] = data;
+        resolve();
+        document.head.removeChild(iframe);
+        window.removeEventListener('message', cb, false);
+      }
+      window.addEventListener('message', cb, false);
+
+      // Feature checking with careful avoidance of unnecessary work - all gated on initial import map supports check. CSS gates on JSON feature check, Wasm instance phase gates on wasm source phase check.
+      const importMapTest = `<script nonce=${nonce || ''}>b=(s,type='text/javascript')=>URL.createObjectURL(new Blob([s],{type}));c=u=>import(u).then(()=>true,()=>false);i=innerText=>document.head.appendChild(Object.assign(document.createElement('script'),{type:'importmap',nonce:"${nonce}",innerText}));i(\`{"imports":{"x":"\${b('')}"}}\`);i(\`{"imports":{"y":"\${b('')}"}}\`);cm=${
+      supportsImportMaps ? `c(b(\`import"\${b('{}','text/json')}"with{type:"json"}\`))` : 'false'
+    };sp=${
+      supportsImportMaps && wasmSourcePhaseEnabled ?
+        `c(b(\`import source x from "\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))`
+      : 'false'
+    };Promise.all([${supportsImportMaps ? 'true' : "c('x')"},${supportsImportMaps ? "c('y')" : false},cm,${
+      supportsImportMaps ? `cm.then(s=>s?c(b(\`import"\${b('','text/css')\}"with{type:"css"}\`)):false)` : 'false'
+    },sp,${
+      supportsImportMaps && wasmInstancePhaseEnabled ?
+        `${wasmSourcePhaseEnabled ? 'sp.then(s=>s?' : ''}c(b(\`import"\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))${wasmSourcePhaseEnabled ? ':false)' : ''}`
+      : 'false'
+    }]).then(a=>parent.postMessage(['${msgTag}'].concat(a),'*'))<${''}/script>`;
+
+      // Safari will call onload eagerly on head injection, but we don't want the Wechat
+      // path to trigger before setting srcdoc, therefore we track the timing
+      let readyForOnload = false,
+        onloadCalledWhileNotReady = false;
+      function doOnload() {
+        if (!readyForOnload) {
+          onloadCalledWhileNotReady = true;
+          return;
+        }
+        // WeChat browser doesn't support setting srcdoc scripts
+        // But iframe sandboxes don't support contentDocument so we do this as a fallback
+        const doc = iframe.contentDocument;
+        if (doc && doc.head.childNodes.length === 0) {
+          const s = doc.createElement('script');
+          if (nonce) s.setAttribute('nonce', nonce);
+          s.innerHTML = importMapTest.slice(15 + (nonce ? nonce.length : 0), -9);
+          doc.head.appendChild(s);
+        }
+      }
+
+      iframe.onload = doOnload;
+      // WeChat browser requires append before setting srcdoc
+      document.head.appendChild(iframe);
+
+      // setting srcdoc is not supported in React native webviews on iOS
+      // setting src to a blob URL results in a navigation event in webviews
+      // document.write gives usability warnings
+      readyForOnload = true;
+      if ('srcdoc' in iframe) iframe.srcdoc = importMapTest;
+      else iframe.contentDocument.write(importMapTest);
+      // retrigger onload for Safari only if necessary
+      if (onloadCalledWhileNotReady) doOnload();
+    });
+  })();
+
+  featureDetectionPromise = featureDetectionPromise.then(() => {
+      console.info(
+        `es-module-shims: detected native support - module types: (${[...(supportsJsonType ? ['json'] : []), ...(supportsCssType ? ['css'] : []), ...(supportsWasmInstancePhase ? ['wasm'] : [])].join(', ')}), ${supportsWasmSourcePhase ? 'source phase' : 'no source phase'}, ${supportsMultipleImportMaps ? '' : 'no '}multiple import maps, ${supportsImportMaps ? '' : 'no '}import maps`
+      );
     });
 
   /* es-module-lexer 1.7.0 */
@@ -673,8 +680,6 @@
 
   if (hotReload) importShim$1.hotReload = hotReload$1;
 
-  self.importShim = importShim$1;
-
   const defaultResolve = (id, parentUrl) => {
     return (
       resolveImportMap(composedImportMap, resolveIfNotPlainOrUrl(id, parentUrl) || id, parentUrl) ||
@@ -696,12 +701,19 @@
     if (!shimMode) throw new Error('Unsupported in polyfill mode.');
     composedImportMap = resolveAndComposeImportMap(importMapIn, baseUrl, composedImportMap);
   };
+  importShim$1.version = version;
 
   const registry = (importShim$1._r = {});
   // Wasm caches
   const sourceCache = (importShim$1._s = {});
   (importShim$1._i = new WeakMap());
 
+  // Ensure this version is the only version
+  defineValue(self, 'importShim', Object.freeze(importShim$1));
+  const shimModeOptions = { ...esmsInitOptions, shimMode: true };
+  if (optionsScript) optionsScript.innerHTML = JSON.stringify(shimModeOptions);
+  self.esmsInitOptions = shimModeOptions;
+
   const loadAll = async (load, seen) => {
     seen[load.u] = 1;
     await load.L;
@@ -735,8 +747,7 @@
     if (!shimMode && typeof WebAssembly !== 'undefined') {
       if (wasmSourcePhaseEnabled && !Object.getPrototypeOf(WebAssembly.Module).name) {
         const s = Symbol();
-        const brand = m =>
-          Object.defineProperty(m, s, { writable: false, configurable: false, value: 'WebAssembly.Module' });
+        const brand = m => defineValue(m, s, 'WebAssembly.Module');
         class AbstractModuleSource {
           get [Symbol.toStringTag]() {
             if (this[s]) return this[s];
@@ -1098,7 +1109,7 @@
     const mapIntegrity = composedImportMap.integrity[url];
     const res = await doFetch(
       url,
-      mapIntegrity && !fetchOpts.integrity ? Object.assign({}, fetchOpts, { integrity: mapIntegrity }) : fetchOpts,
+      mapIntegrity && !fetchOpts.integrity ? { ...fetchOpts, integrity: mapIntegrity } : fetchOpts,
       parent
     );
     const r = res.url;
@@ -1253,7 +1264,7 @@
           if (d >= 0 || resolved.N) load.N = true;
           if (d !== -1) return;
           if (skip && skip(resolved.r) && !sourcePhase) return { l: { b: resolved.r }, s: false };
-          if (childFetchOpts.integrity) childFetchOpts = Object.assign({}, childFetchOpts, { integrity: undefined });
+          if (childFetchOpts.integrity) childFetchOpts = { ...childFetchOpts, integrity: undefined };
           const child = { l: getOrCreateLoad(resolved.r, childFetchOpts, load.r, source), s: sourcePhase };
           // assertion case -> inline the CSS / JSON URL directly
           if (source === '') child.l.b = child.l.u;

package/dist/es-module-shims.js

@@ -1,4 +1,4 @@
-/** ES Module Shims 2.3.1 */
+/** ES Module Shims @version 2.4.1 */
 (function (exports) {
 
   let invalidate;
@@ -161,10 +161,6 @@
     ];
   };
 
-  if (self.importShim) {
-    return;
-  }
-
   const hasDocument = typeof document !== 'undefined';
 
   const noop = () => {};
@@ -177,11 +173,21 @@
 
   const dynamicImport = (u, errUrl) => import(u);
 
+  const defineValue = (obj, prop, value) =>
+    Object.defineProperty(obj, prop, { writable: false, configurable: false, value });
+
   const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
   Object.assign(esmsInitOptions, self.esmsInitOptions || {});
 
+  const version = "2.4.1";
+
+  const r$1 = esmsInitOptions.version;
+  if (self.importShim || (r$1 && r$1 !== version)) {
+    return;
+  }
+
   // shim mode is determined on initialization, no late shim mode
   const shimMode =
     esmsInitOptions.shimMode ||
@@ -375,9 +381,9 @@
 
   const resolveAndComposeImportMap = (json, baseUrl, parentMap) => {
     const outMap = {
-      imports: Object.assign({}, parentMap.imports),
-      scopes: Object.assign({}, parentMap.scopes),
-      integrity: Object.assign({}, parentMap.integrity)
+      imports: { ...parentMap.imports },
+      scopes: { ...parentMap.scopes },
+      integrity: { ...parentMap.integrity }
     };
 
     if (json.imports) resolveAndComposePackages(json.imports, outMap.imports, baseUrl, parentMap);
@@ -466,114 +472,115 @@
     }
   };
 
-  // support browsers without dynamic import support (eg Firefox 6x)
-  let supportsJsonType = false;
-  let supportsCssType = false;
-
-  const supports = hasDocument && HTMLScriptElement.supports;
-
-  let supportsImportMaps = supports && supports.name === 'supports' && supports('importmap');
-  let supportsWasmInstancePhase = false;
-  let supportsWasmSourcePhase = false;
-  let supportsMultipleImportMaps = false;
-
-  const wasmBytes = [0, 97, 115, 109, 1, 0, 0, 0];
-
-  let featureDetectionPromise = (async function () {
-    if (!hasDocument)
-      return Promise.all([
-        import(createBlob(`import"${createBlob('{}', 'text/json')}"with{type:"json"}`)).then(
-          () => (
-            (supportsJsonType = true),
-            import(createBlob(`import"${createBlob('', 'text/css')}"with{type:"css"}`)).then(
-              () => (supportsCssType = true),
-              noop
-            )
-          ),
-          noop
-        ),
-        wasmInstancePhaseEnabled &&
-          import(createBlob(`import"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
-            () => (supportsWasmInstancePhase = true),
-            noop
-          ),
-        wasmSourcePhaseEnabled &&
-          import(createBlob(`import source x from"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
-            () => (supportsWasmSourcePhase = true),
-            noop
-          )
-      ]);
-
-    return new Promise(resolve => {
-      const iframe = document.createElement('iframe');
-      iframe.style.display = 'none';
-      iframe.setAttribute('nonce', nonce);
-      function cb({ data }) {
-        const isFeatureDetectionMessage = Array.isArray(data) && data[0] === 'esms';
-        if (!isFeatureDetectionMessage) return;
-        [
-          ,
-          supportsImportMaps,
-          supportsMultipleImportMaps,
-          supportsJsonType,
-          supportsCssType,
-          supportsWasmSourcePhase,
-          supportsWasmInstancePhase
-        ] = data;
-        resolve();
-        document.head.removeChild(iframe);
-        window.removeEventListener('message', cb, false);
-      }
-      window.addEventListener('message', cb, false);
-
-      // Feature checking with careful avoidance of unnecessary work - all gated on initial import map supports check. CSS gates on JSON feature check, Wasm instance phase gates on wasm source phase check.
-      const importMapTest = `<script nonce=${nonce || ''}>b=(s,type='text/javascript')=>URL.createObjectURL(new Blob([s],{type}));c=u=>import(u).then(()=>true,()=>false);i=innerText=>document.head.appendChild(Object.assign(document.createElement('script'),{type:'importmap',nonce:"${nonce}",innerText}));i(\`{"imports":{"x":"\${b('')}"}}\`);i(\`{"imports":{"y":"\${b('')}"}}\`);cm=${
-      supportsImportMaps ? `c(b(\`import"\${b('{}','text/json')}"with{type:"json"}\`))` : 'false'
-    };sp=${
-      supportsImportMaps && wasmSourcePhaseEnabled ?
-        `c(b(\`import source x from "\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))`
-      : 'false'
-    };Promise.all([${supportsImportMaps ? 'true' : "c('x')"},${supportsImportMaps ? "c('y')" : false},cm,${
-      supportsImportMaps ? `cm.then(s=>s?c(b(\`import"\${b('','text/css')\}"with{type:"css"}\`)):false)` : 'false'
-    },sp,${
-      supportsImportMaps && wasmInstancePhaseEnabled ?
-        `${wasmSourcePhaseEnabled ? 'sp.then(s=>s?' : ''}c(b(\`import"\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))${wasmSourcePhaseEnabled ? ':false)' : ''}`
-      : 'false'
-    }]).then(a=>parent.postMessage(['esms'].concat(a),'*'))<${''}/script>`;
-
-      // Safari will call onload eagerly on head injection, but we don't want the Wechat
-      // path to trigger before setting srcdoc, therefore we track the timing
-      let readyForOnload = false,
-        onloadCalledWhileNotReady = false;
-      function doOnload() {
-        if (!readyForOnload) {
-          onloadCalledWhileNotReady = true;
-          return;
-        }
-        // WeChat browser doesn't support setting srcdoc scripts
-        // But iframe sandboxes don't support contentDocument so we do this as a fallback
-        const doc = iframe.contentDocument;
-        if (doc && doc.head.childNodes.length === 0) {
-          const s = doc.createElement('script');
-          if (nonce) s.setAttribute('nonce', nonce);
-          s.innerHTML = importMapTest.slice(15 + (nonce ? nonce.length : 0), -9);
-          doc.head.appendChild(s);
-        }
-      }
-
-      iframe.onload = doOnload;
-      // WeChat browser requires append before setting srcdoc
-      document.head.appendChild(iframe);
-
-      // setting srcdoc is not supported in React native webviews on iOS
-      // setting src to a blob URL results in a navigation event in webviews
-      // document.write gives usability warnings
-      readyForOnload = true;
-      if ('srcdoc' in iframe) iframe.srcdoc = importMapTest;
-      else iframe.contentDocument.write(importMapTest);
-      // retrigger onload for Safari only if necessary
-      if (onloadCalledWhileNotReady) doOnload();
-    });
+  // support browsers without dynamic import support (eg Firefox 6x)
+  let supportsJsonType = false;
+  let supportsCssType = false;
+
+  const supports = hasDocument && HTMLScriptElement.supports;
+
+  let supportsImportMaps = supports && supports.name === 'supports' && supports('importmap');
+  let supportsWasmInstancePhase = false;
+  let supportsWasmSourcePhase = false;
+  let supportsMultipleImportMaps = false;
+
+  const wasmBytes = [0, 97, 115, 109, 1, 0, 0, 0];
+
+  let featureDetectionPromise = (async function () {
+    if (!hasDocument)
+      return Promise.all([
+        import(createBlob(`import"${createBlob('{}', 'text/json')}"with{type:"json"}`)).then(
+          () => (
+            (supportsJsonType = true),
+            import(createBlob(`import"${createBlob('', 'text/css')}"with{type:"css"}`)).then(
+              () => (supportsCssType = true),
+              noop
+            )
+          ),
+          noop
+        ),
+        wasmInstancePhaseEnabled &&
+          import(createBlob(`import"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
+            () => (supportsWasmInstancePhase = true),
+            noop
+          ),
+        wasmSourcePhaseEnabled &&
+          import(createBlob(`import source x from"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
+            () => (supportsWasmSourcePhase = true),
+            noop
+          )
+      ]);
+
+    const msgTag = `s${version}`;
+    return new Promise(resolve => {
+      const iframe = document.createElement('iframe');
+      iframe.style.display = 'none';
+      iframe.setAttribute('nonce', nonce);
+      function cb({ data }) {
+        const isFeatureDetectionMessage = Array.isArray(data) && data[0] === msgTag;
+        if (!isFeatureDetectionMessage) return;
+        [
+          ,
+          supportsImportMaps,
+          supportsMultipleImportMaps,
+          supportsJsonType,
+          supportsCssType,
+          supportsWasmSourcePhase,
+          supportsWasmInstancePhase
+        ] = data;
+        resolve();
+        document.head.removeChild(iframe);
+        window.removeEventListener('message', cb, false);
+      }
+      window.addEventListener('message', cb, false);
+
+      // Feature checking with careful avoidance of unnecessary work - all gated on initial import map supports check. CSS gates on JSON feature check, Wasm instance phase gates on wasm source phase check.
+      const importMapTest = `<script nonce=${nonce || ''}>b=(s,type='text/javascript')=>URL.createObjectURL(new Blob([s],{type}));c=u=>import(u).then(()=>true,()=>false);i=innerText=>document.head.appendChild(Object.assign(document.createElement('script'),{type:'importmap',nonce:"${nonce}",innerText}));i(\`{"imports":{"x":"\${b('')}"}}\`);i(\`{"imports":{"y":"\${b('')}"}}\`);cm=${
+      supportsImportMaps ? `c(b(\`import"\${b('{}','text/json')}"with{type:"json"}\`))` : 'false'
+    };sp=${
+      supportsImportMaps && wasmSourcePhaseEnabled ?
+        `c(b(\`import source x from "\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))`
+      : 'false'
+    };Promise.all([${supportsImportMaps ? 'true' : "c('x')"},${supportsImportMaps ? "c('y')" : false},cm,${
+      supportsImportMaps ? `cm.then(s=>s?c(b(\`import"\${b('','text/css')\}"with{type:"css"}\`)):false)` : 'false'
+    },sp,${
+      supportsImportMaps && wasmInstancePhaseEnabled ?
+        `${wasmSourcePhaseEnabled ? 'sp.then(s=>s?' : ''}c(b(\`import"\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))${wasmSourcePhaseEnabled ? ':false)' : ''}`
+      : 'false'
+    }]).then(a=>parent.postMessage(['${msgTag}'].concat(a),'*'))<${''}/script>`;
+
+      // Safari will call onload eagerly on head injection, but we don't want the Wechat
+      // path to trigger before setting srcdoc, therefore we track the timing
+      let readyForOnload = false,
+        onloadCalledWhileNotReady = false;
+      function doOnload() {
+        if (!readyForOnload) {
+          onloadCalledWhileNotReady = true;
+          return;
+        }
+        // WeChat browser doesn't support setting srcdoc scripts
+        // But iframe sandboxes don't support contentDocument so we do this as a fallback
+        const doc = iframe.contentDocument;
+        if (doc && doc.head.childNodes.length === 0) {
+          const s = doc.createElement('script');
+          if (nonce) s.setAttribute('nonce', nonce);
+          s.innerHTML = importMapTest.slice(15 + (nonce ? nonce.length : 0), -9);
+          doc.head.appendChild(s);
+        }
+      }
+
+      iframe.onload = doOnload;
+      // WeChat browser requires append before setting srcdoc
+      document.head.appendChild(iframe);
+
+      // setting srcdoc is not supported in React native webviews on iOS
+      // setting src to a blob URL results in a navigation event in webviews
+      // document.write gives usability warnings
+      readyForOnload = true;
+      if ('srcdoc' in iframe) iframe.srcdoc = importMapTest;
+      else iframe.contentDocument.write(importMapTest);
+      // retrigger onload for Safari only if necessary
+      if (onloadCalledWhileNotReady) doOnload();
+    });
   })();
 
   /* es-module-lexer 1.7.0 */
@@ -661,8 +668,6 @@
 
   if (hotReload) importShim$1.hotReload = hotReload$1;
 
-  self.importShim = importShim$1;
-
   const defaultResolve = (id, parentUrl) => {
     return (
       resolveImportMap(composedImportMap, resolveIfNotPlainOrUrl(id, parentUrl) || id, parentUrl) ||
@@ -684,12 +689,19 @@
     if (!shimMode) throw new Error('Unsupported in polyfill mode.');
     composedImportMap = resolveAndComposeImportMap(importMapIn, baseUrl, composedImportMap);
   };
+  importShim$1.version = version;
 
   const registry = (importShim$1._r = {});
   // Wasm caches
   const sourceCache = (importShim$1._s = {});
   (importShim$1._i = new WeakMap());
 
+  // Ensure this version is the only version
+  defineValue(self, 'importShim', Object.freeze(importShim$1));
+  const shimModeOptions = { ...esmsInitOptions, shimMode: true };
+  if (optionsScript) optionsScript.innerHTML = JSON.stringify(shimModeOptions);
+  self.esmsInitOptions = shimModeOptions;
+
   const loadAll = async (load, seen) => {
     seen[load.u] = 1;
     await load.L;
@@ -723,8 +735,7 @@
     if (!shimMode && typeof WebAssembly !== 'undefined') {
       if (wasmSourcePhaseEnabled && !Object.getPrototypeOf(WebAssembly.Module).name) {
         const s = Symbol();
-        const brand = m =>
-          Object.defineProperty(m, s, { writable: false, configurable: false, value: 'WebAssembly.Module' });
+        const brand = m => defineValue(m, s, 'WebAssembly.Module');
         class AbstractModuleSource {
           get [Symbol.toStringTag]() {
             if (this[s]) return this[s];
@@ -1080,7 +1091,7 @@
     const mapIntegrity = composedImportMap.integrity[url];
     const res = await doFetch(
       url,
-      mapIntegrity && !fetchOpts.integrity ? Object.assign({}, fetchOpts, { integrity: mapIntegrity }) : fetchOpts,
+      mapIntegrity && !fetchOpts.integrity ? { ...fetchOpts, integrity: mapIntegrity } : fetchOpts,
       parent
     );
     const r = res.url;
@@ -1235,7 +1246,7 @@
           if (d >= 0 || resolved.N) load.N = true;
           if (d !== -1) return;
           if (skip && skip(resolved.r) && !sourcePhase) return { l: { b: resolved.r }, s: false };
-          if (childFetchOpts.integrity) childFetchOpts = Object.assign({}, childFetchOpts, { integrity: undefined });
+          if (childFetchOpts.integrity) childFetchOpts = { ...childFetchOpts, integrity: undefined };
           const child = { l: getOrCreateLoad(resolved.r, childFetchOpts, load.r, source), s: sourcePhase };
           // assertion case -> inline the CSS / JSON URL directly
           if (source === '') child.l.b = child.l.u;

package/dist/es-module-shims.wasm.js

@@ -1,4 +1,4 @@
-/** ES Module Shims Wasm 2.3.1 */
+/** ES Module Shims Wasm @version 2.4.1 */
 (function (exports) {
 
   let invalidate;
@@ -161,10 +161,6 @@
     ];
   };
 
-  if (self.importShim) {
-    return;
-  }
-
   const hasDocument = typeof document !== 'undefined';
 
   const noop = () => {};
@@ -177,11 +173,21 @@
 
   const dynamicImport = (u, errUrl) => import(u);
 
+  const defineValue = (obj, prop, value) =>
+    Object.defineProperty(obj, prop, { writable: false, configurable: false, value });
+
   const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
   Object.assign(esmsInitOptions, self.esmsInitOptions || {});
 
+  const version = "2.4.1";
+
+  const r = esmsInitOptions.version;
+  if (self.importShim || (r && r !== version)) {
+    return;
+  }
+
   // shim mode is determined on initialization, no late shim mode
   const shimMode =
     esmsInitOptions.shimMode ||
@@ -375,9 +381,9 @@
 
   const resolveAndComposeImportMap = (json, baseUrl, parentMap) => {
     const outMap = {
-      imports: Object.assign({}, parentMap.imports),
-      scopes: Object.assign({}, parentMap.scopes),
-      integrity: Object.assign({}, parentMap.integrity)
+      imports: { ...parentMap.imports },
+      scopes: { ...parentMap.scopes },
+      integrity: { ...parentMap.integrity }
     };
 
     if (json.imports) resolveAndComposePackages(json.imports, outMap.imports, baseUrl, parentMap);
@@ -466,114 +472,115 @@
     }
   };
 
-  // support browsers without dynamic import support (eg Firefox 6x)
-  let supportsJsonType = false;
-  let supportsCssType = false;
-
-  const supports = hasDocument && HTMLScriptElement.supports;
-
-  let supportsImportMaps = supports && supports.name === 'supports' && supports('importmap');
-  let supportsWasmInstancePhase = false;
-  let supportsWasmSourcePhase = false;
-  let supportsMultipleImportMaps = false;
-
-  const wasmBytes = [0, 97, 115, 109, 1, 0, 0, 0];
-
-  let featureDetectionPromise = (async function () {
-    if (!hasDocument)
-      return Promise.all([
-        import(createBlob(`import"${createBlob('{}', 'text/json')}"with{type:"json"}`)).then(
-          () => (
-            (supportsJsonType = true),
-            import(createBlob(`import"${createBlob('', 'text/css')}"with{type:"css"}`)).then(
-              () => (supportsCssType = true),
-              noop
-            )
-          ),
-          noop
-        ),
-        wasmInstancePhaseEnabled &&
-          import(createBlob(`import"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
-            () => (supportsWasmInstancePhase = true),
-            noop
-          ),
-        wasmSourcePhaseEnabled &&
-          import(createBlob(`import source x from"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
-            () => (supportsWasmSourcePhase = true),
-            noop
-          )
-      ]);
-
-    return new Promise(resolve => {
-      const iframe = document.createElement('iframe');
-      iframe.style.display = 'none';
-      iframe.setAttribute('nonce', nonce);
-      function cb({ data }) {
-        const isFeatureDetectionMessage = Array.isArray(data) && data[0] === 'esms';
-        if (!isFeatureDetectionMessage) return;
-        [
-          ,
-          supportsImportMaps,
-          supportsMultipleImportMaps,
-          supportsJsonType,
-          supportsCssType,
-          supportsWasmSourcePhase,
-          supportsWasmInstancePhase
-        ] = data;
-        resolve();
-        document.head.removeChild(iframe);
-        window.removeEventListener('message', cb, false);
-      }
-      window.addEventListener('message', cb, false);
-
-      // Feature checking with careful avoidance of unnecessary work - all gated on initial import map supports check. CSS gates on JSON feature check, Wasm instance phase gates on wasm source phase check.
-      const importMapTest = `<script nonce=${nonce || ''}>b=(s,type='text/javascript')=>URL.createObjectURL(new Blob([s],{type}));c=u=>import(u).then(()=>true,()=>false);i=innerText=>document.head.appendChild(Object.assign(document.createElement('script'),{type:'importmap',nonce:"${nonce}",innerText}));i(\`{"imports":{"x":"\${b('')}"}}\`);i(\`{"imports":{"y":"\${b('')}"}}\`);cm=${
-      supportsImportMaps ? `c(b(\`import"\${b('{}','text/json')}"with{type:"json"}\`))` : 'false'
-    };sp=${
-      supportsImportMaps && wasmSourcePhaseEnabled ?
-        `c(b(\`import source x from "\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))`
-      : 'false'
-    };Promise.all([${supportsImportMaps ? 'true' : "c('x')"},${supportsImportMaps ? "c('y')" : false},cm,${
-      supportsImportMaps ? `cm.then(s=>s?c(b(\`import"\${b('','text/css')\}"with{type:"css"}\`)):false)` : 'false'
-    },sp,${
-      supportsImportMaps && wasmInstancePhaseEnabled ?
-        `${wasmSourcePhaseEnabled ? 'sp.then(s=>s?' : ''}c(b(\`import"\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))${wasmSourcePhaseEnabled ? ':false)' : ''}`
-      : 'false'
-    }]).then(a=>parent.postMessage(['esms'].concat(a),'*'))<${''}/script>`;
-
-      // Safari will call onload eagerly on head injection, but we don't want the Wechat
-      // path to trigger before setting srcdoc, therefore we track the timing
-      let readyForOnload = false,
-        onloadCalledWhileNotReady = false;
-      function doOnload() {
-        if (!readyForOnload) {
-          onloadCalledWhileNotReady = true;
-          return;
-        }
-        // WeChat browser doesn't support setting srcdoc scripts
-        // But iframe sandboxes don't support contentDocument so we do this as a fallback
-        const doc = iframe.contentDocument;
-        if (doc && doc.head.childNodes.length === 0) {
-          const s = doc.createElement('script');
-          if (nonce) s.setAttribute('nonce', nonce);
-          s.innerHTML = importMapTest.slice(15 + (nonce ? nonce.length : 0), -9);
-          doc.head.appendChild(s);
-        }
-      }
-
-      iframe.onload = doOnload;
-      // WeChat browser requires append before setting srcdoc
-      document.head.appendChild(iframe);
-
-      // setting srcdoc is not supported in React native webviews on iOS
-      // setting src to a blob URL results in a navigation event in webviews
-      // document.write gives usability warnings
-      readyForOnload = true;
-      if ('srcdoc' in iframe) iframe.srcdoc = importMapTest;
-      else iframe.contentDocument.write(importMapTest);
-      // retrigger onload for Safari only if necessary
-      if (onloadCalledWhileNotReady) doOnload();
-    });
+  // support browsers without dynamic import support (eg Firefox 6x)
+  let supportsJsonType = false;
+  let supportsCssType = false;
+
+  const supports = hasDocument && HTMLScriptElement.supports;
+
+  let supportsImportMaps = supports && supports.name === 'supports' && supports('importmap');
+  let supportsWasmInstancePhase = false;
+  let supportsWasmSourcePhase = false;
+  let supportsMultipleImportMaps = false;
+
+  const wasmBytes = [0, 97, 115, 109, 1, 0, 0, 0];
+
+  let featureDetectionPromise = (async function () {
+    if (!hasDocument)
+      return Promise.all([
+        import(createBlob(`import"${createBlob('{}', 'text/json')}"with{type:"json"}`)).then(
+          () => (
+            (supportsJsonType = true),
+            import(createBlob(`import"${createBlob('', 'text/css')}"with{type:"css"}`)).then(
+              () => (supportsCssType = true),
+              noop
+            )
+          ),
+          noop
+        ),
+        wasmInstancePhaseEnabled &&
+          import(createBlob(`import"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
+            () => (supportsWasmInstancePhase = true),
+            noop
+          ),
+        wasmSourcePhaseEnabled &&
+          import(createBlob(`import source x from"${createBlob(new Uint8Array(wasmBytes), 'application/wasm')}"`)).then(
+            () => (supportsWasmSourcePhase = true),
+            noop
+          )
+      ]);
+
+    const msgTag = `s${version}`;
+    return new Promise(resolve => {
+      const iframe = document.createElement('iframe');
+      iframe.style.display = 'none';
+      iframe.setAttribute('nonce', nonce);
+      function cb({ data }) {
+        const isFeatureDetectionMessage = Array.isArray(data) && data[0] === msgTag;
+        if (!isFeatureDetectionMessage) return;
+        [
+          ,
+          supportsImportMaps,
+          supportsMultipleImportMaps,
+          supportsJsonType,
+          supportsCssType,
+          supportsWasmSourcePhase,
+          supportsWasmInstancePhase
+        ] = data;
+        resolve();
+        document.head.removeChild(iframe);
+        window.removeEventListener('message', cb, false);
+      }
+      window.addEventListener('message', cb, false);
+
+      // Feature checking with careful avoidance of unnecessary work - all gated on initial import map supports check. CSS gates on JSON feature check, Wasm instance phase gates on wasm source phase check.
+      const importMapTest = `<script nonce=${nonce || ''}>b=(s,type='text/javascript')=>URL.createObjectURL(new Blob([s],{type}));c=u=>import(u).then(()=>true,()=>false);i=innerText=>document.head.appendChild(Object.assign(document.createElement('script'),{type:'importmap',nonce:"${nonce}",innerText}));i(\`{"imports":{"x":"\${b('')}"}}\`);i(\`{"imports":{"y":"\${b('')}"}}\`);cm=${
+      supportsImportMaps ? `c(b(\`import"\${b('{}','text/json')}"with{type:"json"}\`))` : 'false'
+    };sp=${
+      supportsImportMaps && wasmSourcePhaseEnabled ?
+        `c(b(\`import source x from "\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))`
+      : 'false'
+    };Promise.all([${supportsImportMaps ? 'true' : "c('x')"},${supportsImportMaps ? "c('y')" : false},cm,${
+      supportsImportMaps ? `cm.then(s=>s?c(b(\`import"\${b('','text/css')\}"with{type:"css"}\`)):false)` : 'false'
+    },sp,${
+      supportsImportMaps && wasmInstancePhaseEnabled ?
+        `${wasmSourcePhaseEnabled ? 'sp.then(s=>s?' : ''}c(b(\`import"\${b(new Uint8Array(${JSON.stringify(wasmBytes)}),'application/wasm')\}"\`))${wasmSourcePhaseEnabled ? ':false)' : ''}`
+      : 'false'
+    }]).then(a=>parent.postMessage(['${msgTag}'].concat(a),'*'))<${''}/script>`;
+
+      // Safari will call onload eagerly on head injection, but we don't want the Wechat
+      // path to trigger before setting srcdoc, therefore we track the timing
+      let readyForOnload = false,
+        onloadCalledWhileNotReady = false;
+      function doOnload() {
+        if (!readyForOnload) {
+          onloadCalledWhileNotReady = true;
+          return;
+        }
+        // WeChat browser doesn't support setting srcdoc scripts
+        // But iframe sandboxes don't support contentDocument so we do this as a fallback
+        const doc = iframe.contentDocument;
+        if (doc && doc.head.childNodes.length === 0) {
+          const s = doc.createElement('script');
+          if (nonce) s.setAttribute('nonce', nonce);
+          s.innerHTML = importMapTest.slice(15 + (nonce ? nonce.length : 0), -9);
+          doc.head.appendChild(s);
+        }
+      }
+
+      iframe.onload = doOnload;
+      // WeChat browser requires append before setting srcdoc
+      document.head.appendChild(iframe);
+
+      // setting srcdoc is not supported in React native webviews on iOS
+      // setting src to a blob URL results in a navigation event in webviews
+      // document.write gives usability warnings
+      readyForOnload = true;
+      if ('srcdoc' in iframe) iframe.srcdoc = importMapTest;
+      else iframe.contentDocument.write(importMapTest);
+      // retrigger onload for Safari only if necessary
+      if (onloadCalledWhileNotReady) doOnload();
+    });
   })();
 
   /* es-module-lexer 1.7.0 */
@@ -661,8 +668,6 @@
 
   if (hotReload) importShim$1.hotReload = hotReload$1;
 
-  self.importShim = importShim$1;
-
   const defaultResolve = (id, parentUrl) => {
     return (
       resolveImportMap(composedImportMap, resolveIfNotPlainOrUrl(id, parentUrl) || id, parentUrl) ||
@@ -684,12 +689,19 @@
     if (!shimMode) throw new Error('Unsupported in polyfill mode.');
     composedImportMap = resolveAndComposeImportMap(importMapIn, baseUrl, composedImportMap);
   };
+  importShim$1.version = version;
 
   const registry = (importShim$1._r = {});
   // Wasm caches
   const sourceCache = (importShim$1._s = {});
   (importShim$1._i = new WeakMap());
 
+  // Ensure this version is the only version
+  defineValue(self, 'importShim', Object.freeze(importShim$1));
+  const shimModeOptions = { ...esmsInitOptions, shimMode: true };
+  if (optionsScript) optionsScript.innerHTML = JSON.stringify(shimModeOptions);
+  self.esmsInitOptions = shimModeOptions;
+
   const loadAll = async (load, seen) => {
     seen[load.u] = 1;
     await load.L;
@@ -723,8 +735,7 @@
     if (!shimMode && typeof WebAssembly !== 'undefined') {
       if (wasmSourcePhaseEnabled && !Object.getPrototypeOf(WebAssembly.Module).name) {
         const s = Symbol();
-        const brand = m =>
-          Object.defineProperty(m, s, { writable: false, configurable: false, value: 'WebAssembly.Module' });
+        const brand = m => defineValue(m, s, 'WebAssembly.Module');
         class AbstractModuleSource {
           get [Symbol.toStringTag]() {
             if (this[s]) return this[s];
@@ -1080,7 +1091,7 @@
     const mapIntegrity = composedImportMap.integrity[url];
     const res = await doFetch(
       url,
-      mapIntegrity && !fetchOpts.integrity ? Object.assign({}, fetchOpts, { integrity: mapIntegrity }) : fetchOpts,
+      mapIntegrity && !fetchOpts.integrity ? { ...fetchOpts, integrity: mapIntegrity } : fetchOpts,
       parent
     );
     const r = res.url;
@@ -1235,7 +1246,7 @@
           if (d >= 0 || resolved.N) load.N = true;
           if (d !== -1) return;
           if (skip && skip(resolved.r) && !sourcePhase) return { l: { b: resolved.r }, s: false };
-          if (childFetchOpts.integrity) childFetchOpts = Object.assign({}, childFetchOpts, { integrity: undefined });
+          if (childFetchOpts.integrity) childFetchOpts = { ...childFetchOpts, integrity: undefined };
           const child = { l: getOrCreateLoad(resolved.r, childFetchOpts, load.r, source), s: sourcePhase };
           // assertion case -> inline the CSS / JSON URL directly
           if (source === '') child.l.b = child.l.u;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-module-shims",
-  "version": "2.3.1",
+  "version": "2.4.1",
   "description": "Shims for the latest ES module features",
   "main": "dist/es-module-shims.js",
   "exports": {