importmap-rails 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4edb628879c46f984d95884b643013077f408a899a1633f7007ef3274393b65
-  data.tar.gz: 627f45fe257131d3432d1f2cf210eb0fd133e286c293b101cfaf5b5a77840a47
+  metadata.gz: 1ad1aceb19e574cd589057539db280a47635d950f02b927fe6cdad83b86ba43e
+  data.tar.gz: e6b47536890332ef62639c37cb19ea82b73cc32a51baa3904e1e32c78aa2203c
 SHA512:
-  metadata.gz: cd44cdb515fed52817f75d453e274846979e9649e997bd4b2b67689a6761b294c33fdf1b7a9909042da0da2b99d11cbb1ad1a626519a2f528aa4cab5b61869ae
-  data.tar.gz: 301873edf08bb1c486dcdbebe65afbe5b3ff2d43fd9a78c51b9791e07152ae0742e93fcfd92fb936e2ce97adacc3e9ff3f6d2b3eacd15683e153e1c8d457997d
+  metadata.gz: 27c39e5a9a516c97a601f86deb47c93f4653dcbd1f1f774ea3256065c15addf1913338d74f44a4549b0e56d246f8b68b3a05b747b0ccf52937aa64a947886a72
+  data.tar.gz: e05d2fc49ec7a8955fda9fbbda78fa717399d8c3cae9d1fef0c5a94957b6678e45cfd8d1eabf2d78516f94ecfb4458c32c637ae59e1c03466f0a7bfaacd9f5ba

data/app/assets/javascripts/es-module-shims.js

@@ -1 +1 @@
-//= require ./es-module-shims@0.12.6.js
+//= require ./es-module-shims@0.12.7.js

data/app/assets/javascripts/{es-module-shims@0.12.6.js → es-module-shims@0.12.7.js}

@@ -1,4 +1,4 @@
-/* ES Module Shims 0.12.6 */
+/* ES Module Shims 0.12.7 */
 (function () {
   // Bail on all shimming for Chrome until https://github.com/guybedford/es-module-shims/issues/150
   if (navigator.userAgent.match("Chrome")) return
@@ -271,7 +271,7 @@
 
   let waitingForImportMapsInterval;
   let firstTopLevelProcess = true;
-  async function topLevelLoad (url, fetchOpts, source, nativelyLoaded) {
+  async function topLevelLoad (url, fetchOpts, source, nativelyLoaded, lastStaticLoadPromise) {
     // no need to even fetch if we have feature support
     await featureDetectionPromise;
     if (waitingForImportMapsInterval > 0) {
@@ -285,7 +285,7 @@
     await importMapPromise;
     // early analysis opt-out
     if (nativelyLoaded && supportsDynamicImport && supportsImportMeta && supportsImportMaps && supportsJsonAssertions && supportsCssAssertions && !importMapSrcOrLazy) {
-      // dont reexec inline for polyfills -> just return null
+      // dont reexec inline for polyfills -> just return null (since no module id for executed inline module scripts)
       return source && nativelyLoaded ? null : dynamicImport(source ? createBlob(source) : url);
     }
     await init;
@@ -294,17 +294,30 @@
     await loadAll(load, seen);
     lastLoad = undefined;
     resolveDeps(load, seen);
+    await lastStaticLoadPromise;
     if (source && !shimMode && !load.n) {
+      if (lastStaticLoadPromise) {
+        didExecForReadyPromise = true;
+        if (domContentLoaded)
+          didExecForDomContentLoaded = true;
+      }
       const module = dynamicImport(createBlob(source));
       if (shouldRevokeBlobURLs) revokeObjectURLs(Object.keys(seen));
       return module;
     }
     const module = await dynamicImport(load.b);
+    if (lastStaticLoadPromise && (!nativelyLoaded || load.b !== load.u)) {
+      didExecForReadyPromise = true;
+      if (domContentLoaded)
+        didExecForDomContentLoaded = true;
+    }
     // if the top-level load is a shell, run its update function
     if (load.s) {
       (await dynamicImport(load.s)).u$_(module);
     }
     if (shouldRevokeBlobURLs) revokeObjectURLs(Object.keys(seen));
+    // when tla is supported, this should return the tla promise as an actual handle
+    // so readystate can still correspond to the sync subgraph exec completions
     return module;
   }
 
@@ -354,6 +367,7 @@
   const skip = esmsInitOptions.skip || /^https?:\/\/(cdn\.skypack\.dev|jspm\.dev)\//;
   const onerror = esmsInitOptions.onerror || ((e) => { throw e; });
   const shouldRevokeBlobURLs = esmsInitOptions.revokeBlobURLs;
+  const noLoadEventRetriggers = esmsInitOptions.noLoadEventRetriggers;
 
   function urlJsString (url) {
     return `'${url.replace(/'/g, "\\'")}'`;
@@ -550,7 +564,7 @@
     return load;
   }
 
-  async function processScripts () {
+  function processScripts () {
     if (waitingForImportMapsInterval > 0 && document.readyState !== 'loading') {
       clearTimeout(waitingForImportMapsInterval);
       waitingForImportMapsInterval = 0;
@@ -558,7 +572,7 @@
     for (const link of document.querySelectorAll('link[rel="modulepreload"]'))
       processPreload(link);
     for (const script of document.querySelectorAll('script[type="module-shim"],script[type="importmap-shim"],script[type="module"],script[type="importmap"]'))
-      await processScript(script);
+      processScript(script);
   }
 
   function getFetchOpts (script) {
@@ -576,12 +590,29 @@
     return fetchOpts;
   }
 
-  async function processScript (script, dynamic) {
+  let staticLoadCnt = 0;
+  let didExecForReadyPromise = false;
+  let didExecForDomContentLoaded = false;
+  let lastStaticLoadPromise = Promise.resolve();
+  let domContentLoaded = false;
+  document.addEventListener('DOMContentLoaded', () => domContentLoaded = true);
+  function staticLoadCheck () {
+    staticLoadCnt--;
+    if (staticLoadCnt === 0 && !noLoadEventRetriggers) {
+      if (didExecForDomContentLoaded)
+        document.dispatchEvent(new Event('DOMContentLoaded'));
+      if (didExecForReadyPromise && document.readyState === 'complete')
+        document.dispatchEvent(new Event('readystatechange'));
+    }
+  }
+
+  function processScript (script, dynamic) {
     if (script.ep) // ep marker = script processed
       return;
     const shim = script.type.endsWith('-shim');
     if (shim) shimMode = true;
-    const type = shim ? script.type.slice(0, -5) : script.type;
+    const type = shimMode ? script.type.slice(0, -5) : script.type;
+    // dont process module scripts in shim mode or noshim module scripts in polyfill mode
     if (!shim && shimMode || script.getAttribute('noshim') !== null)
       return;
     // empty inline scripts sometimes show before domready
@@ -589,7 +620,14 @@
       return;
     script.ep = true;
     if (type === 'module') {
-      await topLevelLoad(script.src || `${baseUrl}?${id++}`, getFetchOpts(script), !script.src && script.innerHTML, !shim).catch(onerror);
+      const isReadyScript = document.readyState !== 'complete';
+      if (isReadyScript) staticLoadCnt++;
+      const p = topLevelLoad(script.src || `${baseUrl}?${id++}`, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, isReadyScript && lastStaticLoadPromise);
+      p.catch(onerror);
+      if (isReadyScript) {
+        lastStaticLoadPromise = p.catch(staticLoadCheck);
+        p.then(staticLoadCheck);
+      }
     }
     else if (type === 'importmap') {
       importMapPromise = importMapPromise.then(async () => {
@@ -655,4 +693,4 @@
     waitingForImportMapsInterval = setInterval(processScripts, 20);
   }
 
-}());
+}());

data/lib/importmap/version.rb

@@ -1,3 +1,3 @@
 module Importmap
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/es-module-shims.js
-- app/assets/javascripts/es-module-shims@0.12.6.js
+- app/assets/javascripts/es-module-shims@0.12.7.js
 - app/helpers/importmap/importmap_tags_helper.rb
 - lib/importmap-rails.rb
 - lib/importmap/engine.rb