es-module-shims 1.4.2 → 1.4.3

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+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)
+
 ES Module Shims 1.4.2 (2022/01/24)
 * Fix: optional catch binding in `isUrl` function (@thepassle, https://github.com/guybedford/es-module-shims/pull/246)
 

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.2/dist/es-module-shims.js"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@1.4.3/dist/es-module-shims.js"></script>
 
 <!-- https://generator.jspm.io/#U2NhYGBkDM0rySzJSU1hKEpNTC5xMLTQM9Az0C1K1jMAAKFS5w0gAA -->
 <script type="importmap">

package/dist/es-module-shims.js

@@ -1,4 +1,4 @@
-/* ES Module Shims 1.4.2 */
+/* ES Module Shims 1.4.3 */
 (function () {
 
   const uaMatch = navigator.userAgent.match(/(Edge|Safari)\/\d+\.\d+/);
@@ -131,7 +131,7 @@
   function resolveAndComposePackages (packages, outPackages, baseUrl, parentMap) {
     for (let p in packages) {
       const resolvedLhs = resolveIfNotPlainOrUrl(p, baseUrl) || p;
-      if (outPackages[resolvedLhs]) {
+      if (outPackages[resolvedLhs] && (outPackages[resolvedLhs] !== packages[resolvedLhs])) {
         throw Error(`Rejected map override "${resolvedLhs}" from ${outPackages[resolvedLhs]} to ${packages[resolvedLhs]}.`);
       }
       let target = packages[p];
@@ -486,7 +486,7 @@
       // once all deps have loaded we can inline the dependency resolution blobs
       // and define this blob
       let lastIndex = 0, depIndex = 0;
-      for (const { s: start, se: end, d: dynamicImportIndex } of imports) {
+      for (const { s: start, e: end, se: statementEnd, d: dynamicImportIndex } of imports) {
         // dependency source replacements
         if (dynamicImportIndex === -1) {
           const depLoad = load.d[depIndex++];
@@ -507,24 +507,24 @@
           }
           // circular shell execution
           else if (depLoad.s) {
-            resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, end)}*/${urlJsString(blobUrl)};import*as m$_${depIndex} from'${depLoad.b}';import{u$_ as u$_${depIndex}}from'${depLoad.s}';u$_${depIndex}(m$_${depIndex})`;
-            lastIndex = end;
+            resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, statementEnd)}*/${urlJsString(blobUrl)};import*as m$_${depIndex} from'${depLoad.b}';import{u$_ as u$_${depIndex}}from'${depLoad.s}';u$_${depIndex}(m$_${depIndex})`;
+            lastIndex = statementEnd;
             depLoad.s = undefined;
             continue;
           }
-          resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, end)}*/${urlJsString(blobUrl)}`;
-          lastIndex = end;
+          resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, statementEnd)}*/${urlJsString(blobUrl)}`;
+          lastIndex = statementEnd;
         }
         // import.meta
         else if (dynamicImportIndex === -2) {
           meta[load.r] = { url: load.r, resolve: importMetaResolve };
           resolvedSource += `${source.slice(lastIndex, start)}self._esmsm[${urlJsString(load.r)}]`;
-          lastIndex = end;
+          lastIndex = statementEnd;
         }
         // dynamic import
         else {
-          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${load.r && urlJsString(load.r)}`;
-          lastIndex = end;
+          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${load.r && urlJsString(load.r)}${source.slice(end, statementEnd)}`;
+          lastIndex = statementEnd;
         }
       }
 

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

@@ -1,4 +1,4 @@
-/* ES Module Shims Wasm 1.4.2 */
+/* ES Module Shims Wasm 1.4.3 */
 (function () {
 
   const uaMatch = navigator.userAgent.match(/(Edge|Safari)\/\d+\.\d+/);
@@ -131,7 +131,7 @@
   function resolveAndComposePackages (packages, outPackages, baseUrl, parentMap) {
     for (let p in packages) {
       const resolvedLhs = resolveIfNotPlainOrUrl(p, baseUrl) || p;
-      if (outPackages[resolvedLhs]) {
+      if (outPackages[resolvedLhs] && (outPackages[resolvedLhs] !== packages[resolvedLhs])) {
         throw Error(`Rejected map override "${resolvedLhs}" from ${outPackages[resolvedLhs]} to ${packages[resolvedLhs]}.`);
       }
       let target = packages[p];
@@ -484,7 +484,7 @@
       // once all deps have loaded we can inline the dependency resolution blobs
       // and define this blob
       let lastIndex = 0, depIndex = 0;
-      for (const { s: start, se: end, d: dynamicImportIndex } of imports) {
+      for (const { s: start, e: end, se: statementEnd, d: dynamicImportIndex } of imports) {
         // dependency source replacements
         if (dynamicImportIndex === -1) {
           const depLoad = load.d[depIndex++];
@@ -505,24 +505,24 @@
           }
           // circular shell execution
           else if (depLoad.s) {
-            resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, end)}*/${urlJsString(blobUrl)};import*as m$_${depIndex} from'${depLoad.b}';import{u$_ as u$_${depIndex}}from'${depLoad.s}';u$_${depIndex}(m$_${depIndex})`;
-            lastIndex = end;
+            resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, statementEnd)}*/${urlJsString(blobUrl)};import*as m$_${depIndex} from'${depLoad.b}';import{u$_ as u$_${depIndex}}from'${depLoad.s}';u$_${depIndex}(m$_${depIndex})`;
+            lastIndex = statementEnd;
             depLoad.s = undefined;
             continue;
           }
-          resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, end)}*/${urlJsString(blobUrl)}`;
-          lastIndex = end;
+          resolvedSource += `${source.slice(lastIndex, start - 1)}/*${source.slice(start - 1, statementEnd)}*/${urlJsString(blobUrl)}`;
+          lastIndex = statementEnd;
         }
         // import.meta
         else if (dynamicImportIndex === -2) {
           meta[load.r] = { url: load.r, resolve: importMetaResolve };
           resolvedSource += `${source.slice(lastIndex, start)}self._esmsm[${urlJsString(load.r)}]`;
-          lastIndex = end;
+          lastIndex = statementEnd;
         }
         // dynamic import
         else {
-          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${load.r && urlJsString(load.r)}`;
-          lastIndex = end;
+          resolvedSource += `${source.slice(lastIndex, dynamicImportIndex + 6)}Shim(${source.slice(start, end)}, ${load.r && urlJsString(load.r)}${source.slice(end, statementEnd)}`;
+          lastIndex = statementEnd;
         }
       }
 

package/package.json

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