es-module-shims 1.5.17 → 1.6.0

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.17/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@1.6.0/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">
@@ -626,12 +626,23 @@ In such a case, this double event firing can be disabled with the `noLoadEventRe
 
 When loading modules that you know will only use baseline modules features, it is possible to set a rule to explicitly opt-out modules from rewriting. This improves performance because those modules then do not need to be processed or transformed at all, so that only local application code is handled and not library code.
 
-This can be configured by providing a URL regular expression for the `skip` option:
+The `skip` option supports a string regular expression or array of exact module URLs to check:
 
 ```js
 <script type="esms-options">
 {
-  "skip": "/^https?:\/\/(cdn\.skypack\.dev|jspm\.dev)\//"
+  "skip": "^https?:\/\/(cdn\.skypack\.dev|jspm\.dev)\/"
+}
+</script>
+<script async src="es-module-shims.js"></script>
+```
+
+When passing an array, relative URLs or paths ending in `/` can be provided:
+
+```js
+<script type="esms-options">
+{
+  "skip": ["./app.js", "https://jspm.dev/"]
 }
 </script>
 <script async src="es-module-shims.js"></script>

package/dist/es-module-shims.js

@@ -1,4 +1,4 @@
-/* ES Module Shims 1.5.17 */
+/* ES Module Shims 1.6.0 */
 (function () {
 
   const hasWindow = typeof window !== 'undefined';
@@ -18,8 +18,6 @@
   let fetchHook = esmsInitOptions.fetch ? globalHook(esmsInitOptions.fetch) : fetch;
   const metaHook = esmsInitOptions.meta ? globalHook(shimMode && esmsInitOptions.meta) : noop;
 
-  const skip = esmsInitOptions.skip ? new RegExp(esmsInitOptions.skip) : null;
-
   const mapOverrides = esmsInitOptions.mapOverrides;
 
   let nonce = esmsInitOptions.nonce;
@@ -53,6 +51,15 @@
     : location.pathname}`;
 
   const createBlob = (source, type = 'text/javascript') => URL.createObjectURL(new Blob([source], { type }));
+  let { skip } = esmsInitOptions;
+  if (Array.isArray(skip)) {
+    const l = skip.map(s => new URL(s, baseUrl).href);
+    skip = s => l.some(i => i[i.length - 1] === '/' && s.startsWith(i) || s === i);
+  }
+  else if (typeof skip === 'string') {
+    const r = new RegExp(skip);
+    skip = s => s.test(r);
+  }
 
   const eoop = err => setTimeout(() => { throw err });
 
@@ -101,22 +108,14 @@
     }
   }
 
-  /*
-   * Import maps implementation
-   *
-   * To make lookups fast we pre-resolve the entire import map
-   * and then match based on backtracked hash lookups
-   *
-   */
   function resolveUrl (relUrl, parentUrl) {
     return resolveIfNotPlainOrUrl(relUrl, parentUrl) || (isURL(relUrl) ? relUrl : resolveIfNotPlainOrUrl('./' + relUrl, parentUrl));
   }
 
   function resolveIfNotPlainOrUrl (relUrl, parentUrl) {
-    // strip off any trailing query params or hashes
-    const queryHashIndex = parentUrl.indexOf('?', parentUrl.indexOf('#') === -1 ? parentUrl.indexOf('#') : parentUrl.length);
-    if (queryHashIndex !== -1)
-      parentUrl = parentUrl.slice(0, queryHashIndex);
+    const hIdx = parentUrl.indexOf('#'), qIdx = parentUrl.indexOf('?');
+    if (hIdx + qIdx > -2)
+      parentUrl = parentUrl.slice(0, hIdx === -1 ? qIdx : qIdx === -1 || qIdx > hIdx ? hIdx : qIdx);
     if (relUrl.indexOf('\\') !== -1)
       relUrl = relUrl.replace(backslashRegEx, '/');
     // protocol-relative
@@ -641,9 +640,9 @@
         }
       }
 
-      // support progressive cycle binding updates
+      // support progressive cycle binding updates (try statement avoids tdz errors)
       if (load.s)
-        resolvedSource += `\n;import{u$_}from'${load.s}';u$_({ ${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')} });\n`;
+        resolvedSource += `\n;import{u$_}from'${load.s}';try{u$_({${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')}})}catch(_){};\n`;
 
       pushStringTo(source.length);
     }
@@ -786,6 +785,7 @@
         const { r, b } = await resolve(n, load.r || load.u);
         if (b && (!supportsImportMaps || importMapSrcOrLazy))
           load.n = true;
+        if (d !== -1) return;      
         if (skip && skip.test(r)) return { b: r };
         if (childFetchOpts.integrity)
           childFetchOpts = Object.assign({}, childFetchOpts, { integrity: undefined });

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

@@ -1,4 +1,4 @@
-/* ES Module Shims Wasm 1.5.17 */
+/* ES Module Shims Wasm 1.6.0 */
 (function () {
 
   const hasWindow = typeof window !== 'undefined';
@@ -18,8 +18,6 @@
   let fetchHook = esmsInitOptions.fetch ? globalHook(esmsInitOptions.fetch) : fetch;
   const metaHook = esmsInitOptions.meta ? globalHook(shimMode && esmsInitOptions.meta) : noop;
 
-  const skip = esmsInitOptions.skip ? new RegExp(esmsInitOptions.skip) : null;
-
   const mapOverrides = esmsInitOptions.mapOverrides;
 
   let nonce = esmsInitOptions.nonce;
@@ -53,6 +51,15 @@
     : location.pathname}`;
 
   const createBlob = (source, type = 'text/javascript') => URL.createObjectURL(new Blob([source], { type }));
+  let { skip } = esmsInitOptions;
+  if (Array.isArray(skip)) {
+    const l = skip.map(s => new URL(s, baseUrl).href);
+    skip = s => l.some(i => i[i.length - 1] === '/' && s.startsWith(i) || s === i);
+  }
+  else if (typeof skip === 'string') {
+    const r = new RegExp(skip);
+    skip = s => s.test(r);
+  }
 
   const eoop = err => setTimeout(() => { throw err });
 
@@ -101,22 +108,14 @@
     }
   }
 
-  /*
-   * Import maps implementation
-   *
-   * To make lookups fast we pre-resolve the entire import map
-   * and then match based on backtracked hash lookups
-   *
-   */
   function resolveUrl (relUrl, parentUrl) {
     return resolveIfNotPlainOrUrl(relUrl, parentUrl) || (isURL(relUrl) ? relUrl : resolveIfNotPlainOrUrl('./' + relUrl, parentUrl));
   }
 
   function resolveIfNotPlainOrUrl (relUrl, parentUrl) {
-    // strip off any trailing query params or hashes
-    const queryHashIndex = parentUrl.indexOf('?', parentUrl.indexOf('#') === -1 ? parentUrl.indexOf('#') : parentUrl.length);
-    if (queryHashIndex !== -1)
-      parentUrl = parentUrl.slice(0, queryHashIndex);
+    const hIdx = parentUrl.indexOf('#'), qIdx = parentUrl.indexOf('?');
+    if (hIdx + qIdx > -2)
+      parentUrl = parentUrl.slice(0, hIdx === -1 ? qIdx : qIdx === -1 || qIdx > hIdx ? hIdx : qIdx);
     if (relUrl.indexOf('\\') !== -1)
       relUrl = relUrl.replace(backslashRegEx, '/');
     // protocol-relative
@@ -641,9 +640,9 @@
         }
       }
 
-      // support progressive cycle binding updates
+      // support progressive cycle binding updates (try statement avoids tdz errors)
       if (load.s)
-        resolvedSource += `\n;import{u$_}from'${load.s}';u$_({ ${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')} });\n`;
+        resolvedSource += `\n;import{u$_}from'${load.s}';try{u$_({${exports.filter(e => e.ln).map(({ s, e, ln }) => `${source.slice(s, e)}: ${ln}`).join(',')}})}catch(_){};\n`;
 
       pushStringTo(source.length);
     }
@@ -786,6 +785,7 @@
         const { r, b } = await resolve(n, load.r || load.u);
         if (b && (!supportsImportMaps || importMapSrcOrLazy))
           load.n = true;
+        if (d !== -1) return;      
         if (skip && skip.test(r)) return { b: r };
         if (childFetchOpts.integrity)
           childFetchOpts = Object.assign({}, childFetchOpts, { integrity: undefined });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-module-shims",
-  "version": "1.5.17",
+  "version": "1.6.0",
   "description": "Shims for the latest ES module features",
   "main": "dist/es-module-shims.js",
   "exports": {
@@ -36,8 +36,8 @@
     "test": "test"
   },
   "scripts": {
-    "build": "cargo install chompbuild ; chomp build",
-    "test": "cargo install chompbuild ; chomp test"
+    "build": "npm install -g chomp ; chomp build",
+    "test": "npm install -g chomp ; chomp test"
   },
   "repository": {
     "type": "git",