es-module-shims 1.5.4 → 1.5.7

package/README.md

@@ -29,7 +29,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@1.5.4/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@1.5.7/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">
@@ -292,11 +292,22 @@ While in polyfill mode the same restrictions apply that multiple import maps, im
 To make it easy to keep track of import map state, es-module-shims provides a `importShim.getImportMap` utility function, available only in shim mode.
 
 ```js
-const importMap = importShim.getImportMap()
+const importMap = importShim.getImportMap();
 
 // importMap will be an object in the same shape as the json in a importmap script
 ```
 
+#### Setting current import map state
+To make it easy to set the import map state, es-module-shims provides a `importShim.addImportMap` utility function, available only in shim mode.
+
+```js
+// importMap will be an object in the same shape as the json in a importmap script
+const importMap = { imports: {/*...*/}, scopes: {/*...*/} };
+
+importShim.addImportMap(importMap);
+```
+
+
 ### Dynamic Import
 
 > Stability: Stable browser standard
@@ -423,6 +434,34 @@ var resolvedUrl = import.meta.resolve('dep', 'https://site.com/another/scope');
 
 Node.js also implements a similar API, although it's in the process of shifting to a synchronous resolver.
 
+### Module Workers
+ES Module Shims can be used in module workers in browsers that provide dynamic import in worker environments, which at the moment are Chrome(80+), Edge(80+), Safari(15+).
+
+An example of ES Module Shims usage in web workers is provided below:
+```js
+/**
+ * 
+ * @param {string} aURL a string representing the URL of the module script the worker will execute.
+ * @returns {string} The string representing the URL of the script the worker will execute.
+ */
+function getWorkerScriptURL(aURL) {
+  // baseURL, esModuleShimsURL are considered to be known in advance
+  // esModuleShimsURL - must point to the non-CSP build of ES Module Shims, 
+  // namely the `es-module-shim.wasm.js` output: es-module-shims/dist/es-module-shims.wasm.js
+
+  return URL.createObjectURL(new Blob(
+    [
+      `importScripts('${new URL(esModuleShimsURL, baseURL).href}');
+      importShim.addImportMap(${JSON.stringify(importShim.getImportMap())});
+      importShim('${new URL(aURL, baseURL).href}').catch(e => setTimeout(() => { throw e; }))`
+    ],
+    { type: 'application/javascript' }))
+}
+
+const worker = new Worker(getWorkerScriptURL('myEsModule.js'));
+```
+> For now, in web workers must be used the non-CSP build of ES Module Shims, namely the `es-module-shim.wasm.js` output: es-module-shims/dist/es-module-shims.wasm.js.
+
 ## Init Options
 
 Provide a `esmsInitOptions` on the global scope before `es-module-shims` is loaded to configure various aspects of the module loading process:
@@ -675,6 +714,8 @@ window.polyfilling = () => console.log('The polyfill is actively applying');
 
 The default hook will log a message to the console with `console.info` noting that polyfill mode is enabled and that the native error can be ignored.
 
+Overriding this hook with an empty function will disable the default polyfill log output.
+
 In the above, running in latest Chromium browsers, nothing will be logged, while running in an older browser that does not support newer features like import maps the console log will be output.
 
 #### Error hook

package/dist/es-module-shims.js

@@ -1,14 +1,17 @@
-/* ES Module Shims 1.5.4 */
+/* ES Module Shims 1.5.7 */
 (function () {
 
+  const hasWindow = typeof window !== 'undefined';
+  const hasDocument = typeof document !== 'undefined';
+
   const noop = () => {};
 
-  const optionsScript = document.querySelector('script[type=esms-options]');
+  const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
   Object.assign(esmsInitOptions, self.esmsInitOptions || {});
 
-  let shimMode = !!esmsInitOptions.shimMode;
+  let shimMode = hasDocument ? !!esmsInitOptions.shimMode : true;
 
   const importHook = globalHook(shimMode && esmsInitOptions.onimport);
   const resolveHook = globalHook(shimMode && esmsInitOptions.resolve);
@@ -17,18 +20,19 @@
 
   const skip = esmsInitOptions.skip ? new RegExp(esmsInitOptions.skip) : null;
 
-  let nonce = esmsInitOptions.nonce;
-
   const mapOverrides = esmsInitOptions.mapOverrides;
 
-  if (!nonce) {
+  let nonce = esmsInitOptions.nonce;
+  if (!nonce && hasDocument) {
     const nonceElement = document.querySelector('script[nonce]');
     if (nonceElement)
       nonce = nonceElement.nonce || nonceElement.getAttribute('nonce');
   }
 
   const onerror = globalHook(esmsInitOptions.onerror || noop);
-  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => console.log('%c^^ Module TypeError above is polyfilled and can be ignored ^^', 'font-weight:900;color:#391');
+  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => {
+    console.log('%c^^ Module TypeError above is polyfilled and can be ignored ^^', 'font-weight:900;color:#391');
+  };
 
   const { revokeBlobURLs, noLoadEventRetriggers, enforceIntegrity } = esmsInitOptions;
 
@@ -46,7 +50,11 @@
 
   const edge = !navigator.userAgentData && !!navigator.userAgent.match(/Edge\/\d+\.\d+/);
 
-  const baseUrl = document.baseURI;
+  const baseUrl = hasDocument
+    ? document.baseURI
+    : `${location.protocol}//${location.host}${location.pathname.includes('/') 
+    ? location.pathname.slice(0, location.pathname.lastIndexOf('/') + 1) 
+    : location.pathname}`;
 
   function createBlob (source, type = 'text/javascript') {
     return URL.createObjectURL(new Blob([source], { type }));
@@ -54,7 +62,7 @@
 
   const eoop = err => setTimeout(() => { throw err });
 
-  const throwError = err => { (window.reportError || window.safari && console.error || eoop)(err), void onerror(err); };
+  const throwError = err => { (self.reportError || hasWindow && window.safari && console.error || eoop)(err), void onerror(err); };
 
   function fromParent (parent) {
     return parent ? ` imported from ${parent}` : '';
@@ -271,32 +279,43 @@
   let supportsJsonAssertions = false;
   let supportsCssAssertions = false;
 
-  let supportsImportMeta = false;
-  let supportsImportMaps = false;
-
+  let supportsImportMaps = hasDocument && HTMLScriptElement.supports ? HTMLScriptElement.supports('importmap') : false;
+  let supportsImportMeta = supportsImportMaps;
   let supportsDynamicImport = false;
 
-  const featureDetectionPromise = Promise.resolve(supportsDynamicImportCheck).then(_supportsDynamicImport => {
+  const featureDetectionPromise = Promise.resolve(supportsImportMaps || supportsDynamicImportCheck).then(_supportsDynamicImport => {
     if (!_supportsDynamicImport)
       return;
     supportsDynamicImport = true;
 
     return Promise.all([
-      dynamicImport(createBlob('import.meta')).then(() => supportsImportMeta = true, noop),
-      cssModulesEnabled && dynamicImport(createBlob('import"data:text/css,{}"assert{type:"css"}')).then(() => supportsCssAssertions = true, noop),
-      jsonModulesEnabled && dynamicImport(createBlob('import"data:text/json,{}"assert{type:"json"}')).then(() => supportsJsonAssertions = true, noop),
-      new Promise(resolve => {
-        self._$s = v => {
-          document.head.removeChild(iframe);
-          if (v) supportsImportMaps = true;
-          delete self._$s;
-          resolve();
-        };
+      supportsImportMaps || dynamicImport(createBlob('import.meta')).then(() => supportsImportMeta = true, noop),
+      cssModulesEnabled && dynamicImport(createBlob(`import"${createBlob('', 'text/css')}"assert{type:"css"}`)).then(() => supportsCssAssertions = true, noop),
+      jsonModulesEnabled && dynamicImport(createBlob(`import"${createBlob('{}', 'text/json')}"assert{type:"json"}`)).then(() => supportsJsonAssertions = true, noop),
+      supportsImportMaps || hasDocument && (HTMLScriptElement.supports || new Promise(resolve => {
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
-        iframe.srcdoc = `<script type=importmap nonce="${nonce}">{"imports":{"x":"data:text/javascript,"}}<${''}/script><script nonce="${nonce}">import('x').then(()=>1,()=>0).then(v=>parent._$s(v))<${''}/script>`;
+        iframe.setAttribute('nonce', nonce);
+        // setting src to a blob URL results in a navigation event in webviews
+        // setting srcdoc is not supported in React native webviews on iOS
+        // therefore, we need to first feature detect srcdoc support
+        iframe.srcdoc = `<!doctype html><script nonce="${nonce}"><${''}/script>`;
         document.head.appendChild(iframe);
-      })
+        iframe.contentWindow.addEventListener('DOMContentLoaded', () => {
+          self._$s = v => {
+            document.head.removeChild(iframe);
+            supportsImportMaps = v;
+            delete self._$s;
+            resolve();
+          };
+          const supportsSrcDoc = iframe.contentDocument.head.childNodes.length > 0;
+          const importMapTest = `<!doctype html><script type=importmap nonce="${nonce}">{"imports":{"x":"${createBlob('')}"}<${''}/script><script nonce="${nonce}">import('x').catch(() => {}).then(v=>parent._$s(!!v))<${''}/script>`;
+          if (supportsSrcDoc)
+            iframe.srcdoc = importMapTest;
+          else
+            iframe.contentDocument.write(importMapTest);
+        });
+      }))
     ]);
   });
 
@@ -333,7 +352,9 @@
     await initPromise;
     if (importHook) await importHook(id, typeof args[1] !== 'string' ? args[1] : {}, parentUrl);
     if (acceptingImportMaps || shimMode || !baselinePassthrough) {
-      processImportMaps();
+      if (hasDocument)
+        processImportMaps();
+
       if (!shimMode)
         acceptingImportMaps = false;
     }
@@ -363,6 +384,10 @@
 
   importShim.resolve = resolveSync;
   importShim.getImportMap = () => JSON.parse(JSON.stringify(importMap));
+  importShim.addImportMap = importMapIn => {
+    if (!shimMode) throw new Error('Unsupported in polyfill mode.');
+    importMap = resolveAndComposeImportMap(importMapIn, baseUrl, importMap);
+  };
 
   const registry = importShim._r = {};
 
@@ -401,26 +426,47 @@
       }
     }
     baselinePassthrough = esmsInitOptions.polyfillEnable !== true && supportsDynamicImport && supportsImportMeta && supportsImportMaps && (!jsonModulesEnabled || supportsJsonAssertions) && (!cssModulesEnabled || supportsCssAssertions) && !importMapSrcOrLazy && !false;
-    if (shimMode || !baselinePassthrough) {
-      new MutationObserver(mutations => {
-        for (const mutation of mutations) {
-          if (mutation.type !== 'childList') continue;
-          for (const node of mutation.addedNodes) {
-            if (node.tagName === 'SCRIPT') {
-              if (node.type === (shimMode ? 'module-shim' : 'module'))
-                processScript(node);
-              if (node.type === (shimMode ? 'importmap-shim' : 'importmap'))
-                processImportMap(node);
+    if (hasDocument) {
+      if (!supportsImportMaps) {
+        const supports = HTMLScriptElement.supports || (type => type === 'classic' || type === 'module');
+        HTMLScriptElement.supports = type => type === 'importmap' || supports(type);
+      }
+
+      if (shimMode || !baselinePassthrough) {
+        new MutationObserver(mutations => {
+          for (const mutation of mutations) {
+            if (mutation.type !== 'childList') continue;
+            for (const node of mutation.addedNodes) {
+              if (node.tagName === 'SCRIPT') {
+                if (node.type === (shimMode ? 'module-shim' : 'module'))
+                  processScript(node);
+                if (node.type === (shimMode ? 'importmap-shim' : 'importmap'))
+                  processImportMap(node);
+              }
+              else if (node.tagName === 'LINK' && node.rel === (shimMode ? 'modulepreload-shim' : 'modulepreload'))
+                processPreload(node);
+            }
+          }
+        }).observe(document, {childList: true, subtree: true});
+        processImportMaps();
+        processScriptsAndPreloads();
+        if (document.readyState === 'complete') {
+          readyStateCompleteCheck();
+        }
+        else {
+          async function readyListener() {
+            await initPromise;
+            processImportMaps();
+            if (document.readyState === 'complete') {
+              readyStateCompleteCheck();
+              document.removeEventListener('readystatechange', readyListener);
             }
-            else if (node.tagName === 'LINK' && node.rel === (shimMode ? 'modulepreload-shim' : 'modulepreload'))
-              processPreload(node);
           }
+          document.addEventListener('readystatechange', readyListener);
         }
-      }).observe(document, { childList: true, subtree: true });
-      processImportMaps();
-      processScriptsAndPreloads();
-      return undefined;
+      }
     }
+    return undefined;
   });
   let importMapPromise = initPromise;
   let firstPolyfillLoad = true;
@@ -500,7 +546,7 @@
     const source = load.S;
 
     // edge doesnt execute sibling in order, so we fix this up by ensuring all previous executions are explicit dependencies
-    let resolvedSource = edge && lastLoad ? `import '${lastLoad}';` : '';  
+    let resolvedSource = edge && lastLoad ? `import '${lastLoad}';` : '';
 
     if (!imports.length) {
       resolvedSource += source;
@@ -541,7 +587,7 @@
           resolvedSource += `/*${source.slice(start - 1, statementEnd)}*/${urlJsString(blobUrl)}`;
 
           // circular shell execution
-          if (!cycleShell && depLoad.s) {          
+          if (!cycleShell && depLoad.s) {
             resolvedSource += `;import*as m$_${depIndex} from'${depLoad.b}';import{u$_ as u$_${depIndex}}from'${depLoad.s}';u$_${depIndex}(m$_${depIndex})`;
             depLoad.s = undefined;
           }
@@ -628,8 +674,8 @@
       return { r: res.url, s: `export default ${await res.text()}`, t: 'json' };
     else if (cssContentType.test(contentType)) {
       return { r: res.url, s: `var s=new CSSStyleSheet();s.replaceSync(${
-      JSON.stringify((await res.text()).replace(cssUrlRegEx, (_match, quotes = '', relUrl1, relUrl2) => `url(${quotes}${resolveUrl(relUrl1 || relUrl2, url)}${quotes})`))
-    });export default s;`, t: 'css' };
+        JSON.stringify((await res.text()).replace(cssUrlRegEx, (_match, quotes = '', relUrl1, relUrl2) => `url(${quotes}${resolveUrl(relUrl1 || relUrl2, url)}${quotes})`))
+      });export default s;`, t: 'css' };
     }
     else
       throw Error(`Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`);
@@ -699,7 +745,7 @@
     load.L = load.f.then(async () => {
       let childFetchOpts = fetchOpts;
       load.d = (await Promise.all(load.a[0].map(async ({ n, d }) => {
-        if (d >= 0 && !supportsDynamicImport || d === 2 && !supportsImportMeta)
+        if (d >= 0 && !supportsDynamicImport || d === -2 && !supportsImportMeta)
           load.n = true;
         if (d !== -1 || !n) return;
         const { r, b } = await resolve(n, load.r || load.u);
@@ -750,26 +796,18 @@
       document.dispatchEvent(new Event('DOMContentLoaded'));
   }
   // this should always trigger because we assume es-module-shims is itself a domcontentloaded requirement
-  document.addEventListener('DOMContentLoaded', async () => {
-    await initPromise;
-    domContentLoadedCheck();
-    if (shimMode || !baselinePassthrough) {
-      processImportMaps();
-      processScriptsAndPreloads();
-    }
-  });
-
-  let readyStateCompleteCnt = 1;
-  if (document.readyState === 'complete') {
-    readyStateCompleteCheck();
-  }
-  else {
-    document.addEventListener('readystatechange', async () => {
-      processImportMaps();
+  if (hasDocument) {
+    document.addEventListener('DOMContentLoaded', async () => {
       await initPromise;
-      readyStateCompleteCheck();
+      domContentLoadedCheck();
+      if (shimMode || !baselinePassthrough) {
+        processImportMaps();
+        processScriptsAndPreloads();
+      }
     });
   }
+
+  let readyStateCompleteCnt = 1;
   function readyStateCompleteCheck () {
     if (--readyStateCompleteCnt === 0 && !noLoadEventRetriggers)
       document.dispatchEvent(new Event('readystatechange'));
@@ -809,14 +847,13 @@
       return;
     script.ep = true;
     // does this load block readystate complete
-    const isReadyScript = readyStateCompleteCnt > 0;
+    const isBlockingReadyScript = script.getAttribute('async') === null && readyStateCompleteCnt > 0;
     // does this load block DOMContentLoaded
     const isDomContentLoadedScript = domContentLoadedCnt > 0;
-    if (isReadyScript) readyStateCompleteCnt++;
+    if (isBlockingReadyScript) readyStateCompleteCnt++;
     if (isDomContentLoadedScript) domContentLoadedCnt++;
-    const blocks = script.getAttribute('async') === null && isReadyScript;
-    const loadPromise = topLevelLoad(script.src || baseUrl, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, blocks && lastStaticLoadPromise).catch(throwError);
-    if (blocks)
+    const loadPromise = topLevelLoad(script.src || baseUrl, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, isBlockingReadyScript && lastStaticLoadPromise).catch(throwError);
+    if (isBlockingReadyScript)
       lastStaticLoadPromise = loadPromise.then(readyStateCompleteCheck);
     if (isDomContentLoadedScript)
       loadPromise.then(domContentLoadedCheck);

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

@@ -1,14 +1,17 @@
-/* ES Module Shims Wasm 1.5.4 */
+/* ES Module Shims Wasm 1.5.7 */
 (function () {
 
+  const hasWindow = typeof window !== 'undefined';
+  const hasDocument = typeof document !== 'undefined';
+
   const noop = () => {};
 
-  const optionsScript = document.querySelector('script[type=esms-options]');
+  const optionsScript = hasDocument ? document.querySelector('script[type=esms-options]') : undefined;
 
   const esmsInitOptions = optionsScript ? JSON.parse(optionsScript.innerHTML) : {};
   Object.assign(esmsInitOptions, self.esmsInitOptions || {});
 
-  let shimMode = !!esmsInitOptions.shimMode;
+  let shimMode = hasDocument ? !!esmsInitOptions.shimMode : true;
 
   const importHook = globalHook(shimMode && esmsInitOptions.onimport);
   const resolveHook = globalHook(shimMode && esmsInitOptions.resolve);
@@ -17,18 +20,19 @@
 
   const skip = esmsInitOptions.skip ? new RegExp(esmsInitOptions.skip) : null;
 
-  let nonce = esmsInitOptions.nonce;
-
   const mapOverrides = esmsInitOptions.mapOverrides;
 
-  if (!nonce) {
+  let nonce = esmsInitOptions.nonce;
+  if (!nonce && hasDocument) {
     const nonceElement = document.querySelector('script[nonce]');
     if (nonceElement)
       nonce = nonceElement.nonce || nonceElement.getAttribute('nonce');
   }
 
   const onerror = globalHook(esmsInitOptions.onerror || noop);
-  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => console.log('%c^^ Module TypeError above is polyfilled and can be ignored ^^', 'font-weight:900;color:#391');
+  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => {
+    console.log('%c^^ Module TypeError above is polyfilled and can be ignored ^^', 'font-weight:900;color:#391');
+  };
 
   const { revokeBlobURLs, noLoadEventRetriggers, enforceIntegrity } = esmsInitOptions;
 
@@ -46,7 +50,11 @@
 
   const edge = !navigator.userAgentData && !!navigator.userAgent.match(/Edge\/\d+\.\d+/);
 
-  const baseUrl = document.baseURI;
+  const baseUrl = hasDocument
+    ? document.baseURI
+    : `${location.protocol}//${location.host}${location.pathname.includes('/') 
+    ? location.pathname.slice(0, location.pathname.lastIndexOf('/') + 1) 
+    : location.pathname}`;
 
   function createBlob (source, type = 'text/javascript') {
     return URL.createObjectURL(new Blob([source], { type }));
@@ -54,7 +62,7 @@
 
   const eoop = err => setTimeout(() => { throw err });
 
-  const throwError = err => { (window.reportError || window.safari && console.error || eoop)(err), void onerror(err); };
+  const throwError = err => { (self.reportError || hasWindow && window.safari && console.error || eoop)(err), void onerror(err); };
 
   function fromParent (parent) {
     return parent ? ` imported from ${parent}` : '';
@@ -232,6 +240,15 @@
 
   let supportsDynamicImportCheck = false;
 
+  // first check basic eval support
+  try {
+    eval('');
+  }
+  catch (e) {
+    throw new Error(`The ES Module Shims Wasm build will not work without eval support. Either use the alternative CSP-compatible build or make sure to add both the "unsafe-eval" and "unsafe-wasm-eval" CSP policies.`);
+  }
+
+  // polyfill dynamic import if not supported
   let dynamicImport;
   try {
     dynamicImport = (0, eval)('u=>import(u)');
@@ -239,7 +256,7 @@
   }
   catch (e) {}
 
-  if (!supportsDynamicImportCheck) {
+  if (hasDocument && !supportsDynamicImportCheck) {
     let err;
     window.addEventListener('error', _err => err = _err);
     dynamicImport = (url, { errUrl = url }) => {
@@ -247,7 +264,6 @@
       const src = createBlob(`import*as m from'${url}';self._esmsi=m;`);
       const s = Object.assign(document.createElement('script'), { type: 'module', src });
       s.setAttribute('noshim', '');
-      s.setAttribute('nonce', nonce);
       document.head.appendChild(s);
       return new Promise((resolve, reject) => {
         s.addEventListener('load', () => {
@@ -269,32 +285,43 @@
   let supportsJsonAssertions = false;
   let supportsCssAssertions = false;
 
-  let supportsImportMeta = false;
-  let supportsImportMaps = false;
-
+  let supportsImportMaps = hasDocument && HTMLScriptElement.supports ? HTMLScriptElement.supports('importmap') : false;
+  let supportsImportMeta = supportsImportMaps;
   let supportsDynamicImport = false;
 
-  const featureDetectionPromise = Promise.resolve(supportsDynamicImportCheck).then(_supportsDynamicImport => {
+  const featureDetectionPromise = Promise.resolve(supportsImportMaps || supportsDynamicImportCheck).then(_supportsDynamicImport => {
     if (!_supportsDynamicImport)
       return;
     supportsDynamicImport = true;
 
     return Promise.all([
-      dynamicImport(createBlob('import.meta')).then(() => supportsImportMeta = true, noop),
-      cssModulesEnabled && dynamicImport(createBlob('import"data:text/css,{}"assert{type:"css"}')).then(() => supportsCssAssertions = true, noop),
-      jsonModulesEnabled && dynamicImport(createBlob('import"data:text/json,{}"assert{type:"json"}')).then(() => supportsJsonAssertions = true, noop),
-      new Promise(resolve => {
-        self._$s = v => {
-          document.head.removeChild(iframe);
-          if (v) supportsImportMaps = true;
-          delete self._$s;
-          resolve();
-        };
+      supportsImportMaps || dynamicImport(createBlob('import.meta')).then(() => supportsImportMeta = true, noop),
+      cssModulesEnabled && dynamicImport(createBlob(`import"${createBlob('', 'text/css')}"assert{type:"css"}`)).then(() => supportsCssAssertions = true, noop),
+      jsonModulesEnabled && dynamicImport(createBlob(`import"${createBlob('{}', 'text/json')}"assert{type:"json"}`)).then(() => supportsJsonAssertions = true, noop),
+      supportsImportMaps || hasDocument && (HTMLScriptElement.supports || new Promise(resolve => {
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
-        iframe.srcdoc = `<script type=importmap nonce="${nonce}">{"imports":{"x":"data:text/javascript,"}}<${''}/script><script nonce="${nonce}">import('x').then(()=>1,()=>0).then(v=>parent._$s(v))<${''}/script>`;
+        iframe.setAttribute('nonce', nonce);
+        // setting src to a blob URL results in a navigation event in webviews
+        // setting srcdoc is not supported in React native webviews on iOS
+        // therefore, we need to first feature detect srcdoc support
+        iframe.srcdoc = `<!doctype html><script nonce="${nonce}"><${''}/script>`;
         document.head.appendChild(iframe);
-      })
+        iframe.contentWindow.addEventListener('DOMContentLoaded', () => {
+          self._$s = v => {
+            document.head.removeChild(iframe);
+            supportsImportMaps = v;
+            delete self._$s;
+            resolve();
+          };
+          const supportsSrcDoc = iframe.contentDocument.head.childNodes.length > 0;
+          const importMapTest = `<!doctype html><script type=importmap nonce="${nonce}">{"imports":{"x":"${createBlob('')}"}<${''}/script><script nonce="${nonce}">import('x').catch(() => {}).then(v=>parent._$s(!!v))<${''}/script>`;
+          if (supportsSrcDoc)
+            iframe.srcdoc = importMapTest;
+          else
+            iframe.contentDocument.write(importMapTest);
+        });
+      }))
     ]);
   });
 
@@ -331,7 +358,9 @@
     await initPromise;
     if (importHook) await importHook(id, typeof args[1] !== 'string' ? args[1] : {}, parentUrl);
     if (acceptingImportMaps || shimMode || !baselinePassthrough) {
-      processImportMaps();
+      if (hasDocument)
+        processImportMaps();
+
       if (!shimMode)
         acceptingImportMaps = false;
     }
@@ -361,6 +390,10 @@
 
   importShim.resolve = resolveSync;
   importShim.getImportMap = () => JSON.parse(JSON.stringify(importMap));
+  importShim.addImportMap = importMapIn => {
+    if (!shimMode) throw new Error('Unsupported in polyfill mode.');
+    importMap = resolveAndComposeImportMap(importMapIn, baseUrl, importMap);
+  };
 
   const registry = importShim._r = {};
 
@@ -399,26 +432,47 @@
       }
     }
     baselinePassthrough = esmsInitOptions.polyfillEnable !== true && supportsDynamicImport && supportsImportMeta && supportsImportMaps && (!jsonModulesEnabled || supportsJsonAssertions) && (!cssModulesEnabled || supportsCssAssertions) && !importMapSrcOrLazy && !false;
-    if (shimMode || !baselinePassthrough) {
-      new MutationObserver(mutations => {
-        for (const mutation of mutations) {
-          if (mutation.type !== 'childList') continue;
-          for (const node of mutation.addedNodes) {
-            if (node.tagName === 'SCRIPT') {
-              if (node.type === (shimMode ? 'module-shim' : 'module'))
-                processScript(node);
-              if (node.type === (shimMode ? 'importmap-shim' : 'importmap'))
-                processImportMap(node);
+    if (hasDocument) {
+      if (!supportsImportMaps) {
+        const supports = HTMLScriptElement.supports || (type => type === 'classic' || type === 'module');
+        HTMLScriptElement.supports = type => type === 'importmap' || supports(type);
+      }
+
+      if (shimMode || !baselinePassthrough) {
+        new MutationObserver(mutations => {
+          for (const mutation of mutations) {
+            if (mutation.type !== 'childList') continue;
+            for (const node of mutation.addedNodes) {
+              if (node.tagName === 'SCRIPT') {
+                if (node.type === (shimMode ? 'module-shim' : 'module'))
+                  processScript(node);
+                if (node.type === (shimMode ? 'importmap-shim' : 'importmap'))
+                  processImportMap(node);
+              }
+              else if (node.tagName === 'LINK' && node.rel === (shimMode ? 'modulepreload-shim' : 'modulepreload'))
+                processPreload(node);
             }
-            else if (node.tagName === 'LINK' && node.rel === (shimMode ? 'modulepreload-shim' : 'modulepreload'))
-              processPreload(node);
           }
+        }).observe(document, {childList: true, subtree: true});
+        processImportMaps();
+        processScriptsAndPreloads();
+        if (document.readyState === 'complete') {
+          readyStateCompleteCheck();
         }
-      }).observe(document, { childList: true, subtree: true });
-      processImportMaps();
-      processScriptsAndPreloads();
-      return init;
+        else {
+          async function readyListener() {
+            await initPromise;
+            processImportMaps();
+            if (document.readyState === 'complete') {
+              readyStateCompleteCheck();
+              document.removeEventListener('readystatechange', readyListener);
+            }
+          }
+          document.addEventListener('readystatechange', readyListener);
+        }
+      }
     }
+    return init;
   });
   let importMapPromise = initPromise;
   let firstPolyfillLoad = true;
@@ -498,7 +552,7 @@
     const source = load.S;
 
     // edge doesnt execute sibling in order, so we fix this up by ensuring all previous executions are explicit dependencies
-    let resolvedSource = edge && lastLoad ? `import '${lastLoad}';` : '';  
+    let resolvedSource = edge && lastLoad ? `import '${lastLoad}';` : '';
 
     if (!imports.length) {
       resolvedSource += source;
@@ -539,7 +593,7 @@
           resolvedSource += `/*${source.slice(start - 1, statementEnd)}*/${urlJsString(blobUrl)}`;
 
           // circular shell execution
-          if (!cycleShell && depLoad.s) {          
+          if (!cycleShell && depLoad.s) {
             resolvedSource += `;import*as m$_${depIndex} from'${depLoad.b}';import{u$_ as u$_${depIndex}}from'${depLoad.s}';u$_${depIndex}(m$_${depIndex})`;
             depLoad.s = undefined;
           }
@@ -626,8 +680,8 @@
       return { r: res.url, s: `export default ${await res.text()}`, t: 'json' };
     else if (cssContentType.test(contentType)) {
       return { r: res.url, s: `var s=new CSSStyleSheet();s.replaceSync(${
-      JSON.stringify((await res.text()).replace(cssUrlRegEx, (_match, quotes = '', relUrl1, relUrl2) => `url(${quotes}${resolveUrl(relUrl1 || relUrl2, url)}${quotes})`))
-    });export default s;`, t: 'css' };
+        JSON.stringify((await res.text()).replace(cssUrlRegEx, (_match, quotes = '', relUrl1, relUrl2) => `url(${quotes}${resolveUrl(relUrl1 || relUrl2, url)}${quotes})`))
+      });export default s;`, t: 'css' };
     }
     else
       throw Error(`Unsupported Content-Type "${contentType}" loading ${url}${fromParent(parent)}. Modules must be served with a valid MIME type like application/javascript.`);
@@ -697,7 +751,7 @@
     load.L = load.f.then(async () => {
       let childFetchOpts = fetchOpts;
       load.d = (await Promise.all(load.a[0].map(async ({ n, d }) => {
-        if (d >= 0 && !supportsDynamicImport || d === 2 && !supportsImportMeta)
+        if (d >= 0 && !supportsDynamicImport || d === -2 && !supportsImportMeta)
           load.n = true;
         if (d !== -1 || !n) return;
         const { r, b } = await resolve(n, load.r || load.u);
@@ -748,26 +802,18 @@
       document.dispatchEvent(new Event('DOMContentLoaded'));
   }
   // this should always trigger because we assume es-module-shims is itself a domcontentloaded requirement
-  document.addEventListener('DOMContentLoaded', async () => {
-    await initPromise;
-    domContentLoadedCheck();
-    if (shimMode || !baselinePassthrough) {
-      processImportMaps();
-      processScriptsAndPreloads();
-    }
-  });
-
-  let readyStateCompleteCnt = 1;
-  if (document.readyState === 'complete') {
-    readyStateCompleteCheck();
-  }
-  else {
-    document.addEventListener('readystatechange', async () => {
-      processImportMaps();
+  if (hasDocument) {
+    document.addEventListener('DOMContentLoaded', async () => {
       await initPromise;
-      readyStateCompleteCheck();
+      domContentLoadedCheck();
+      if (shimMode || !baselinePassthrough) {
+        processImportMaps();
+        processScriptsAndPreloads();
+      }
     });
   }
+
+  let readyStateCompleteCnt = 1;
   function readyStateCompleteCheck () {
     if (--readyStateCompleteCnt === 0 && !noLoadEventRetriggers)
       document.dispatchEvent(new Event('readystatechange'));
@@ -807,14 +853,13 @@
       return;
     script.ep = true;
     // does this load block readystate complete
-    const isReadyScript = readyStateCompleteCnt > 0;
+    const isBlockingReadyScript = script.getAttribute('async') === null && readyStateCompleteCnt > 0;
     // does this load block DOMContentLoaded
     const isDomContentLoadedScript = domContentLoadedCnt > 0;
-    if (isReadyScript) readyStateCompleteCnt++;
+    if (isBlockingReadyScript) readyStateCompleteCnt++;
     if (isDomContentLoadedScript) domContentLoadedCnt++;
-    const blocks = script.getAttribute('async') === null && isReadyScript;
-    const loadPromise = topLevelLoad(script.src || baseUrl, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, blocks && lastStaticLoadPromise).catch(throwError);
-    if (blocks)
+    const loadPromise = topLevelLoad(script.src || baseUrl, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, isBlockingReadyScript && lastStaticLoadPromise).catch(throwError);
+    if (isBlockingReadyScript)
       lastStaticLoadPromise = loadPromise.then(readyStateCompleteCheck);
     if (isDomContentLoadedScript)
       loadPromise.then(domContentLoadedCheck);

package/index.d.ts

@@ -18,7 +18,7 @@ interface ESMSInitOptions {
   /**
    * Disable retriggering of document readystate
    */
-  noLoadEventRetriggers: true,
+  noLoadEventRetriggers: true;
 
   /**
    * #### Skip Processing Stability
@@ -45,24 +45,28 @@ interface ESMSInitOptions {
 
   /**
    * #### Error hook
-   * 
+   *
    * Register a callback for any ES Module Shims module errors.
-   * 
+   *
    */
   onerror: (e: any) => any;
 
   /**
    * #### Resolve Hook
-   * 
+   *
    * Only supported in Shim Mode.
-   * 
+   *
    * Provide a custom resolver function.
    */
-  resolve: (id: string, parentUrl: string, resolve: (id: string, parentUrl: string) => string) => string | Promise<string>;
+  resolve: (
+    id: string,
+    parentUrl: string,
+    resolve: (id: string, parentUrl: string) => string
+  ) => string | Promise<string>;
 
   /**
    * #### Fetch Hook
-   * 
+   *
    * Only supported in Shim Mode.
    *
    * > Stability: Non-spec feature
@@ -126,14 +130,19 @@ interface ESMSInitOptions {
 
   /**
    * #### Revoke Blob URLs
-   * 
+   *
    * Set to *true* to cleanup blob URLs from memory after execution.
    * Can cost some compute time for large loads.
-   * 
+   *
    */
   revokeBlobURLs: boolean;
 }
 
+interface ImportMap {
+  imports: Record<string, string>;
+  scopes: Record<string, Record<string, string>>;
+}
+
 /**
  * Dynamic import(...) within any modules loaded will be rewritten as
  * importShim(...) automatically providing full support for all es-module-shims
@@ -151,6 +160,12 @@ declare function importShim<Default, Exports extends object>(
   parentUrl?: string
 ): Promise<{ default: Default } & Exports>;
 
+declare namespace importShim {
+  const resolve: (id: string, parentURL?: string) => string;
+  const addImportMap: (importMap: Partial<ImportMap>) => void;
+  const getImportMap: () => ImportMap;
+}
+
 interface Window {
   esmsInitOptions?: ESMSInitOptions;
   importShim: typeof importShim;

package/package.json

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