importmap-rails 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b87e83df8630c47a117ee7a9a854a8d34bd65112e547c27a5ae9133fb62f3c8a
-  data.tar.gz: b6c77a31b534440c7a6a3132e1f88d14f658ed350fcd95d446bba9d58df11bc5
+  metadata.gz: c4edb628879c46f984d95884b643013077f408a899a1633f7007ef3274393b65
+  data.tar.gz: 627f45fe257131d3432d1f2cf210eb0fd133e286c293b101cfaf5b5a77840a47
 SHA512:
-  metadata.gz: 40f0955bde9ab6792c5b1e0b5f0fa4eed8701aa09f2b71c69dd1fe1f6b088131d2dd0089e4bd68b14172e4042a49959a7de609adc9f711bbd6e819552ec6fb11
-  data.tar.gz: 471bc782818dc139c3a46fb8c1896784069b8d8c8ff777cdc2880d462f5efa207021292079d7b9de127af58cd916901153f8a7981944fc52e81ad80b418907fb
+  metadata.gz: cd44cdb515fed52817f75d453e274846979e9649e997bd4b2b67689a6761b294c33fdf1b7a9909042da0da2b99d11cbb1ad1a626519a2f528aa4cab5b61869ae
+  data.tar.gz: 301873edf08bb1c486dcdbebe65afbe5b3ff2d43fd9a78c51b9791e07152ae0742e93fcfd92fb936e2ce97adacc3e9ff3f6d2b3eacd15683e153e1c8d457997d

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

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

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

@@ -1,6 +1,6 @@
-/* ES Module Shims 0.12.2 */
+/* ES Module Shims 0.12.6 */
 (function () {
-  // Temporary hack around https://github.com/guybedford/es-module-shims/issues/148
+  // Bail on all shimming for Chrome until https://github.com/guybedford/es-module-shims/issues/150
   if (navigator.userAgent.match("Chrome")) return
 
   const resolvedPromise = Promise.resolve();
@@ -16,6 +16,7 @@
   // support browsers without dynamic import support (eg Firefox 6x)
   let supportsDynamicImport = false;
   let supportsJsonAssertions = false;
+  let supportsCssAssertions = false;
   let dynamicImport;
   try {
     dynamicImport = (0, eval)('u=>import(u)');
@@ -53,6 +54,7 @@
   let supportsImportMaps = false;
 
   const featureDetectionPromise = Promise.all([
+    dynamicImport(createBlob('import"data:text/css,{}"assert{type:"css"}')).then(() => supportsCssAssertions = true, () => {}),
     dynamicImport(createBlob('import"data:text/json,{}"assert{type:"json"}')).then(() => supportsJsonAssertions = true, () => {}),
     dynamicImport(createBlob('import.meta')).then(() => supportsImportMeta = true, () => {}),
     supportsDynamicImport && hasDocument && new Promise(resolve => {
@@ -263,6 +265,10 @@
       load.n = load.d.some(dep => dep.n);
   }
 
+  let importMap = { imports: {}, scopes: {} };
+  let importMapSrcOrLazy = false;
+  let importMapPromise = resolvedPromise;
+
   let waitingForImportMapsInterval;
   let firstTopLevelProcess = true;
   async function topLevelLoad (url, fetchOpts, source, nativelyLoaded) {
@@ -278,7 +284,7 @@
     }
     await importMapPromise;
     // early analysis opt-out
-    if (nativelyLoaded && supportsDynamicImport && supportsImportMeta && supportsImportMaps && !importMapSrcOrLazy) {
+    if (nativelyLoaded && supportsDynamicImport && supportsImportMeta && supportsImportMaps && supportsJsonAssertions && supportsCssAssertions && !importMapSrcOrLazy) {
       // dont reexec inline for polyfills -> just return null
       return source && nativelyLoaded ? null : dynamicImport(source ? createBlob(source) : url);
     }
@@ -288,7 +294,7 @@
     await loadAll(load, seen);
     lastLoad = undefined;
     resolveDeps(load, seen);
-    if (source && !nativelyLoaded && !shimMode && !load.n) {
+    if (source && !shimMode && !load.n) {
       const module = dynamicImport(createBlob(source));
       if (shouldRevokeBlobURLs) revokeObjectURLs(Object.keys(seen));
       return module;
@@ -323,7 +329,8 @@
     await featureDetectionPromise;
     // Make sure all the "in-flight" import maps are loaded and applied.
     await importMapPromise;
-    return topLevelLoad(resolve(id, parentUrl).r || throwUnresolved(id, parentUrl), { credentials: 'same-origin' });
+    const resolved = await resolve(id, parentUrl);
+    return topLevelLoad(resolved.r || throwUnresolved(id, parentUrl), { credentials: 'same-origin' });
   }
 
   self.importShim = importShim;
@@ -334,7 +341,8 @@
 
   async function importMetaResolve (id, parentUrl = this.url) {
     await importMapPromise;
-    return resolve(id, `${parentUrl}`).r || throwUnresolved(id, parentUrl);
+    const resolved = await resolve(id, `${parentUrl}`);
+    return resolved.r || throwUnresolved(id, parentUrl);
   }
 
   self._esmsm = meta;
@@ -374,7 +382,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;
@@ -449,7 +457,26 @@
   const cssContentType = /^text\/css(;|$)/;
   const wasmContentType = /^application\/wasm(;|$)/;
 
-  const fetchOptsMap = new Map();
+  const cssUrlRegEx = /url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g;
+
+  async function doFetch (url, fetchOpts) {
+    const res = await fetchHook(url, fetchOpts);
+    if (!res.ok)
+      throw new Error(`${res.status} ${res.statusText} ${res.url}`);
+    const contentType = res.headers.get('content-type');
+    if (jsContentType.test(contentType))
+      return { r: res.url, s: await res.text(), t: 'js' };
+    else if (jsonContentType.test(contentType))
+      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' };
+    else if (wasmContentType.test(contentType))
+      throw new Error('WASM modules not yet supported');
+    else
+      throw new Error(`Unknown Content-Type "${contentType}"`);
+  }
 
   function getOrCreateLoad (url, fetchOpts, source) {
     let load = registry[url];
@@ -476,27 +503,18 @@
       // shellUrl
       s: undefined,
       // needsShim
-      n: false
+      n: false,
+      // type
+      t: null
     };
 
     load.f = (async () => {
       if (!source) {
         // preload fetch options override fetch options (race)
-        const res = await fetchHook(url, fetchOptsMap.get(url) || fetchOpts);
-        if (!res.ok)
-          throw new Error(`${res.status} ${res.statusText} ${res.url}`);
-        load.r = res.url;
-        const contentType = res.headers.get('content-type');
-        if (jsContentType.test(contentType))
-          source = await res.text();
-        else if (jsonContentType.test(contentType))
-          source = `export default ${await res.text()}`;
-        else if (cssContentType.test(contentType))
-          throw new Error('CSS modules not yet supported');
-        else if (wasmContentType.test(contentType))
-          throw new Error('WASM modules not yet supported');
-        else
-          throw new Error(`Unknown Content-Type "${contentType}"`);
+        let t;
+        ({ r: load.r, s: source, t } = await (fetchCache[url] || doFetch(url, fetchOpts)));
+        if (t === 'css' && !supportsCssAssertions || t === 'json' && !supportsJsonAssertions)
+          load.n = true;
       }
       try {
         load.a = parse(source, load.u);
@@ -511,13 +529,12 @@
 
     load.L = load.f.then(async () => {
       let childFetchOpts = fetchOpts;
-      load.d = await Promise.all(load.a[0].map(({ n, d, a }) => {
+      load.d = (await Promise.all(load.a[0].map(async ({ n, d, a }) => {
         if (d >= 0 && !supportsDynamicImport ||
-            d === 2 && (!supportsImportMeta || source.slice(end, end + 8) === '.resolve') ||
-            a && !supportsJsonAssertions)
+            d === 2 && (!supportsImportMeta || source.slice(end, end + 8) === '.resolve'))
           load.n = true;
         if (!n) return;
-        const { r, m } = resolve(n, load.r || load.u);
+        const { r, m } = await resolve(n, load.r || load.u);
         if (m && (!supportsImportMaps || importMapSrcOrLazy))
           load.n = true;
         if (d !== -1) return;
@@ -527,21 +544,12 @@
         if (childFetchOpts.integrity)
           childFetchOpts = Object.assign({}, childFetchOpts, { integrity: undefined });
         return getOrCreateLoad(r, childFetchOpts).f;
-      }).filter(l => l));
+      }))).filter(l => l);
     });
 
     return load;
   }
 
-  let importMap = { imports: {}, scopes: {} };
-  let importMapSrcOrLazy = false;
-  let importMapPromise = resolvedPromise;
-
-  if (hasDocument) {
-    processScripts();
-    waitingForImportMapsInterval = setInterval(processScripts, 20);
-  }
-
   async function processScripts () {
     if (waitingForImportMapsInterval > 0 && document.readyState !== 'loading') {
       clearTimeout(waitingForImportMapsInterval);
@@ -553,26 +561,6 @@
       await processScript(script);
   }
 
-  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, !firstTopLevelProcess);
-        else if (node.tagName === 'LINK' && node.rel === 'modulepreload')
-          processPreload(node);
-        else if (node.querySelectorAll) {
-          for (const script of node.querySelectorAll('script[type="module-shim"],script[type="importmap-shim"],script[type="module"],script[type="importmap"]')) {
-            processScript(script, !firstTopLevelProcess);
-          }
-          for (const link of node.querySelectorAll('link[rel=modulepreload]')) {
-            processPreload(link);
-          }
-        }
-      }
-    }
-  }).observe(document, { childList: true, subtree: true });
-
   function getFetchOpts (script) {
     const fetchOpts = {};
     if (script.integrity)
@@ -612,20 +600,49 @@
     }
   }
 
+  const fetchCache = {};
   function processPreload (link) {
     if (link.ep) // ep marker = processed
       return;
     link.ep = true;
-    // prepopulate the load record
-    const fetchOpts = getFetchOpts(link);
-    // save preloaded fetch options for later load  
-    fetchOptsMap.set(link.href, fetchOpts);
-    fetch(link.href, fetchOpts);
+    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, !firstTopLevelProcess);
+        else if (node.tagName === 'LINK' && node.rel === 'modulepreload')
+          processPreload(node);
+        else if (node.querySelectorAll) {
+          for (const script of node.querySelectorAll('script[type="module-shim"],script[type="importmap-shim"],script[type="module"],script[type="importmap"]')) {
+            processScript(script, !firstTopLevelProcess);
+          }
+          for (const link of node.querySelectorAll('link[rel=modulepreload]')) {
+            processPreload(link);
+          }
+        }
+      }
+    }
+  }).observe(document, { childList: true, subtree: true });
+
+  async function defaultResolve (id, parentUrl) {
+    return resolveImportMap(importMap, resolveIfNotPlainOrUrl(id, parentUrl) || id, parentUrl);
   }
 
-  function resolve (id, parentUrl) {
-    const urlResolved = resolveIfNotPlainOrUrl(id, parentUrl);
-    const resolved = resolveImportMap(importMap, urlResolved || id, parentUrl);
+  async function resolve (id, parentUrl) {
+    let urlResolved = resolveIfNotPlainOrUrl(id, parentUrl);
+
+    let resolved;
+    if (esmsInitOptions.resolve) {
+      resolved = await esmsInitOptions.resolve(id, parentUrl, defaultResolve);
+    }
+    else {
+      resolved = resolveImportMap(importMap, urlResolved || id, parentUrl);
+    }
+
     return { r: resolved, m: urlResolved !== resolved };
   }
 
@@ -633,4 +650,9 @@
     throw Error("Unable to resolve specifier '" + id + (parentUrl ? "' from " + parentUrl : "'"));
   }
 
-}());
+  if (hasDocument) {
+    processScripts();
+    waitingForImportMapsInterval = setInterval(processScripts, 20);
+  }
+
+}());

data/lib/importmap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importmap-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-description: 
+description:
 email: david@loudthinking.com
 executables: []
 extensions: []
@@ -34,7 +34,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/es-module-shims.js
-- app/assets/javascripts/es-module-shims@0.12.2.js
+- app/assets/javascripts/es-module-shims@0.12.6.js
 - app/helpers/importmap/importmap_tags_helper.rb
 - lib/importmap-rails.rb
 - lib/importmap/engine.rb
@@ -50,7 +50,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/rails/importmap-rails
   source_code_uri: https://github.com/rails/importmap-rails
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Use ESM with importmap to manage modern JavaScript in Rails without transpiling
   or bundling.