es-module-shims 2.6.1 → 2.6.2

package/README.md

@@ -31,7 +31,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.6.1/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@2.6.2/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">

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

@@ -1,9 +1,11 @@
-/** ES Module Shims @version 2.6.1 */
+/** ES Module Shims @version 2.6.2 */
 (function () {
 
+  const self_ = typeof globalThis !== 'undefined' ? globalThis : self;
+
   let invalidate;
   const hotReload$1 = url => invalidate(new URL(url, baseUrl).href);
-  const initHotReload = () => {
+  const initHotReload = (topLevelLoad, importShim) => {
     let _importHook = importHook,
       _resolveHook = resolveHook,
       _metaHook = metaHook;
@@ -149,21 +151,27 @@
       curInvalidationRoots = new Set();
     };
 
-    return [
+    setHooks(
       _importHook ? chain(_importHook, hotImportHook) : hotImportHook,
       _resolveHook ?
         (id, parent, defaultResolve) =>
           hotResolveHook(id, parent, (id, parent) => _resolveHook(id, parent, defaultResolve))
       : hotResolveHook,
       _metaHook ? chain(_metaHook, hotMetaHook) : hotMetaHook
-    ];
+    );
   };
 
   const hasDocument = typeof document !== 'undefined';
 
   const noop = () => {};
 
-  const dynamicImport = (u, errUrl) => import(u);
+  const chain = (a, b) =>
+    function () {
+      a.apply(this, arguments);
+      b.apply(this, arguments);
+    };
+
+  const dynamicImport = (u, _errUrl) => import(u);
 
   const defineValue = (obj, prop, value) =>
     Object.defineProperty(obj, prop, { writable: false, configurable: false, value });
@@ -171,12 +179,12 @@
   const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
-  Object.assign(esmsInitOptions, self.esmsInitOptions || {});
+  Object.assign(esmsInitOptions, self_.esmsInitOptions || {});
 
-  const version = "2.6.1";
+  const version = "2.6.2";
 
   const r$1 = esmsInitOptions.version;
-  if (self.importShim || (r$1 && r$1 !== 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'}`
       );
@@ -186,9 +194,11 @@
   // shim mode is determined on initialization, no late shim mode
   const shimMode =
     esmsInitOptions.shimMode ||
-    (hasDocument &&
+    (hasDocument ?
       document.querySelectorAll('script[type=module-shim],script[type=importmap-shim],link[rel=modulepreload-shim]')
-        .length > 0);
+        .length > 0
+      // Without a document, shim mode is always true as we cannot polyfill
+    : true);
 
   let importHook,
     resolveHook,
@@ -202,7 +212,7 @@
 
   const defaultFetchOpts = { credentials: 'same-origin' };
 
-  const globalHook = name => (typeof name === 'string' ? self[name] : name);
+  const globalHook = name => (typeof name === 'string' ? self_[name] : name);
 
   if (esmsInitOptions.onimport) importHook = globalHook(esmsInitOptions.onimport);
   if (esmsInitOptions.resolve) resolveHook = globalHook(esmsInitOptions.resolve);
@@ -220,7 +230,11 @@
     nativePassthrough = !hasCustomizationHooks && !hotReload
   } = esmsInitOptions;
 
-  if (hotReload) [importHook, resolveHook, metaHook] = initHotReload();
+  const setHooks = (importHook_, resolveHook_, metaHook_) => (
+    (importHook = importHook_),
+    (resolveHook = resolveHook_),
+    (metaHook = metaHook_)
+  );
 
   const mapOverrides = esmsInitOptions.mapOverrides;
 
@@ -252,13 +266,14 @@
       };
 
   const baseUrl =
-    hasDocument ?
-      document.baseURI
-    : `${location.protocol}//${location.host}${
+    hasDocument ? document.baseURI
+    : typeof location !== 'undefined' ?
+      `${location.protocol}//${location.host}${
       location.pathname.includes('/') ?
         location.pathname.slice(0, location.pathname.lastIndexOf('/') + 1)
       : location.pathname
-    }`;
+    }`
+    : 'about:blank';
 
   const createBlob = (source, type = 'text/javascript') => URL.createObjectURL(new Blob([source], { type }));
   let { skip } = esmsInitOptions;
@@ -272,10 +287,10 @@
     skip = s => skip.test(s);
   }
 
-  const dispatchError = error => self.dispatchEvent(Object.assign(new Event('error'), { error }));
+  const dispatchError = error => self_.dispatchEvent(Object.assign(new Event('error'), { error }));
 
   const throwError = err => {
-    (self.reportError || dispatchError)(err);
+    (self_.reportError || dispatchError)(err);
     onerror(err);
   };
 
@@ -630,7 +645,7 @@
   };
 
   // import()
-  async function importShim$1(id, opts, parentUrl) {
+  async function importShim(id, opts, parentUrl) {
     if (typeof opts === 'string') {
       parentUrl = opts;
       opts = undefined;
@@ -654,7 +669,7 @@
   // import.source()
   // (opts not currently supported as no use cases yet)
   if (shimMode || wasmSourcePhaseEnabled)
-    importShim$1.source = async (id, opts, parentUrl) => {
+    importShim.source = async (id, opts, parentUrl) => {
       if (typeof opts === 'string') {
         parentUrl = opts;
         opts = undefined;
@@ -668,18 +683,17 @@
       await importMapPromise;
       const url = resolve(id, parentUrl || baseUrl).r;
       const load = getOrCreateLoad(url, defaultFetchOpts, undefined, undefined);
-      if (firstPolyfillLoad && !shimMode && load.n && nativelyLoaded) {
-        onpolyfill();
-        firstPolyfillLoad = false;
-      }
       await load.f;
-      return importShim$1._s[load.r];
+      return importShim._s[load.r];
     };
 
   // import.defer() is just a proxy for import(), since we can't actually defer
-  if (shimMode || deferPhaseEnabled) importShim$1.defer = importShim$1;
+  if (shimMode || deferPhaseEnabled) importShim.defer = importShim;
 
-  if (hotReload) importShim$1.hotReload = hotReload$1;
+  if (hotReload) {
+    initHotReload(topLevelLoad, importShim);
+    importShim.hotReload = hotReload$1;
+  }
 
   const defaultResolve = (id, parentUrl) => {
     return (
@@ -696,24 +710,24 @@
     return resolve(id, `${parentUrl}`).r;
   };
 
-  importShim$1.resolve = (id, parentUrl) => resolve(id, parentUrl).r;
-  importShim$1.getImportMap = () => JSON.parse(JSON.stringify(composedImportMap));
-  importShim$1.addImportMap = importMapIn => {
+  importShim.resolve = (id, parentUrl) => resolve(id, parentUrl).r;
+  importShim.getImportMap = () => JSON.parse(JSON.stringify(composedImportMap));
+  importShim.addImportMap = importMapIn => {
     if (!shimMode) throw new Error('Unsupported in polyfill mode.');
     composedImportMap = resolveAndComposeImportMap(importMapIn, baseUrl, composedImportMap);
   };
-  importShim$1.version = version;
+  importShim.version = version;
 
-  const registry = (importShim$1._r = {});
+  const registry = (importShim._r = {});
   // Wasm caches
-  const sourceCache = (importShim$1._s = {});
-  (importShim$1._i = new WeakMap());
+  const sourceCache = (importShim._s = {});
+  /* const instanceCache = */ importShim._i = new WeakMap();
 
   // Ensure this version is the only version
-  defineValue(self, 'importShim', Object.freeze(importShim$1));
+  defineValue(self_, 'importShim', Object.freeze(importShim));
   const shimModeOptions = { ...esmsInitOptions, shimMode: true };
   if (optionsScript) optionsScript.innerHTML = JSON.stringify(shimModeOptions);
-  self.esmsInitOptions = shimModeOptions;
+  self_.esmsInitOptions = shimModeOptions;
 
   const loadAll = async (load, seen) => {
     seen[load.u] = 1;
@@ -816,7 +830,7 @@
   let firstPolyfillLoad = true;
   let legacyAcceptingImportMaps = true;
 
-  const topLevelLoad = async (
+  async function topLevelLoad(
     url,
     parentUrl,
     fetchOpts,
@@ -824,7 +838,7 @@
     nativelyLoaded,
     lastStaticLoadPromise,
     sourceType
-  ) => {
+  ) {
     await initPromise;
     await importMapPromise;
     url = (await resolve(url, parentUrl)).r;
@@ -874,11 +888,11 @@
     if (load.s) (await dynamicImport(load.s, load.u)).u$_(module);
     revokeObjectURLs(Object.keys(seen));
     return module;
-  };
+  }
 
   const revokeObjectURLs = registryKeys => {
     let curIdx = 0;
-    const handler = self.requestIdleCallback || self.requestAnimationFrame || (fn => setTimeout(fn, 0));
+    const handler = self_.requestIdleCallback || self_.requestAnimationFrame || (fn => setTimeout(fn, 0));
     handler(cleanup);
     function cleanup() {
       for (const key of registryKeys.slice(curIdx, (curIdx += 100))) {
@@ -1075,10 +1089,11 @@
 
   const doFetch = async (url, fetchOpts, parent) => {
     if (enforceIntegrity && !fetchOpts.integrity) throw Error(`No integrity for ${url}${fromParent(parent)}.`);
-    const poolQueue = pushFetchPool();
+    let res,
+      poolQueue = pushFetchPool();
     if (poolQueue) await poolQueue;
     try {
-      var res = await fetchHook(url, fetchOpts);
+      res = await fetchHook(url, fetchOpts);
     } catch (e) {
       e.message = `Unable to fetch ${url}${fromParent(parent)} - see network log for details.\n` + e.message;
       throw e;
@@ -1100,24 +1115,22 @@
     if (!esmsTsTransform) esmsTsTransform = m.transform;
   };
 
-  const contentTypeRegEx = /^(text|application)\/((x-)?javascript|wasm|json|css|typescript)(;|$)/;
   async function defaultSourceHook(url, fetchOpts, parent) {
-    const res = await doFetch(url, fetchOpts, parent);
-    let [, , t] = (res.headers.get('content-type') || '').match(contentTypeRegEx) || [];
-    if (!t) {
-      if (url.endsWith('.ts') || url.endsWith('.mts')) t = 'ts';
-      else
-        throw Error(
-          `Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`
-        );
+    let res = await doFetch(url, fetchOpts, parent),
+      contentType,
+      [, json, type, jsts] =
+        (contentType = res.headers.get('content-type') || '').match(
+          /^(?:[^/;]+\/(?:[^/+;]+\+)?(json)|(?:text|application)\/(?:x-)?((java|type)script|wasm|css))(?:;|$)/
+        ) || [];
+    if (!(type = json || (jsts ? jsts[0] + 's' : type || (/\.m?ts(\?|#|$)/.test(url) && 'ts')))) {
+      throw Error(
+        `Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`
+      );
     }
     return {
       url: res.url,
-      source: t === 'wasm' ? await WebAssembly.compileStreaming(res) : await res.text(),
-      type:
-        t[0] === 'x' || (t[0] === 'j' && t[1] === 'a') ? 'js'
-        : t[0] === 't' ? 'ts'
-        : t
+      source: await (type > 'v' ? WebAssembly.compileStreaming(res) : res.text()),
+      type
     };
   }
 
@@ -1151,7 +1164,7 @@
       }
       source += `if(h)h.accept(m=>({${obj}}=m))`;
     } else if (type === 'json') {
-      source = `${hotPrefix}j=${source};export{j as default};if(h)h.accept(m=>j=m.default)`;
+      source = `${hotPrefix}j=JSON.parse(${JSON.stringify(source)});export{j as default};if(h)h.accept(m=>j=m.default)`;
     } else if (type === 'css') {
       source = `${hotPrefix}s=h&&h.data.s||new CSSStyleSheet();s.replaceSync(${JSON.stringify(
       source.replace(
@@ -1240,7 +1253,7 @@
 
   const linkLoad = (load, fetchOpts) => {
     if (load.L) return;
-    load.L = load.f.then(async () => {
+    load.L = load.f.then(() => {
       let childFetchOpts = fetchOpts;
       load.d = load.a[0]
         .map(({ n, d, t, a, se }) => {

package/dist/es-module-shims.js

@@ -1,9 +1,11 @@
-/** ES Module Shims @version 2.6.1 */
+/** ES Module Shims @version 2.6.2 */
 (function () {
 
+  const self_ = typeof globalThis !== 'undefined' ? globalThis : self;
+
   let invalidate;
   const hotReload$1 = url => invalidate(new URL(url, baseUrl).href);
-  const initHotReload = () => {
+  const initHotReload = (topLevelLoad, importShim) => {
     let _importHook = importHook,
       _resolveHook = resolveHook,
       _metaHook = metaHook;
@@ -148,21 +150,27 @@
       curInvalidationRoots = new Set();
     };
 
-    return [
+    setHooks(
       _importHook ? chain(_importHook, hotImportHook) : hotImportHook,
       _resolveHook ?
         (id, parent, defaultResolve) =>
           hotResolveHook(id, parent, (id, parent) => _resolveHook(id, parent, defaultResolve))
       : hotResolveHook,
       _metaHook ? chain(_metaHook, hotMetaHook) : hotMetaHook
-    ];
+    );
   };
 
   const hasDocument = typeof document !== 'undefined';
 
   const noop = () => {};
 
-  const dynamicImport = (u, errUrl) => import(u);
+  const chain = (a, b) =>
+    function () {
+      a.apply(this, arguments);
+      b.apply(this, arguments);
+    };
+
+  const dynamicImport = (u, _errUrl) => import(u);
 
   const defineValue = (obj, prop, value) =>
     Object.defineProperty(obj, prop, { writable: false, configurable: false, value });
@@ -170,21 +178,23 @@
   const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
-  Object.assign(esmsInitOptions, self.esmsInitOptions || {});
+  Object.assign(esmsInitOptions, self_.esmsInitOptions || {});
 
-  const version = "2.6.1";
+  const version = "2.6.2";
 
   const r$1 = esmsInitOptions.version;
-  if (self.importShim || (r$1 && r$1 !== version)) {
+  if (self_.importShim || (r$1 && r$1 !== version)) {
     return;
   }
 
   // shim mode is determined on initialization, no late shim mode
   const shimMode =
     esmsInitOptions.shimMode ||
-    (hasDocument &&
+    (hasDocument ?
       document.querySelectorAll('script[type=module-shim],script[type=importmap-shim],link[rel=modulepreload-shim]')
-        .length > 0);
+        .length > 0
+      // Without a document, shim mode is always true as we cannot polyfill
+    : true);
 
   let importHook,
     resolveHook,
@@ -198,7 +208,7 @@
 
   const defaultFetchOpts = { credentials: 'same-origin' };
 
-  const globalHook = name => (typeof name === 'string' ? self[name] : name);
+  const globalHook = name => (typeof name === 'string' ? self_[name] : name);
 
   if (esmsInitOptions.onimport) importHook = globalHook(esmsInitOptions.onimport);
   if (esmsInitOptions.resolve) resolveHook = globalHook(esmsInitOptions.resolve);
@@ -216,7 +226,11 @@
     nativePassthrough = !hasCustomizationHooks && !hotReload
   } = esmsInitOptions;
 
-  if (hotReload) [importHook, resolveHook, metaHook] = initHotReload();
+  const setHooks = (importHook_, resolveHook_, metaHook_) => (
+    (importHook = importHook_),
+    (resolveHook = resolveHook_),
+    (metaHook = metaHook_)
+  );
 
   const mapOverrides = esmsInitOptions.mapOverrides;
 
@@ -248,13 +262,14 @@
       };
 
   const baseUrl =
-    hasDocument ?
-      document.baseURI
-    : `${location.protocol}//${location.host}${
+    hasDocument ? document.baseURI
+    : typeof location !== 'undefined' ?
+      `${location.protocol}//${location.host}${
       location.pathname.includes('/') ?
         location.pathname.slice(0, location.pathname.lastIndexOf('/') + 1)
       : location.pathname
-    }`;
+    }`
+    : 'about:blank';
 
   const createBlob = (source, type = 'text/javascript') => URL.createObjectURL(new Blob([source], { type }));
   let { skip } = esmsInitOptions;
@@ -268,10 +283,10 @@
     skip = s => skip.test(s);
   }
 
-  const dispatchError = error => self.dispatchEvent(Object.assign(new Event('error'), { error }));
+  const dispatchError = error => self_.dispatchEvent(Object.assign(new Event('error'), { error }));
 
   const throwError = err => {
-    (self.reportError || dispatchError)(err);
+    (self_.reportError || dispatchError)(err);
     onerror(err);
   };
 
@@ -620,7 +635,7 @@
   };
 
   // import()
-  async function importShim$1(id, opts, parentUrl) {
+  async function importShim(id, opts, parentUrl) {
     if (typeof opts === 'string') {
       parentUrl = opts;
       opts = undefined;
@@ -643,7 +658,7 @@
   // import.source()
   // (opts not currently supported as no use cases yet)
   if (shimMode || wasmSourcePhaseEnabled)
-    importShim$1.source = async (id, opts, parentUrl) => {
+    importShim.source = async (id, opts, parentUrl) => {
       if (typeof opts === 'string') {
         parentUrl = opts;
         opts = undefined;
@@ -656,18 +671,17 @@
       await importMapPromise;
       const url = resolve(id, parentUrl || baseUrl).r;
       const load = getOrCreateLoad(url, defaultFetchOpts, undefined, undefined);
-      if (firstPolyfillLoad && !shimMode && load.n && nativelyLoaded) {
-        onpolyfill();
-        firstPolyfillLoad = false;
-      }
       await load.f;
-      return importShim$1._s[load.r];
+      return importShim._s[load.r];
     };
 
   // import.defer() is just a proxy for import(), since we can't actually defer
-  if (shimMode || deferPhaseEnabled) importShim$1.defer = importShim$1;
+  if (shimMode || deferPhaseEnabled) importShim.defer = importShim;
 
-  if (hotReload) importShim$1.hotReload = hotReload$1;
+  if (hotReload) {
+    initHotReload(topLevelLoad, importShim);
+    importShim.hotReload = hotReload$1;
+  }
 
   const defaultResolve = (id, parentUrl) => {
     return (
@@ -684,24 +698,24 @@
     return resolve(id, `${parentUrl}`).r;
   };
 
-  importShim$1.resolve = (id, parentUrl) => resolve(id, parentUrl).r;
-  importShim$1.getImportMap = () => JSON.parse(JSON.stringify(composedImportMap));
-  importShim$1.addImportMap = importMapIn => {
+  importShim.resolve = (id, parentUrl) => resolve(id, parentUrl).r;
+  importShim.getImportMap = () => JSON.parse(JSON.stringify(composedImportMap));
+  importShim.addImportMap = importMapIn => {
     if (!shimMode) throw new Error('Unsupported in polyfill mode.');
     composedImportMap = resolveAndComposeImportMap(importMapIn, baseUrl, composedImportMap);
   };
-  importShim$1.version = version;
+  importShim.version = version;
 
-  const registry = (importShim$1._r = {});
+  const registry = (importShim._r = {});
   // Wasm caches
-  const sourceCache = (importShim$1._s = {});
-  (importShim$1._i = new WeakMap());
+  const sourceCache = (importShim._s = {});
+  /* const instanceCache = */ importShim._i = new WeakMap();
 
   // Ensure this version is the only version
-  defineValue(self, 'importShim', Object.freeze(importShim$1));
+  defineValue(self_, 'importShim', Object.freeze(importShim));
   const shimModeOptions = { ...esmsInitOptions, shimMode: true };
   if (optionsScript) optionsScript.innerHTML = JSON.stringify(shimModeOptions);
-  self.esmsInitOptions = shimModeOptions;
+  self_.esmsInitOptions = shimModeOptions;
 
   const loadAll = async (load, seen) => {
     seen[load.u] = 1;
@@ -804,7 +818,7 @@
   let firstPolyfillLoad = true;
   let legacyAcceptingImportMaps = true;
 
-  const topLevelLoad = async (
+  async function topLevelLoad(
     url,
     parentUrl,
     fetchOpts,
@@ -812,7 +826,7 @@
     nativelyLoaded,
     lastStaticLoadPromise,
     sourceType
-  ) => {
+  ) {
     await initPromise;
     await importMapPromise;
     url = (await resolve(url, parentUrl)).r;
@@ -858,11 +872,11 @@
     if (load.s) (await dynamicImport(load.s, load.u)).u$_(module);
     revokeObjectURLs(Object.keys(seen));
     return module;
-  };
+  }
 
   const revokeObjectURLs = registryKeys => {
     let curIdx = 0;
-    const handler = self.requestIdleCallback || self.requestAnimationFrame || (fn => setTimeout(fn, 0));
+    const handler = self_.requestIdleCallback || self_.requestAnimationFrame || (fn => setTimeout(fn, 0));
     handler(cleanup);
     function cleanup() {
       for (const key of registryKeys.slice(curIdx, (curIdx += 100))) {
@@ -1057,10 +1071,11 @@
 
   const doFetch = async (url, fetchOpts, parent) => {
     if (enforceIntegrity && !fetchOpts.integrity) throw Error(`No integrity for ${url}${fromParent(parent)}.`);
-    const poolQueue = pushFetchPool();
+    let res,
+      poolQueue = pushFetchPool();
     if (poolQueue) await poolQueue;
     try {
-      var res = await fetchHook(url, fetchOpts);
+      res = await fetchHook(url, fetchOpts);
     } catch (e) {
       e.message = `Unable to fetch ${url}${fromParent(parent)} - see network log for details.\n` + e.message;
       throw e;
@@ -1082,24 +1097,22 @@
     if (!esmsTsTransform) esmsTsTransform = m.transform;
   };
 
-  const contentTypeRegEx = /^(text|application)\/((x-)?javascript|wasm|json|css|typescript)(;|$)/;
   async function defaultSourceHook(url, fetchOpts, parent) {
-    const res = await doFetch(url, fetchOpts, parent);
-    let [, , t] = (res.headers.get('content-type') || '').match(contentTypeRegEx) || [];
-    if (!t) {
-      if (url.endsWith('.ts') || url.endsWith('.mts')) t = 'ts';
-      else
-        throw Error(
-          `Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`
-        );
+    let res = await doFetch(url, fetchOpts, parent),
+      contentType,
+      [, json, type, jsts] =
+        (contentType = res.headers.get('content-type') || '').match(
+          /^(?:[^/;]+\/(?:[^/+;]+\+)?(json)|(?:text|application)\/(?:x-)?((java|type)script|wasm|css))(?:;|$)/
+        ) || [];
+    if (!(type = json || (jsts ? jsts[0] + 's' : type || (/\.m?ts(\?|#|$)/.test(url) && 'ts')))) {
+      throw Error(
+        `Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`
+      );
     }
     return {
       url: res.url,
-      source: t === 'wasm' ? await WebAssembly.compileStreaming(res) : await res.text(),
-      type:
-        t[0] === 'x' || (t[0] === 'j' && t[1] === 'a') ? 'js'
-        : t[0] === 't' ? 'ts'
-        : t
+      source: await (type > 'v' ? WebAssembly.compileStreaming(res) : res.text()),
+      type
     };
   }
 
@@ -1133,7 +1146,7 @@
       }
       source += `if(h)h.accept(m=>({${obj}}=m))`;
     } else if (type === 'json') {
-      source = `${hotPrefix}j=${source};export{j as default};if(h)h.accept(m=>j=m.default)`;
+      source = `${hotPrefix}j=JSON.parse(${JSON.stringify(source)});export{j as default};if(h)h.accept(m=>j=m.default)`;
     } else if (type === 'css') {
       source = `${hotPrefix}s=h&&h.data.s||new CSSStyleSheet();s.replaceSync(${JSON.stringify(
       source.replace(
@@ -1221,7 +1234,7 @@
 
   const linkLoad = (load, fetchOpts) => {
     if (load.L) return;
-    load.L = load.f.then(async () => {
+    load.L = load.f.then(() => {
       let childFetchOpts = fetchOpts;
       load.d = load.a[0]
         .map(({ n, d, t, a, se }) => {

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

@@ -1,9 +1,11 @@
-/** ES Module Shims Wasm @version 2.6.1 */
+/** ES Module Shims Wasm @version 2.6.2 */
 (function () {
 
+  const self_ = typeof globalThis !== 'undefined' ? globalThis : self;
+
   let invalidate;
   const hotReload$1 = url => invalidate(new URL(url, baseUrl).href);
-  const initHotReload = () => {
+  const initHotReload = (topLevelLoad, importShim) => {
     let _importHook = importHook,
       _resolveHook = resolveHook,
       _metaHook = metaHook;
@@ -148,21 +150,27 @@
       curInvalidationRoots = new Set();
     };
 
-    return [
+    setHooks(
       _importHook ? chain(_importHook, hotImportHook) : hotImportHook,
       _resolveHook ?
         (id, parent, defaultResolve) =>
           hotResolveHook(id, parent, (id, parent) => _resolveHook(id, parent, defaultResolve))
       : hotResolveHook,
       _metaHook ? chain(_metaHook, hotMetaHook) : hotMetaHook
-    ];
+    );
   };
 
   const hasDocument = typeof document !== 'undefined';
 
   const noop = () => {};
 
-  const dynamicImport = (u, errUrl) => import(u);
+  const chain = (a, b) =>
+    function () {
+      a.apply(this, arguments);
+      b.apply(this, arguments);
+    };
+
+  const dynamicImport = (u, _errUrl) => import(u);
 
   const defineValue = (obj, prop, value) =>
     Object.defineProperty(obj, prop, { writable: false, configurable: false, value });
@@ -170,21 +178,23 @@
   const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
-  Object.assign(esmsInitOptions, self.esmsInitOptions || {});
+  Object.assign(esmsInitOptions, self_.esmsInitOptions || {});
 
-  const version = "2.6.1";
+  const version = "2.6.2";
 
   const r = esmsInitOptions.version;
-  if (self.importShim || (r && r !== version)) {
+  if (self_.importShim || (r && r !== version)) {
     return;
   }
 
   // shim mode is determined on initialization, no late shim mode
   const shimMode =
     esmsInitOptions.shimMode ||
-    (hasDocument &&
+    (hasDocument ?
       document.querySelectorAll('script[type=module-shim],script[type=importmap-shim],link[rel=modulepreload-shim]')
-        .length > 0);
+        .length > 0
+      // Without a document, shim mode is always true as we cannot polyfill
+    : true);
 
   let importHook,
     resolveHook,
@@ -198,7 +208,7 @@
 
   const defaultFetchOpts = { credentials: 'same-origin' };
 
-  const globalHook = name => (typeof name === 'string' ? self[name] : name);
+  const globalHook = name => (typeof name === 'string' ? self_[name] : name);
 
   if (esmsInitOptions.onimport) importHook = globalHook(esmsInitOptions.onimport);
   if (esmsInitOptions.resolve) resolveHook = globalHook(esmsInitOptions.resolve);
@@ -216,7 +226,11 @@
     nativePassthrough = !hasCustomizationHooks && !hotReload
   } = esmsInitOptions;
 
-  if (hotReload) [importHook, resolveHook, metaHook] = initHotReload();
+  const setHooks = (importHook_, resolveHook_, metaHook_) => (
+    (importHook = importHook_),
+    (resolveHook = resolveHook_),
+    (metaHook = metaHook_)
+  );
 
   const mapOverrides = esmsInitOptions.mapOverrides;
 
@@ -248,13 +262,14 @@
       };
 
   const baseUrl =
-    hasDocument ?
-      document.baseURI
-    : `${location.protocol}//${location.host}${
+    hasDocument ? document.baseURI
+    : typeof location !== 'undefined' ?
+      `${location.protocol}//${location.host}${
       location.pathname.includes('/') ?
         location.pathname.slice(0, location.pathname.lastIndexOf('/') + 1)
       : location.pathname
-    }`;
+    }`
+    : 'about:blank';
 
   const createBlob = (source, type = 'text/javascript') => URL.createObjectURL(new Blob([source], { type }));
   let { skip } = esmsInitOptions;
@@ -268,10 +283,10 @@
     skip = s => skip.test(s);
   }
 
-  const dispatchError = error => self.dispatchEvent(Object.assign(new Event('error'), { error }));
+  const dispatchError = error => self_.dispatchEvent(Object.assign(new Event('error'), { error }));
 
   const throwError = err => {
-    (self.reportError || dispatchError)(err);
+    (self_.reportError || dispatchError)(err);
     onerror(err);
   };
 
@@ -620,7 +635,7 @@
   };
 
   // import()
-  async function importShim$1(id, opts, parentUrl) {
+  async function importShim(id, opts, parentUrl) {
     if (typeof opts === 'string') {
       parentUrl = opts;
       opts = undefined;
@@ -643,7 +658,7 @@
   // import.source()
   // (opts not currently supported as no use cases yet)
   if (shimMode || wasmSourcePhaseEnabled)
-    importShim$1.source = async (id, opts, parentUrl) => {
+    importShim.source = async (id, opts, parentUrl) => {
       if (typeof opts === 'string') {
         parentUrl = opts;
         opts = undefined;
@@ -656,18 +671,17 @@
       await importMapPromise;
       const url = resolve(id, parentUrl || baseUrl).r;
       const load = getOrCreateLoad(url, defaultFetchOpts, undefined, undefined);
-      if (firstPolyfillLoad && !shimMode && load.n && nativelyLoaded) {
-        onpolyfill();
-        firstPolyfillLoad = false;
-      }
       await load.f;
-      return importShim$1._s[load.r];
+      return importShim._s[load.r];
     };
 
   // import.defer() is just a proxy for import(), since we can't actually defer
-  if (shimMode || deferPhaseEnabled) importShim$1.defer = importShim$1;
+  if (shimMode || deferPhaseEnabled) importShim.defer = importShim;
 
-  if (hotReload) importShim$1.hotReload = hotReload$1;
+  if (hotReload) {
+    initHotReload(topLevelLoad, importShim);
+    importShim.hotReload = hotReload$1;
+  }
 
   const defaultResolve = (id, parentUrl) => {
     return (
@@ -684,24 +698,24 @@
     return resolve(id, `${parentUrl}`).r;
   };
 
-  importShim$1.resolve = (id, parentUrl) => resolve(id, parentUrl).r;
-  importShim$1.getImportMap = () => JSON.parse(JSON.stringify(composedImportMap));
-  importShim$1.addImportMap = importMapIn => {
+  importShim.resolve = (id, parentUrl) => resolve(id, parentUrl).r;
+  importShim.getImportMap = () => JSON.parse(JSON.stringify(composedImportMap));
+  importShim.addImportMap = importMapIn => {
     if (!shimMode) throw new Error('Unsupported in polyfill mode.');
     composedImportMap = resolveAndComposeImportMap(importMapIn, baseUrl, composedImportMap);
   };
-  importShim$1.version = version;
+  importShim.version = version;
 
-  const registry = (importShim$1._r = {});
+  const registry = (importShim._r = {});
   // Wasm caches
-  const sourceCache = (importShim$1._s = {});
-  (importShim$1._i = new WeakMap());
+  const sourceCache = (importShim._s = {});
+  /* const instanceCache = */ importShim._i = new WeakMap();
 
   // Ensure this version is the only version
-  defineValue(self, 'importShim', Object.freeze(importShim$1));
+  defineValue(self_, 'importShim', Object.freeze(importShim));
   const shimModeOptions = { ...esmsInitOptions, shimMode: true };
   if (optionsScript) optionsScript.innerHTML = JSON.stringify(shimModeOptions);
-  self.esmsInitOptions = shimModeOptions;
+  self_.esmsInitOptions = shimModeOptions;
 
   const loadAll = async (load, seen) => {
     seen[load.u] = 1;
@@ -804,7 +818,7 @@
   let firstPolyfillLoad = true;
   let legacyAcceptingImportMaps = true;
 
-  const topLevelLoad = async (
+  async function topLevelLoad(
     url,
     parentUrl,
     fetchOpts,
@@ -812,7 +826,7 @@
     nativelyLoaded,
     lastStaticLoadPromise,
     sourceType
-  ) => {
+  ) {
     await initPromise;
     await importMapPromise;
     url = (await resolve(url, parentUrl)).r;
@@ -858,11 +872,11 @@
     if (load.s) (await dynamicImport(load.s, load.u)).u$_(module);
     revokeObjectURLs(Object.keys(seen));
     return module;
-  };
+  }
 
   const revokeObjectURLs = registryKeys => {
     let curIdx = 0;
-    const handler = self.requestIdleCallback || self.requestAnimationFrame || (fn => setTimeout(fn, 0));
+    const handler = self_.requestIdleCallback || self_.requestAnimationFrame || (fn => setTimeout(fn, 0));
     handler(cleanup);
     function cleanup() {
       for (const key of registryKeys.slice(curIdx, (curIdx += 100))) {
@@ -1057,10 +1071,11 @@
 
   const doFetch = async (url, fetchOpts, parent) => {
     if (enforceIntegrity && !fetchOpts.integrity) throw Error(`No integrity for ${url}${fromParent(parent)}.`);
-    const poolQueue = pushFetchPool();
+    let res,
+      poolQueue = pushFetchPool();
     if (poolQueue) await poolQueue;
     try {
-      var res = await fetchHook(url, fetchOpts);
+      res = await fetchHook(url, fetchOpts);
     } catch (e) {
       e.message = `Unable to fetch ${url}${fromParent(parent)} - see network log for details.\n` + e.message;
       throw e;
@@ -1082,24 +1097,22 @@
     if (!esmsTsTransform) esmsTsTransform = m.transform;
   };
 
-  const contentTypeRegEx = /^(text|application)\/((x-)?javascript|wasm|json|css|typescript)(;|$)/;
   async function defaultSourceHook(url, fetchOpts, parent) {
-    const res = await doFetch(url, fetchOpts, parent);
-    let [, , t] = (res.headers.get('content-type') || '').match(contentTypeRegEx) || [];
-    if (!t) {
-      if (url.endsWith('.ts') || url.endsWith('.mts')) t = 'ts';
-      else
-        throw Error(
-          `Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`
-        );
+    let res = await doFetch(url, fetchOpts, parent),
+      contentType,
+      [, json, type, jsts] =
+        (contentType = res.headers.get('content-type') || '').match(
+          /^(?:[^/;]+\/(?:[^/+;]+\+)?(json)|(?:text|application)\/(?:x-)?((java|type)script|wasm|css))(?:;|$)/
+        ) || [];
+    if (!(type = json || (jsts ? jsts[0] + 's' : type || (/\.m?ts(\?|#|$)/.test(url) && 'ts')))) {
+      throw Error(
+        `Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`
+      );
     }
     return {
       url: res.url,
-      source: t === 'wasm' ? await WebAssembly.compileStreaming(res) : await res.text(),
-      type:
-        t[0] === 'x' || (t[0] === 'j' && t[1] === 'a') ? 'js'
-        : t[0] === 't' ? 'ts'
-        : t
+      source: await (type > 'v' ? WebAssembly.compileStreaming(res) : res.text()),
+      type
     };
   }
 
@@ -1133,7 +1146,7 @@
       }
       source += `if(h)h.accept(m=>({${obj}}=m))`;
     } else if (type === 'json') {
-      source = `${hotPrefix}j=${source};export{j as default};if(h)h.accept(m=>j=m.default)`;
+      source = `${hotPrefix}j=JSON.parse(${JSON.stringify(source)});export{j as default};if(h)h.accept(m=>j=m.default)`;
     } else if (type === 'css') {
       source = `${hotPrefix}s=h&&h.data.s||new CSSStyleSheet();s.replaceSync(${JSON.stringify(
       source.replace(
@@ -1221,7 +1234,7 @@
 
   const linkLoad = (load, fetchOpts) => {
     if (load.L) return;
-    load.L = load.f.then(async () => {
+    load.L = load.f.then(() => {
       let childFetchOpts = fetchOpts;
       load.d = load.a[0]
         .map(({ n, d, t, a, se }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-module-shims",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Shims for the latest ES module features",
   "main": "dist/es-module-shims.js",
   "exports": {
@@ -32,6 +32,7 @@
   "devDependencies": {
     "@rollup/plugin-replace": "^2.4.2",
     "amaro": "0.5.3",
+    "chomp": "^0.2.23",
     "es-module-lexer": "1.7.0",
     "kleur": "^4.1.4",
     "mime-types": "^2.1.33",
@@ -50,8 +51,8 @@
     "test": "test"
   },
   "scripts": {
-    "build": "npm install -g chomp ; chomp build",
-    "test": "npm install -g chomp ; chomp test"
+    "build": "chomp build",
+    "test": "chomp test"
   },
   "repository": {
     "type": "git",