@jsenv/js-module-fallback 1.0.1 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/js-module-fallback",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,12 +25,12 @@
     "/src/"
   ],
   "dependencies": {
-    "@babel/parser": "7.21.9",
+    "@babel/parser": "7.22.4",
     "@babel/plugin-proposal-dynamic-import": "7.18.6",
     "@babel/plugin-transform-modules-umd": "7.18.6",
-    "@babel/plugin-transform-modules-systemjs": "7.20.11",
-    "@jsenv/ast": "4.0.2",
-    "@jsenv/babel-plugins": "1.1.6",
+    "@babel/plugin-transform-modules-systemjs": "7.22.3",
+    "babel-plugin-transform-async-to-promises": "0.8.18",
+    "@jsenv/ast": "4.0.3",
     "@jsenv/sourcemap": "1.0.10",
     "@jsenv/urls": "2.0.0"
   },

package/src/convert_js_module_to_js_classic.js

@@ -8,7 +8,6 @@ import {
 } from "@jsenv/sourcemap";
 import { applyBabelPlugins } from "@jsenv/ast";
 
-import { requireBabelPlugin } from "./internal/require_babel_plugin.js";
 import { babelPluginTransformImportMetaUrl } from "./internal/babel_plugin_transform_import_meta_url.js";
 import { babelPluginTransformImportMetaResolve } from "./internal/babel_plugin_transform_import_meta_resolve.js";
 // because of https://github.com/rpetrich/babel-plugin-transform-async-to-promises/issues/84
@@ -24,31 +23,23 @@ export const systemJsClientFileUrlDefault = new URL(
 export const convertJsModuleToJsClassic = async ({
   systemJsInjection,
   systemJsClientFileUrl = systemJsClientFileUrlDefault,
-  urlInfo,
-  jsModuleUrlInfo,
-}) => {
-  let jsClassicFormat;
-  if (urlInfo.isEntryPoint && !jsModuleUrlInfo.data.usesImport) {
-    // if it's an entry point without dependency (it does not use import)
-    // then we can use UMD
-    jsClassicFormat = "umd";
-  } else {
-    // otherwise we have to use system in case it's imported
-    // by an other file (for entry points)
-    // or to be able to import when it uses import
-    jsClassicFormat = "system";
-  }
 
-  urlInfo.data.jsClassicFormat = jsClassicFormat;
+  input,
+  inputIsEntryPoint,
+  inputSourcemap,
+  inputUrl,
+  outputUrl,
+  outputFormat = "system", // "systemjs" or "umd"
+}) => {
   const { code, map } = await applyBabelPlugins({
     babelPlugins: [
-      ...(jsClassicFormat === "system"
+      ...(outputFormat === "system"
         ? [
             // 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: jsModuleUrlInfo.url }],
+            [babelPluginRelativeImports, { rootUrl: inputUrl }],
             [
               customAsyncToPromises,
               {
@@ -59,7 +50,7 @@ export const convertJsModuleToJsClassic = async ({
           ]
         : [
             [
-              requireBabelPlugin("babel-plugin-transform-async-to-promises"),
+              require("babel-plugin-transform-async-to-promises"),
               {
                 asyncAwait: false, // already handled + we might not needs it at all
                 topLevelAwait: "simple",
@@ -68,18 +59,17 @@ export const convertJsModuleToJsClassic = async ({
             babelPluginTransformImportMetaUrl,
             babelPluginTransformImportMetaResolve,
             require("@babel/plugin-transform-modules-umd"),
-            [babelPluginRelativeImports, { rootUrl: jsModuleUrlInfo.url }],
+            [babelPluginRelativeImports, { rootUrl: inputUrl }],
           ]),
     ],
-    urlInfo: jsModuleUrlInfo,
+    input,
+    inputIsJsModule: true,
+    inputUrl,
+    outputUrl,
   });
-  let sourcemap = jsModuleUrlInfo.sourcemap;
+  let sourcemap = inputSourcemap;
   sourcemap = await composeTwoSourcemaps(sourcemap, map);
-  if (
-    systemJsInjection &&
-    jsClassicFormat === "system" &&
-    urlInfo.isEntryPoint
-  ) {
+  if (systemJsInjection && outputFormat === "system" && inputIsEntryPoint) {
     const magicSource = createMagicSource(code);
     let systemJsFileContent = readFileSync(
       new URL(systemJsClientFileUrl),

package/src/internal/require_babel_plugin.js

@@ -1,8 +0,0 @@
-import { createRequire } from "node:module";
-import { pathToFileURL } from "node:url";
-
-const require = createRequire(import.meta.url);
-const babelPluginPackagePath = require.resolve("@jsenv/babel-plugins");
-const babelPluginPackageUrl = pathToFileURL(babelPluginPackagePath);
-
-export const requireBabelPlugin = createRequire(babelPluginPackageUrl);