es-module-shims 1.5.4 → 1.5.5

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.5/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">
@@ -675,6 +675,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,4 +1,4 @@
-/* ES Module Shims 1.5.4 */
+/* ES Module Shims 1.5.5 */
 (function () {
 
   const noop = () => {};
@@ -28,7 +28,9 @@
   }
 
   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;
 
@@ -285,7 +287,7 @@
       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 => {
+      HTMLScriptElement.supports ? supportsImportMaps = HTMLScriptElement.supports('importmap') : new Promise(resolve => {
         self._$s = v => {
           document.head.removeChild(iframe);
           if (v) supportsImportMaps = true;
@@ -294,6 +296,7 @@
         };
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
+        iframe.setAttribute('nonce', nonce);
         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>`;
         document.head.appendChild(iframe);
       })
@@ -401,6 +404,10 @@
       }
     }
     baselinePassthrough = esmsInitOptions.polyfillEnable !== true && supportsDynamicImport && supportsImportMeta && supportsImportMaps && (!jsonModulesEnabled || supportsJsonAssertions) && (!cssModulesEnabled || supportsCssAssertions) && !importMapSrcOrLazy && !false;
+    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) {
@@ -419,6 +426,20 @@
       }).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);
+          }
+        }
+        document.addEventListener('readystatechange', readyListener);
+      }
       return undefined;
     }
   });
@@ -760,16 +781,6 @@
   });
 
   let readyStateCompleteCnt = 1;
-  if (document.readyState === 'complete') {
-    readyStateCompleteCheck();
-  }
-  else {
-    document.addEventListener('readystatechange', async () => {
-      processImportMaps();
-      await initPromise;
-      readyStateCompleteCheck();
-    });
-  }
   function readyStateCompleteCheck () {
     if (--readyStateCompleteCnt === 0 && !noLoadEventRetriggers)
       document.dispatchEvent(new Event('readystatechange'));
@@ -809,14 +820,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,4 +1,4 @@
-/* ES Module Shims Wasm 1.5.4 */
+/* ES Module Shims Wasm 1.5.5 */
 (function () {
 
   const noop = () => {};
@@ -28,7 +28,9 @@
   }
 
   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;
 
@@ -283,7 +285,7 @@
       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 => {
+      HTMLScriptElement.supports ? supportsImportMaps = HTMLScriptElement.supports('importmap') : new Promise(resolve => {
         self._$s = v => {
           document.head.removeChild(iframe);
           if (v) supportsImportMaps = true;
@@ -292,6 +294,7 @@
         };
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
+        iframe.setAttribute('nonce', nonce);
         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>`;
         document.head.appendChild(iframe);
       })
@@ -399,6 +402,10 @@
       }
     }
     baselinePassthrough = esmsInitOptions.polyfillEnable !== true && supportsDynamicImport && supportsImportMeta && supportsImportMaps && (!jsonModulesEnabled || supportsJsonAssertions) && (!cssModulesEnabled || supportsCssAssertions) && !importMapSrcOrLazy && !false;
+    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) {
@@ -417,6 +424,20 @@
       }).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);
+          }
+        }
+        document.addEventListener('readystatechange', readyListener);
+      }
       return init;
     }
   });
@@ -758,16 +779,6 @@
   });
 
   let readyStateCompleteCnt = 1;
-  if (document.readyState === 'complete') {
-    readyStateCompleteCheck();
-  }
-  else {
-    document.addEventListener('readystatechange', async () => {
-      processImportMaps();
-      await initPromise;
-      readyStateCompleteCheck();
-    });
-  }
   function readyStateCompleteCheck () {
     if (--readyStateCompleteCnt === 0 && !noLoadEventRetriggers)
       document.dispatchEvent(new Event('readystatechange'));
@@ -807,14 +818,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/package.json

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