importmap-rails 0.7.0 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 041d46b392f2efffb635e2f9f25618564d6dd2f10b7fc79f1c20a1deb300ba91
-  data.tar.gz: c83a93b7c61426faa75190fdd9582cd05b4cd1f87a1a85d1ae1b0d19a5603d45
+  metadata.gz: 6ce5ca88f369995c2b29b27b38e5f3539101b8c314237825cf5dc4bc1a653e32
+  data.tar.gz: a88e63335529c55217e121f9fabbff574da4010bbeecf948a7ec3f4d3ec505ce
 SHA512:
-  metadata.gz: c1c6ac59101df2d7fadf3a9dc7e72bb5cfff9cfc74aa9e5672a3c5a3c08aaa29e976dbd9dbddd557b0f751531016ad196bf966c2899984bd16f8275e7968a49e
-  data.tar.gz: f9b6cb16445170034a0ca87f08d08321c8ab571dbaf851e0d7e561f8051bd6da11dcd0431e7b1ba4cc8fd0bf5b5acd5f52ecd4198a777cf0e3a450f68b11eb25
+  metadata.gz: 64ce4de1dd05d813987bbb663b60ef6023624eaf092d8578a87691998ceef32fb5d39fca5fd86cd8fd33a87d197bc28e345901d4e9cacbef235d953e5ea6aa70
+  data.tar.gz: b047cc3f19efc2d462fdc456b9c5dc95581e2bc79e53196575a096771a51a83e7334568f3eceda567775acd254d49437d34156b4432f08b942651052c059352b

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

@@ -1,8 +1,6 @@
-/* ES Module Shims CSP 0.15.1 */
+/* ES Module Shims 1.0.4 */
 (function () {
 
-  Promise.resolve();
-
   const edge = navigator.userAgent.match(/Edge\/\d\d\.\d+$/);
 
   let baseUrl;
@@ -203,7 +201,7 @@
   let shimMode = !!esmsInitOptions$1.shimMode;
   const resolveHook = shimMode && esmsInitOptions$1.resolve;
 
-  const skip = esmsInitOptions$1.skip ? new RegExp(esmsInitOptions$1.skip) : /^https:\/\/(cdn\.skypack\.dev|jspm\.dev)\//;
+  const skip = esmsInitOptions$1.skip ? new RegExp(esmsInitOptions$1.skip) : null;
 
   let nonce = esmsInitOptions$1.nonce;
 
@@ -331,7 +329,35 @@
 
   let importMap = { imports: {}, scopes: {} };
   let importMapSrcOrLazy = false;
-  let importMapPromise = featureDetectionPromise;
+  let baselinePassthrough;
+
+  const initPromise = featureDetectionPromise.then(() => {
+    baselinePassthrough = supportsDynamicImport && supportsImportMeta && supportsImportMaps && (!jsonModulesEnabled || supportsJsonAssertions) && (!cssModulesEnabled || supportsCssAssertions) && !importMapSrcOrLazy && !false;
+    // shim mode is determined on initialization, no late shim mode
+    if (!shimMode && document.querySelectorAll('script[type="module-shim"],script[type="importmap-shim"]').length)
+      setShimMode();
+    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 (!shimMode && node.type === 'module' || shimMode && node.type === 'module-shim')
+                processScript(node);
+              if (!shimMode && node.type === 'importmap' || shimMode && node.type === 'importmap-shim')
+                processImportMap(node);
+            }
+            else if (node.tagName === 'LINK' && node.rel === 'modulepreload')
+              processPreload(node);
+          }
+        }
+      }).observe(document, { childList: true, subtree: true });
+      processImportMaps();
+      processScriptsAndPreloads();
+      return undefined;
+    }
+  });
+  let importMapPromise = initPromise;
 
   let acceptingImportMaps = true;
   let nativeAcceptingImportMaps = true;
@@ -346,21 +372,20 @@
     }
     await importMapPromise;
     // early analysis opt-out - no need to even fetch if we have feature support
-    if (!shimMode && supportsDynamicImport && supportsImportMeta && supportsImportMaps && (!jsonModulesEnabled || supportsJsonAssertions) && (!cssModulesEnabled || supportsCssAssertions) && !importMapSrcOrLazy) {
+    if (!shimMode && baselinePassthrough) {
       // for polyfill case, only dynamic import needs a return value here, and dynamic import will never pass nativelyLoaded
       if (nativelyLoaded)
         return null;
       await lastStaticLoadPromise;
       return dynamicImport(source ? createBlob(source) : url, { errUrl: url || source });
     }
-    await undefined;
     const load = getOrCreateLoad(url, fetchOpts, source);
     const seen = {};
     await loadAll(load, seen);
     lastLoad = undefined;
     resolveDeps(load, seen);
     await lastStaticLoadPromise;
-    if (source && !shimMode && !load.n) {
+    if (source && !shimMode && !load.n && !false) {
       const module = await dynamicImport(createBlob(source), { errUrl: source });
       if (revokeBlobURLs) revokeObjectURLs(Object.keys(seen));
       return module;
@@ -393,7 +418,17 @@
   }
 
   async function importShim (id, parentUrl = baseUrl, _assertion) {
-    processScripts();
+    // needed for shim check
+    await initPromise;
+    if (acceptingImportMaps || shimMode || !baselinePassthrough) {
+      processImportMaps();
+      if (!shimMode) {
+        acceptingImportMaps = false;
+      }
+      else {
+        nativeAcceptingImportMaps = false;
+      }
+    }
     await importMapPromise;
     return topLevelLoad((await resolve(id, parentUrl)).r || throwUnresolved(id, parentUrl), { credentials: 'same-origin' });
   }
@@ -403,7 +438,6 @@
   const meta = {};
 
   async function importMetaResolve (id, parentUrl = this.url) {
-    await importMapPromise;
     return (await resolve(id, `${parentUrl}`)).r || throwUnresolved(id, parentUrl);
   }
 
@@ -490,17 +524,11 @@
       resolvedSource += source.slice(lastIndex);
     }
 
-    resolvedSource = resolvedSource.replace(/\/\/# sourceMappingURL=(.*)\s*$/, (match, url) => {
-      return match.replace(url, new URL(url, load.r));
-    });
+    resolvedSource = resolvedSource.replace(/\/\/# sourceMappingURL=(.*)\s*$/, (match, url) => match.replace(url, () => new URL(url, load.r)));
     let hasSourceURL = false;
-    resolvedSource = resolvedSource.replace(/\/\/# sourceURL=(.*)\s*$/, (match, url) => {
-      hasSourceURL = true;
-      return match.replace(url, new URL(url, load.r));
-    });
-    if (!hasSourceURL) {
+    resolvedSource = resolvedSource.replace(/\/\/# sourceURL=(.*)\s*$/, (match, url) => (hasSourceURL = true, match.replace(url, () => new URL(url, load.r))));
+    if (!hasSourceURL)
       resolvedSource += '\n//# sourceURL=' + load.r;
-    }
 
     load.b = lastLoad = createBlob(resolvedSource);
     load.S = undefined;
@@ -617,7 +645,7 @@
         if (d !== -1) return;
         if (!r)
           throwUnresolved(n, load.r || load.u);
-        if (skip.test(r)) return { b: r };
+        if (skip && skip.test(r)) return { b: r };
         if (childFetchOpts.integrity)
           childFetchOpts = Object.assign({}, childFetchOpts, { integrity: undefined });
         return getOrCreateLoad(r, childFetchOpts).f;
@@ -627,22 +655,16 @@
     return load;
   }
 
-  const scriptQuery = 'script[type="module-shim"],script[type="importmap-shim"],script[type="module"],script[type="importmap"]';
-  const preloadQuery = 'link[rel="modulepreload"]';
-
-  function processScripts () {
-    for (const link of document.querySelectorAll(preloadQuery))
-      processPreload(link);
-    const scripts = document.querySelectorAll(scriptQuery);
-    // early shim mode opt-in
-    if (!shimMode) {
-      for (const script of scripts) {
-        if (script.type.endsWith('-shim'))
-          setShimMode();
-      }
-    }
-    for (const script of scripts)
+  function processScriptsAndPreloads () {
+    for (const script of document.querySelectorAll(shimMode ? 'script[type="module-shim"]' : 'script[type="module"]'))
       processScript(script);
+    for (const link of document.querySelectorAll('link[rel="modulepreload"]'))
+      processPreload(link);
+  }
+
+  function processImportMaps () {
+    for (const script of document.querySelectorAll(shimMode ? 'script[type="importmap-shim"]' : 'script[type="importmap"]'))
+      processImportMap(script);
   }
 
   function getFetchOpts (script) {
@@ -668,73 +690,74 @@
       document.dispatchEvent(new Event('DOMContentLoaded'));
   }
   // this should always trigger because we assume es-module-shims is itself a domcontentloaded requirement
-  document.addEventListener('DOMContentLoaded', domContentLoadedCheck);
+  document.addEventListener('DOMContentLoaded', async () => {
+    await initPromise;
+    domContentLoadedCheck();
+    if (shimMode || !baselinePassthrough) {
+      processImportMaps();
+      processScriptsAndPreloads();
+    }
+  });
 
   let readyStateCompleteCnt = 1;
   if (document.readyState === 'complete')
     readyStateCompleteCheck();
   else
-    document.addEventListener('readystatechange', readyStateCompleteCheck);
+    document.addEventListener('readystatechange', async () => {
+      await initPromise;
+      readyStateCompleteCheck();
+    });
   function readyStateCompleteCheck () {
     if (--readyStateCompleteCnt === 0 && !noLoadEventRetriggers)
       document.dispatchEvent(new Event('readystatechange'));
   }
 
-  function processScript (script) {
-    if (script.ep) // ep marker = script processed
+  function processImportMap (script) {
+    if (!acceptingImportMaps)
       return;
-    const shim = script.type.endsWith('-shim');
-    if (shim && !shimMode) setShimMode();
-    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)
+    if (script.ep) // ep marker = script processed
       return;
     // empty inline scripts sometimes show before domready
     if (!script.src && !script.innerHTML)
       return;
     script.ep = true;
-    if (type === 'module') {
-      // does this load block readystate complete
-      const isReadyScript = readyStateCompleteCnt > 0;
-      // does this load block DOMContentLoaded
-      const isDomContentLoadedScript = domContentLoadedCnt > 0;
-      if (isReadyScript) readyStateCompleteCnt++;
-      if (isDomContentLoadedScript) domContentLoadedCnt++;
-      const loadPromise = topLevelLoad(script.src || `${baseUrl}?${id++}`, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, isReadyScript && lastStaticLoadPromise).then(() => {
-        if (!noLoadEventRetriggers)
-          triggerLoadEvent(script);
-      }).catch(e => {
-        if (!noLoadEventRetriggers)
-          triggerLoadEvent(script);
-        // setTimeout(() => { throw e; });
-        onerror(e);
-      });
-      if (isReadyScript)
-        lastStaticLoadPromise = loadPromise.then(readyStateCompleteCheck);
-      if (isDomContentLoadedScript)
-        loadPromise.then(domContentLoadedCheck);
+    // we dont currently support multiple, external or dynamic imports maps in polyfill mode to match native
+    if (script.src || !nativeAcceptingImportMaps) {
+      if (!shimMode)
+        return;
+      importMapSrcOrLazy = true;
     }
-    else if (acceptingImportMaps && type === 'importmap') {
-      // we dont currently support multiple, external or dynamic imports maps in polyfill mode to match native
-      if (script.src || !nativeAcceptingImportMaps) {
-        if (!shimMode)
-          return;
-        importMapSrcOrLazy = true;
-      }
-      if (!shimMode) {
-        acceptingImportMaps = false;
-      }
-      else {
-        nativeAcceptingImportMaps = false;
-      }
-      importMapPromise = importMapPromise.then(async () => {
-        importMap = resolveAndComposeImportMap(script.src ? await (await fetchHook(script.src)).json() : JSON.parse(script.innerHTML), script.src || baseUrl, importMap);
-      });
+    if (!shimMode) {
+      acceptingImportMaps = false;
+    }
+    else {
+      nativeAcceptingImportMaps = false;
     }
+    importMapPromise = importMapPromise.then(async () => {
+      importMap = resolveAndComposeImportMap(script.src ? await (await fetchHook(script.src)).json() : JSON.parse(script.innerHTML), script.src || baseUrl, importMap);
+    });
   }
 
-  function triggerLoadEvent (script) {
-    script.dispatchEvent(new Event('load'));
+  function processScript (script) {
+    if (script.ep) // ep marker = script processed
+      return;
+    if (script.getAttribute('noshim') !== null)
+      return;
+    // empty inline scripts sometimes show before domready
+    if (!script.src && !script.innerHTML)
+      return;
+    script.ep = true;
+    // does this load block readystate complete
+    const isReadyScript = readyStateCompleteCnt > 0;
+    // does this load block DOMContentLoaded
+    const isDomContentLoadedScript = domContentLoadedCnt > 0;
+    if (isReadyScript) readyStateCompleteCnt++;
+    if (isDomContentLoadedScript) domContentLoadedCnt++;
+    const loadPromise = topLevelLoad(script.src || `${baseUrl}?${id++}`, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, isReadyScript && lastStaticLoadPromise).catch(onerror);
+    if (isReadyScript)
+      lastStaticLoadPromise = loadPromise.then(readyStateCompleteCheck);
+    if (isDomContentLoadedScript)
+      loadPromise.then(domContentLoadedCheck);
   }
 
   const fetchCache = {};
@@ -747,22 +770,8 @@
     fetchCache[link.href] = doFetch(link.href, getFetchOpts(link));
   }
 
-  new MutationObserver(mutations => {
-    for (const mutation of mutations) {
-      if (mutation.type !== 'childList') continue;
-      for (const node of mutation.addedNodes) {
-        if (node.tagName === 'SCRIPT' && node.type)
-          processScript(node);
-        else if (node.tagName === 'LINK' && node.rel === 'modulepreload')
-          processPreload(node);
-      }
-    }
-  }).observe(document, { childList: true, subtree: true });
-
   function throwUnresolved (id, parentUrl) {
     throw Error("Unable to resolve specifier '" + id + (parentUrl ? "' from " + parentUrl : "'"));
   }
 
-  processScripts();
-
-}());
+}());

data/lib/importmap/map.rb

@@ -1,5 +1,4 @@
 require "pathname"
-require "active_support/evented_file_update_checker"
 
 class Importmap::Map
   attr_reader :packages, :directories
@@ -63,11 +62,11 @@ class Importmap::Map
   def cache_sweeper(watches: nil)
     if watches
       @cache_sweeper =
-        ActiveSupport::EventedFileUpdateChecker.new([], Array(watches).collect { |dir| [ dir, "js"] }.to_h) do
+        Rails.application.config.file_watcher.new([], Array(watches).collect { |dir| [ dir.to_s, "js"] }.to_h) do
           clear_cache
         end
     else
-      @cache_sweeper  
+      @cache_sweeper
     end
   end
 

data/lib/importmap/version.rb

@@ -1,3 +1,3 @@
 module Importmap
-  VERSION = "0.7.0"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails