@jsenv/js-module-fallback 1.0.3 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/js-module-fallback",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -22,15 +22,16 @@
   },
   "main": "./src/main.js",
   "files": [
-    "/src/"
+    "/src/",
+    "/dist/"
   ],
   "dependencies": {
-    "@babel/parser": "7.22.4",
+    "@babel/parser": "7.22.5",
     "@babel/plugin-proposal-dynamic-import": "7.18.6",
-    "@babel/plugin-transform-modules-umd": "7.18.6",
-    "@babel/plugin-transform-modules-systemjs": "7.22.3",
+    "@babel/plugin-transform-modules-umd": "7.22.5",
+    "@babel/plugin-transform-modules-systemjs": "7.22.5",
     "babel-plugin-transform-async-to-promises": "0.8.18",
-    "@jsenv/ast": "4.0.3",
+    "@jsenv/ast": "4.1.0",
     "@jsenv/sourcemap": "1.0.10",
     "@jsenv/urls": "2.0.0"
   },

package/src/convert_js_module_to_js_classic.js

@@ -1,11 +1,6 @@
 import { createRequire } from "node:module";
-import { readFileSync } from "node:fs";
 import { urlToRelativeUrl } from "@jsenv/urls";
-import {
-  createMagicSource,
-  composeTwoSourcemaps,
-  SOURCEMAP,
-} from "@jsenv/sourcemap";
+import { composeTwoSourcemaps } from "@jsenv/sourcemap";
 import { applyBabelPlugins } from "@jsenv/ast";
 
 import { babelPluginTransformImportMetaUrl } from "./internal/babel_plugin_transform_import_meta_url.js";
@@ -13,19 +8,15 @@ import { babelPluginTransformImportMetaResolve } from "./internal/babel_plugin_t
 // because of https://github.com/rpetrich/babel-plugin-transform-async-to-promises/issues/84
 import customAsyncToPromises from "./internal/async-to-promises.js";
 
-const require = createRequire(import.meta.url);
-
 export const systemJsClientFileUrlDefault = new URL(
   "./client/s.js",
   import.meta.url,
 ).href;
 
-export const convertJsModuleToJsClassic = async ({
-  systemJsInjection,
-  systemJsClientFileUrl = systemJsClientFileUrlDefault,
+const require = createRequire(import.meta.url);
 
+export const convertJsModuleToJsClassic = async ({
   input,
-  inputIsEntryPoint,
   inputSourcemap,
   inputUrl,
   outputUrl,
@@ -38,8 +29,8 @@ export const convertJsModuleToJsClassic = async ({
             // proposal-dynamic-import required with systemjs for babel8:
             // https://github.com/babel/babel/issues/10746
             require("@babel/plugin-proposal-dynamic-import"),
-            require("@babel/plugin-transform-modules-systemjs"),
             [babelPluginRelativeImports, { rootUrl: inputUrl }],
+            require("@babel/plugin-transform-modules-systemjs"),
             [
               customAsyncToPromises,
               {
@@ -58,8 +49,8 @@ export const convertJsModuleToJsClassic = async ({
             ],
             babelPluginTransformImportMetaUrl,
             babelPluginTransformImportMetaResolve,
-            require("@babel/plugin-transform-modules-umd"),
             [babelPluginRelativeImports, { rootUrl: inputUrl }],
+            require("@babel/plugin-transform-modules-umd"),
           ]),
     ],
     input,
@@ -67,35 +58,7 @@ export const convertJsModuleToJsClassic = async ({
     inputUrl,
     outputUrl,
   });
-  let sourcemap = inputSourcemap;
-  sourcemap = await composeTwoSourcemaps(sourcemap, map);
-  if (systemJsInjection && outputFormat === "system" && inputIsEntryPoint) {
-    const magicSource = createMagicSource(code);
-    let systemJsFileContent = readFileSync(
-      new URL(systemJsClientFileUrl),
-      "utf8",
-    );
-    const sourcemapFound = SOURCEMAP.readComment({
-      contentType: "text/javascript",
-      content: systemJsFileContent,
-    });
-    if (sourcemapFound) {
-      // for now let's remove s.js sourcemap
-      // because it would likely mess the sourcemap of the entry point itself
-      systemJsFileContent = SOURCEMAP.writeComment({
-        contentType: "text/javascript",
-        content: systemJsFileContent,
-        specifier: "",
-      });
-    }
-    magicSource.prepend(`${systemJsFileContent}\n\n`);
-    const magicResult = magicSource.toContentAndSourcemap();
-    sourcemap = await composeTwoSourcemaps(sourcemap, magicResult.sourcemap);
-    return {
-      content: magicResult.content,
-      sourcemap,
-    };
-  }
+  const sourcemap = await composeTwoSourcemaps(inputSourcemap, map);
   return {
     content: code,
     sourcemap,
@@ -114,8 +77,12 @@ const babelPluginRelativeImports = (babel) => {
   const t = babel.types;
 
   const replaceSpecifierAtPath = (path, state) => {
-    const specifier = path.node.value;
+    let specifier = path.node.value;
     if (specifier.startsWith("file://")) {
+      const specifierUrlObject = new URL(specifier);
+      const { searchParams } = specifierUrlObject;
+      searchParams.delete("dynamic_import");
+      specifier = specifierUrlObject.href;
       const specifierRelative = urlToRelativeUrl(specifier, state.opts.rootUrl);
       path.replaceWith(t.stringLiteral(specifierRelative));
     }