es-module-shims 1.4.3 → 1.4.4

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+ES Module Shims 1.4.4
+* Fix: import.meta.resolve support for inline scripts (https://github.com/guybedford/es-module-shims/pull/251)
+* Fix: CSS imports unquoted URL normalization (https://github.com/guybedford/es-module-shims/pull/252)
+* Fix: Reword polyfill info message (https://github.com/guybedford/es-module-shims/pull/253)
+
 ES Module Shims 1.4.3 (2022/01/25)
 * Feature: Support import map overrides when existing resolution matches new resolution (https://github.com/guybedford/es-module-shims/pull/249, @vovacodes)
 * Fix: Import assertions support with dynamic imports (https://github.com/guybedford/es-module-shims/pull/248)

package/README.md

@@ -27,7 +27,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.4.3/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@1.4.4/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">
@@ -287,7 +287,7 @@ import sheet from 'https://site.com/sheet.css' assert { type: 'css' };
 To support the polyfill or shim of this feature, the [Constructable Stylesheets polyfill](https://github.com/calebdwilliams/construct-style-sheets#readme) must be separately included in browsers not supporting [Constructable Stylesheets](https://developer.mozilla.org/en-US/docs/Web/API/CSSStyleSheet/CSSStyleSheet) eg via:
 
 ```html
-<script async src="https://unpkg.com/construct-style-sheets-polyfill@3.0.0/dist/adoptedStyleSheets.js"></script>
+<script async src="https://unpkg.com/construct-style-sheets-polyfill@3.1.0/dist/adoptedStyleSheets.js"></script>
 ```
 
 For more information see the [web.dev article](https://web.dev/css-module-scripts/).

package/dist/es-module-shims.js

@@ -1,11 +1,10 @@
-/* ES Module Shims 1.4.3 */
+/* ES Module Shims 1.4.4 */
 (function () {
 
-  const uaMatch = navigator.userAgent.match(/(Edge|Safari)\/\d+\.\d+/);
-  const edge = uaMatch && uaMatch[1] === 'Edge';
-  const safari = uaMatch && uaMatch[1] === 'Safari';
+  const edge = !!navigator.userAgent.match(/Edge\/\d+\.\d+/);
+  const safari = !!window.safari;
 
-  let baseUrl;
+  const baseUrl = document.baseURI;
 
   function createBlob (source, type = 'text/javascript') {
     return URL.createObjectURL(new Blob([source], { type }));
@@ -13,17 +12,6 @@
 
   const noop = () => {};
 
-  const baseEl = document.querySelector('base[href]');
-  if (baseEl)
-    baseUrl = baseEl.href;
-
-  if (!baseUrl && typeof location !== 'undefined') {
-    baseUrl = location.href.split('#')[0].split('?')[0];
-    const lastSepIndex = baseUrl.lastIndexOf('/');
-    if (lastSepIndex !== -1)
-      baseUrl = baseUrl.slice(0, lastSepIndex + 1);
-  }
-
   function isURL (url) {
     try {
       new URL(url);
@@ -87,28 +75,25 @@
             output.push(segmented.slice(segmentIndex, i + 1));
             segmentIndex = -1;
           }
+          continue;
         }
-
         // new segment - check if it is relative
         else if (segmented[i] === '.') {
           // ../ segment
           if (segmented[i + 1] === '.' && (segmented[i + 2] === '/' || i + 2 === segmented.length)) {
             output.pop();
             i += 2;
+            continue;
           }
           // ./ segment
           else if (segmented[i + 1] === '/' || i + 1 === segmented.length) {
             i += 1;
-          }
-          else {
-            // the start of a new segment as below
-            segmentIndex = i;
+            continue;
           }
         }
         // it is the start of a new segment
-        else {
-          segmentIndex = i;
-        }
+        while (segmented[i] === '/') i++;
+        segmentIndex = i; 
       }
       // finish reading out the last segment
       if (segmentIndex !== -1)
@@ -210,7 +195,7 @@
   }
 
   const onerror = globalHook(esmsInitOptions.onerror || noop);
-  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => console.info(`OK: "Uncaught TypeError" module failure has been polyfilled`);
+  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => console.info(`OK: ^ TypeError module failure has been polyfilled`);
 
   const { revokeBlobURLs, noLoadEventRetriggers, enforceIntegrity } = esmsInitOptions;
 
@@ -315,7 +300,6 @@
 
   const resolve = resolveHook ? async (id, parentUrl) => ({ r: await resolveHook(id, parentUrl, defaultResolve), b: false }) : _resolve;
 
-  let id = 0;
   const registry = {};
 
   async function loadAll (load, seen) {
@@ -523,7 +507,7 @@
         }
         // dynamic import
         else {
-          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${load.r && urlJsString(load.r)}${source.slice(end, statementEnd)}`;
+          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${urlJsString(load.r)}${source.slice(end, statementEnd)}`;
           lastIndex = statementEnd;
         }
       }
@@ -581,24 +565,25 @@
       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))
+    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})`))
+      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}"`);
   }
 
   function getOrCreateLoad (url, fetchOpts, source) {
     let load = registry[url];
-    if (load)
+    if (load && !source)
       return load;
 
-    load = registry[url] = {
+    load = {
       // url
       u: url,
       // response url
-      r: undefined,
+      r: source ? url : undefined,
       // fetchPromise
       f: undefined,
       // source
@@ -618,6 +603,12 @@
       // type
       t: null
     };
+    if (registry[url]) {
+      let i = 0;
+      while (registry[load.u + ++i]);
+      load.u += i;
+    }
+    registry[load.u] = load;
 
     load.f = (async () => {
       if (!source) {
@@ -764,7 +755,7 @@
     if (isReadyScript) readyStateCompleteCnt++;
     if (isDomContentLoadedScript) domContentLoadedCnt++;
     const blocks = script.getAttribute('async') === null && isReadyScript;
-    const loadPromise = topLevelLoad(script.src || `${baseUrl}?${id++}`, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, blocks && lastStaticLoadPromise).catch(e => {
+    const loadPromise = topLevelLoad(script.src || baseUrl, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, blocks && lastStaticLoadPromise).catch(e => {
       // Safari only gives error via console.error
       if (safari)
         console.error(e);

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

@@ -1,11 +1,10 @@
-/* ES Module Shims Wasm 1.4.3 */
+/* ES Module Shims Wasm 1.4.4 */
 (function () {
 
-  const uaMatch = navigator.userAgent.match(/(Edge|Safari)\/\d+\.\d+/);
-  const edge = uaMatch && uaMatch[1] === 'Edge';
-  const safari = uaMatch && uaMatch[1] === 'Safari';
+  const edge = !!navigator.userAgent.match(/Edge\/\d+\.\d+/);
+  const safari = !!window.safari;
 
-  let baseUrl;
+  const baseUrl = document.baseURI;
 
   function createBlob (source, type = 'text/javascript') {
     return URL.createObjectURL(new Blob([source], { type }));
@@ -13,17 +12,6 @@
 
   const noop = () => {};
 
-  const baseEl = document.querySelector('base[href]');
-  if (baseEl)
-    baseUrl = baseEl.href;
-
-  if (!baseUrl && typeof location !== 'undefined') {
-    baseUrl = location.href.split('#')[0].split('?')[0];
-    const lastSepIndex = baseUrl.lastIndexOf('/');
-    if (lastSepIndex !== -1)
-      baseUrl = baseUrl.slice(0, lastSepIndex + 1);
-  }
-
   function isURL (url) {
     try {
       new URL(url);
@@ -87,28 +75,25 @@
             output.push(segmented.slice(segmentIndex, i + 1));
             segmentIndex = -1;
           }
+          continue;
         }
-
         // new segment - check if it is relative
         else if (segmented[i] === '.') {
           // ../ segment
           if (segmented[i + 1] === '.' && (segmented[i + 2] === '/' || i + 2 === segmented.length)) {
             output.pop();
             i += 2;
+            continue;
           }
           // ./ segment
           else if (segmented[i + 1] === '/' || i + 1 === segmented.length) {
             i += 1;
-          }
-          else {
-            // the start of a new segment as below
-            segmentIndex = i;
+            continue;
           }
         }
         // it is the start of a new segment
-        else {
-          segmentIndex = i;
-        }
+        while (segmented[i] === '/') i++;
+        segmentIndex = i; 
       }
       // finish reading out the last segment
       if (segmentIndex !== -1)
@@ -210,7 +195,7 @@
   }
 
   const onerror = globalHook(esmsInitOptions.onerror || noop);
-  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => console.info(`OK: "Uncaught TypeError" module failure has been polyfilled`);
+  const onpolyfill = esmsInitOptions.onpolyfill ? globalHook(esmsInitOptions.onpolyfill) : () => console.info(`OK: ^ TypeError module failure has been polyfilled`);
 
   const { revokeBlobURLs, noLoadEventRetriggers, enforceIntegrity } = esmsInitOptions;
 
@@ -313,7 +298,6 @@
 
   const resolve = resolveHook ? async (id, parentUrl) => ({ r: await resolveHook(id, parentUrl, defaultResolve), b: false }) : _resolve;
 
-  let id = 0;
   const registry = {};
 
   async function loadAll (load, seen) {
@@ -521,7 +505,7 @@
         }
         // dynamic import
         else {
-          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${load.r && urlJsString(load.r)}${source.slice(end, statementEnd)}`;
+          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${urlJsString(load.r)}${source.slice(end, statementEnd)}`;
           lastIndex = statementEnd;
         }
       }
@@ -579,24 +563,25 @@
       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))
+    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})`))
+      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}"`);
   }
 
   function getOrCreateLoad (url, fetchOpts, source) {
     let load = registry[url];
-    if (load)
+    if (load && !source)
       return load;
 
-    load = registry[url] = {
+    load = {
       // url
       u: url,
       // response url
-      r: undefined,
+      r: source ? url : undefined,
       // fetchPromise
       f: undefined,
       // source
@@ -616,6 +601,12 @@
       // type
       t: null
     };
+    if (registry[url]) {
+      let i = 0;
+      while (registry[load.u + ++i]);
+      load.u += i;
+    }
+    registry[load.u] = load;
 
     load.f = (async () => {
       if (!source) {
@@ -762,7 +753,7 @@
     if (isReadyScript) readyStateCompleteCnt++;
     if (isDomContentLoadedScript) domContentLoadedCnt++;
     const blocks = script.getAttribute('async') === null && isReadyScript;
-    const loadPromise = topLevelLoad(script.src || `${baseUrl}?${id++}`, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, blocks && lastStaticLoadPromise).catch(e => {
+    const loadPromise = topLevelLoad(script.src || baseUrl, getFetchOpts(script), !script.src && script.innerHTML, !shimMode, blocks && lastStaticLoadPromise).catch(e => {
       // Safari only gives error via console.error
       if (safari)
         console.error(e);

package/package.json

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