@jsenv/core 30.3.7 → 30.3.9

package/dist/js/babel_plugin_transform_modules_systemjs.cjs

@@ -0,0 +1,392 @@
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.getExportSpecifierName = getExportSpecifierName;
+var _helperPluginUtils = require("@babel/helper-plugin-utils");
+var _helperHoistVariables = require("@babel/helper-hoist-variables");
+var _core = require("@babel/core");
+var _helperModuleTransforms = require("@babel/helper-module-transforms");
+var _helperValidatorIdentifier = require("@babel/helper-validator-identifier");
+const buildTemplate = _core.template.statement(`
+  SYSTEM_REGISTER(MODULE_NAME, SOURCES, function (EXPORT_IDENTIFIER, CONTEXT_IDENTIFIER) {
+    "use strict";
+    BEFORE_BODY;
+    return {
+      setters: SETTERS,
+      execute: EXECUTE,
+    };
+  });
+`);
+const buildExportAll = _core.template.statement(`
+  for (var KEY in TARGET) {
+    if (KEY !== "default" && KEY !== "__esModule") EXPORT_OBJ[KEY] = TARGET[KEY];
+  }
+`);
+const MISSING_PLUGIN_WARNING = `\
+WARNING: Dynamic import() transformation must be enabled using the
+         @babel/plugin-proposal-dynamic-import plugin. Babel 8 will
+         no longer transform import() without using that plugin.
+`;
+function getExportSpecifierName(node, stringSpecifiers) {
+  if (node.type === "Identifier") {
+    return node.name;
+  } else if (node.type === "StringLiteral") {
+    const stringValue = node.value;
+    if (!(0, _helperValidatorIdentifier.isIdentifierName)(stringValue)) {
+      stringSpecifiers.add(stringValue);
+    }
+    return stringValue;
+  } else {
+    throw new Error(`Expected export specifier to be either Identifier or StringLiteral, got ${node.type}`);
+  }
+}
+function constructExportCall(path, exportIdent, exportNames, exportValues, exportStarTarget, stringSpecifiers) {
+  const statements = [];
+  if (!exportStarTarget) {
+    if (exportNames.length === 1) {
+      statements.push(_core.types.expressionStatement(_core.types.callExpression(exportIdent, [_core.types.stringLiteral(exportNames[0]), exportValues[0]])));
+    } else {
+      const objectProperties = [];
+      for (let i = 0; i < exportNames.length; i++) {
+        const exportName = exportNames[i];
+        const exportValue = exportValues[i];
+        objectProperties.push(_core.types.objectProperty(stringSpecifiers.has(exportName) ? _core.types.stringLiteral(exportName) : _core.types.identifier(exportName), exportValue));
+      }
+      statements.push(_core.types.expressionStatement(_core.types.callExpression(exportIdent, [_core.types.objectExpression(objectProperties)])));
+    }
+  } else {
+    const exportObj = path.scope.generateUid("exportObj");
+    statements.push(_core.types.variableDeclaration("var", [_core.types.variableDeclarator(_core.types.identifier(exportObj), _core.types.objectExpression([]))]));
+    statements.push(buildExportAll({
+      KEY: path.scope.generateUidIdentifier("key"),
+      EXPORT_OBJ: _core.types.identifier(exportObj),
+      TARGET: exportStarTarget
+    }));
+    for (let i = 0; i < exportNames.length; i++) {
+      const exportName = exportNames[i];
+      const exportValue = exportValues[i];
+      statements.push(_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.memberExpression(_core.types.identifier(exportObj), _core.types.identifier(exportName)), exportValue)));
+    }
+    statements.push(_core.types.expressionStatement(_core.types.callExpression(exportIdent, [_core.types.identifier(exportObj)])));
+  }
+  return statements;
+}
+var _default = (0, _helperPluginUtils.declare)((api, options) => {
+  api.assertVersion(7);
+  const {
+    systemGlobal = "System",
+    allowTopLevelThis = false
+  } = options;
+  const reassignmentVisited = new WeakSet();
+  const reassignmentVisitor = {
+    "AssignmentExpression|UpdateExpression"(path) {
+      if (reassignmentVisited.has(path.node)) return;
+      reassignmentVisited.add(path.node);
+      const arg = path.isAssignmentExpression() ? path.get("left") : path.get("argument");
+      if (arg.isObjectPattern() || arg.isArrayPattern()) {
+        const exprs = [path.node];
+        for (const name of Object.keys(arg.getBindingIdentifiers())) {
+          if (this.scope.getBinding(name) !== path.scope.getBinding(name)) {
+            return;
+          }
+          const exportedNames = this.exports[name];
+          if (!exportedNames) continue;
+          for (const exportedName of exportedNames) {
+            exprs.push(this.buildCall(exportedName, _core.types.identifier(name)).expression);
+          }
+        }
+        path.replaceWith(_core.types.sequenceExpression(exprs));
+        return;
+      }
+      if (!arg.isIdentifier()) return;
+      const name = arg.node.name;
+      if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return;
+      const exportedNames = this.exports[name];
+      if (!exportedNames) return;
+      let node = path.node;
+      const isPostUpdateExpression = _core.types.isUpdateExpression(node, {
+        prefix: false
+      });
+      if (isPostUpdateExpression) {
+        node = _core.types.binaryExpression(node.operator[0], _core.types.unaryExpression("+", _core.types.cloneNode(node.argument)), _core.types.numericLiteral(1));
+      }
+      for (const exportedName of exportedNames) {
+        node = this.buildCall(exportedName, node).expression;
+      }
+      if (isPostUpdateExpression) {
+        node = _core.types.sequenceExpression([node, path.node]);
+      }
+      path.replaceWith(node);
+    }
+  };
+  return {
+    name: "transform-modules-systemjs",
+    pre() {
+      this.file.set("@babel/plugin-transform-modules-*", "systemjs");
+    },
+    visitor: {
+      CallExpression(path, state) {
+        if (_core.types.isImport(path.node.callee)) {
+          if (!this.file.has("@babel/plugin-proposal-dynamic-import")) {
+            {
+              console.warn(MISSING_PLUGIN_WARNING);
+            }
+          }
+          path.replaceWith((0, _helperModuleTransforms.buildDynamicImport)(path.node, false, true, specifier => _core.types.callExpression(_core.types.memberExpression(_core.types.identifier(state.contextIdent), _core.types.identifier("import")), [specifier])));
+        }
+      },
+      MetaProperty(path, state) {
+        if (path.node.meta.name === "import" && path.node.property.name === "meta") {
+          path.replaceWith(_core.types.memberExpression(_core.types.identifier(state.contextIdent), _core.types.identifier("meta")));
+        }
+      },
+      ReferencedIdentifier(path, state) {
+        if (path.node.name === "__moduleName" && !path.scope.hasBinding("__moduleName")) {
+          path.replaceWith(_core.types.memberExpression(_core.types.identifier(state.contextIdent), _core.types.identifier("id")));
+        }
+      },
+      Program: {
+        enter(path, state) {
+          state.contextIdent = path.scope.generateUid("context");
+          state.stringSpecifiers = new Set();
+          if (!allowTopLevelThis) {
+            (0, _helperModuleTransforms.rewriteThis)(path);
+          }
+        },
+        exit(path, state) {
+          const scope = path.scope;
+          const exportIdent = scope.generateUid("export");
+          const {
+            contextIdent,
+            stringSpecifiers
+          } = state;
+          const exportMap = Object.create(null);
+          const modules = [];
+          const beforeBody = [];
+          const setters = [];
+          const sources = [];
+          const variableIds = [];
+          const removedPaths = [];
+          function addExportName(key, val) {
+            exportMap[key] = exportMap[key] || [];
+            exportMap[key].push(val);
+          }
+          function pushModule(source, key, specifiers) {
+            let module;
+            modules.forEach(function (m) {
+              if (m.key === source) {
+                module = m;
+              }
+            });
+            if (!module) {
+              modules.push(module = {
+                key: source,
+                imports: [],
+                exports: []
+              });
+            }
+            module[key] = module[key].concat(specifiers);
+          }
+          function buildExportCall(name, val) {
+            return _core.types.expressionStatement(_core.types.callExpression(_core.types.identifier(exportIdent), [_core.types.stringLiteral(name), val]));
+          }
+          const exportNames = [];
+          const exportValues = [];
+          const body = path.get("body");
+          for (const path of body) {
+            if (path.isFunctionDeclaration()) {
+              beforeBody.push(path.node);
+              removedPaths.push(path);
+            } else if (path.isClassDeclaration()) {
+              variableIds.push(_core.types.cloneNode(path.node.id));
+              path.replaceWith(_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.cloneNode(path.node.id), _core.types.toExpression(path.node))));
+            } else if (path.isVariableDeclaration()) {
+              path.node.kind = "var";
+            } else if (path.isImportDeclaration()) {
+              const source = path.node.source.value;
+              pushModule(source, "imports", path.node.specifiers);
+              for (const name of Object.keys(path.getBindingIdentifiers())) {
+                scope.removeBinding(name);
+                variableIds.push(_core.types.identifier(name));
+              }
+              path.remove();
+            } else if (path.isExportAllDeclaration()) {
+              pushModule(path.node.source.value, "exports", path.node);
+              path.remove();
+            } else if (path.isExportDefaultDeclaration()) {
+              const declar = path.node.declaration;
+              if (_core.types.isClassDeclaration(declar)) {
+                const id = declar.id;
+                if (id) {
+                  exportNames.push("default");
+                  exportValues.push(scope.buildUndefinedNode());
+                  variableIds.push(_core.types.cloneNode(id));
+                  addExportName(id.name, "default");
+                  path.replaceWith(_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.cloneNode(id), _core.types.toExpression(declar))));
+                } else {
+                  exportNames.push("default");
+                  exportValues.push(_core.types.toExpression(declar));
+                  removedPaths.push(path);
+                }
+              } else if (_core.types.isFunctionDeclaration(declar)) {
+                const id = declar.id;
+                if (id) {
+                  beforeBody.push(declar);
+                  exportNames.push("default");
+                  exportValues.push(_core.types.cloneNode(id));
+                  addExportName(id.name, "default");
+                } else {
+                  exportNames.push("default");
+                  exportValues.push(_core.types.toExpression(declar));
+                }
+                removedPaths.push(path);
+              } else {
+                path.replaceWith(buildExportCall("default", declar));
+              }
+            } else if (path.isExportNamedDeclaration()) {
+              const declar = path.node.declaration;
+              if (declar) {
+                path.replaceWith(declar);
+                if (_core.types.isFunction(declar)) {
+                  const name = declar.id.name;
+                  addExportName(name, name);
+                  beforeBody.push(declar);
+                  exportNames.push(name);
+                  exportValues.push(_core.types.cloneNode(declar.id));
+                  removedPaths.push(path);
+                } else if (_core.types.isClass(declar)) {
+                  const name = declar.id.name;
+                  exportNames.push(name);
+                  exportValues.push(scope.buildUndefinedNode());
+                  variableIds.push(_core.types.cloneNode(declar.id));
+                  path.replaceWith(_core.types.expressionStatement(_core.types.assignmentExpression("=", _core.types.cloneNode(declar.id), _core.types.toExpression(declar))));
+                  addExportName(name, name);
+                } else {
+                  if (_core.types.isVariableDeclaration(declar)) {
+                    declar.kind = "var";
+                  }
+                  for (const name of Object.keys(_core.types.getBindingIdentifiers(declar))) {
+                    addExportName(name, name);
+                  }
+                }
+              } else {
+                const specifiers = path.node.specifiers;
+                if (specifiers != null && specifiers.length) {
+                  if (path.node.source) {
+                    pushModule(path.node.source.value, "exports", specifiers);
+                    path.remove();
+                  } else {
+                    const nodes = [];
+                    for (const specifier of specifiers) {
+                      const {
+                        local,
+                        exported
+                      } = specifier;
+                      const binding = scope.getBinding(local.name);
+                      const exportedName = getExportSpecifierName(exported, stringSpecifiers);
+                      if (binding && _core.types.isFunctionDeclaration(binding.path.node)) {
+                        exportNames.push(exportedName);
+                        exportValues.push(_core.types.cloneNode(local));
+                      } else if (!binding) {
+                        nodes.push(buildExportCall(exportedName, local));
+                      }
+                      addExportName(local.name, exportedName);
+                    }
+                    path.replaceWithMultiple(nodes);
+                  }
+                } else {
+                  path.remove();
+                }
+              }
+            }
+          }
+          modules.forEach(function (specifiers) {
+            const setterBody = [];
+            // --- START FORK CHANGES ---
+            const targetHint = state.opts.generateIdentifierHint ? state.opts.generateIdentifierHint(specifiers.key) : specifiers.key;
+            const target = scope.generateUid(targetHint);
+            // --- END FORK CHANGES ---
+            for (let specifier of specifiers.imports) {
+              if (_core.types.isImportNamespaceSpecifier(specifier)) {
+                setterBody.push(_core.types.expressionStatement(_core.types.assignmentExpression("=", specifier.local, _core.types.identifier(target))));
+              } else if (_core.types.isImportDefaultSpecifier(specifier)) {
+                specifier = _core.types.importSpecifier(specifier.local, _core.types.identifier("default"));
+              }
+              if (_core.types.isImportSpecifier(specifier)) {
+                const {
+                  imported
+                } = specifier;
+                setterBody.push(_core.types.expressionStatement(_core.types.assignmentExpression("=", specifier.local, _core.types.memberExpression(_core.types.identifier(target), specifier.imported, imported.type === "StringLiteral"))));
+              }
+            }
+            if (specifiers.exports.length) {
+              const exportNames = [];
+              const exportValues = [];
+              let hasExportStar = false;
+              for (const node of specifiers.exports) {
+                if (_core.types.isExportAllDeclaration(node)) {
+                  hasExportStar = true;
+                } else if (_core.types.isExportSpecifier(node)) {
+                  const exportedName = getExportSpecifierName(node.exported, stringSpecifiers);
+                  exportNames.push(exportedName);
+                  exportValues.push(_core.types.memberExpression(_core.types.identifier(target), node.local, _core.types.isStringLiteral(node.local)));
+                } else ;
+              }
+              setterBody.push(...constructExportCall(path, _core.types.identifier(exportIdent), exportNames, exportValues, hasExportStar ? _core.types.identifier(target) : null, stringSpecifiers));
+            }
+            sources.push(_core.types.stringLiteral(specifiers.key));
+            setters.push(_core.types.functionExpression(null, [_core.types.identifier(target)], _core.types.blockStatement(setterBody)));
+          });
+          let moduleName = (0, _helperModuleTransforms.getModuleName)(this.file.opts, options);
+          if (moduleName) moduleName = _core.types.stringLiteral(moduleName);
+          (0, _helperHoistVariables.default)(path, (id, name, hasInit) => {
+            variableIds.push(id);
+            if (!hasInit && name in exportMap) {
+              for (const exported of exportMap[name]) {
+                exportNames.push(exported);
+                exportValues.push(scope.buildUndefinedNode());
+              }
+            }
+          });
+          if (variableIds.length) {
+            beforeBody.unshift(_core.types.variableDeclaration("var", variableIds.map(id => _core.types.variableDeclarator(id))));
+          }
+          if (exportNames.length) {
+            beforeBody.push(...constructExportCall(path, _core.types.identifier(exportIdent), exportNames, exportValues, null, stringSpecifiers));
+          }
+          path.traverse(reassignmentVisitor, {
+            exports: exportMap,
+            buildCall: buildExportCall,
+            scope
+          });
+          for (const path of removedPaths) {
+            path.remove();
+          }
+          let hasTLA = false;
+          path.traverse({
+            AwaitExpression(path) {
+              hasTLA = true;
+              path.stop();
+            },
+            Function(path) {
+              path.skip();
+            },
+            noScope: true
+          });
+          path.node.body = [buildTemplate({
+            SYSTEM_REGISTER: _core.types.memberExpression(_core.types.identifier(systemGlobal), _core.types.identifier("register")),
+            BEFORE_BODY: beforeBody,
+            MODULE_NAME: moduleName,
+            SETTERS: _core.types.arrayExpression(setters),
+            EXECUTE: _core.types.functionExpression(null, [], _core.types.blockStatement(path.node.body), false, hasTLA),
+            SOURCES: _core.types.arrayExpression(sources),
+            EXPORT_IDENTIFIER: _core.types.identifier(exportIdent),
+            CONTEXT_IDENTIFIER: _core.types.identifier(contextIdent)
+          })];
+        }
+      }
+    }
+  };
+});
+exports.default = _default;

package/dist/main.js

@@ -14509,7 +14509,21 @@ function default_1({
   };
 }
 
+/*
+ * When systemjs format is used by babel, it will generated UID based on
+ * the import specifier:
+ * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
+ * But at this stage import specifier are absolute file urls
+ * So without minification these specifier are long and dependent
+ * on where the files are on the filesystem.
+ * This can be mitigated by minification that will rename them.
+ * But to fix this issue once and for all I have copy-pasted
+ * "@babel/plugin-transform-modules-systemjs" to introduce
+ * "generateIdentifierHint" options and prevent that from hapenning
+ */
+const TRANSFORM_MODULES_SYSTEMJS_PATH = fileURLToPath(new URL("./js/babel_plugin_transform_modules_systemjs.cjs", import.meta.url));
 const convertJsModuleToJsClassic = async ({
+  rootDirectoryUrl,
   systemJsInjection,
   systemJsClientFileUrl,
   urlInfo,
@@ -14534,7 +14548,16 @@ const convertJsModuleToJsClassic = async ({
     babelPlugins: [...(jsClassicFormat === "system" ? [
     // proposal-dynamic-import required with systemjs for babel8:
     // https://github.com/babel/babel/issues/10746
-    requireFromJsenv("@babel/plugin-proposal-dynamic-import"), requireFromJsenv("@babel/plugin-transform-modules-systemjs"), [default_1, {
+    requireFromJsenv("@babel/plugin-proposal-dynamic-import"), [
+    // eslint-disable-next-line import/no-dynamic-require
+    requireFromJsenv(TRANSFORM_MODULES_SYSTEMJS_PATH), {
+      generateIdentifierHint: key => {
+        if (key.startsWith("file://")) {
+          return urlToRelativeUrl(key, rootDirectoryUrl);
+        }
+        return key;
+      }
+    }], [default_1, {
       asyncAwait: false,
       // already handled + we might not needs it at all
       topLevelAwait: "return"
@@ -14668,6 +14691,7 @@ const jsenvPluginAsJsClassicConversion = ({
         content,
         sourcemap
       } = await convertJsModuleToJsClassic({
+        rootDirectoryUrl: context.rootDirectoryUrl,
         systemJsInjection,
         systemJsClientFileUrl,
         urlInfo,
@@ -15012,6 +15036,7 @@ const jsenvPluginAsJsClassicLibrary = ({
         content,
         sourcemap
       } = await convertJsModuleToJsClassic({
+        rootDirectoryUrl: context.rootDirectoryUrl,
         systemJsInjection,
         systemJsClientFileUrl,
         urlInfo,
@@ -15030,18 +15055,6 @@ const jsenvPluginAsJsClassicLibrary = ({
   };
 };
 
-/*
- * Something to keep in mind:
- * When systemjs format is used by babel, it will generated UID based on
- * the import specifier:
- * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
- * But at this stage import specifier are absolute file urls
- * So without minification these specifier are long and dependent
- * on where the files are on the filesystem.
- * This is mitigated by minification that will shorten them
- * But ideally babel should not generate this in the first place
- * and prefer to unique identifier based solely on the specifier basename for instance
- */
 const jsenvPluginAsJsClassic = ({
   jsClassicLibrary,
   jsClassicFallback,
@@ -20210,6 +20223,44 @@ const getCorePlugins = ({
   })] : [])];
 };
 
+const ensureUnixLineBreaks = stringOrBuffer => {
+  if (typeof stringOrBuffer === "string") {
+    const stringWithLinuxBreaks = stringOrBuffer.replace(/\r\n/g, "\n");
+    return stringWithLinuxBreaks;
+  }
+  return ensureUnixLineBreaksOnBuffer(stringOrBuffer);
+};
+
+// https://github.com/nodejs/help/issues/1738#issuecomment-458460503
+const ensureUnixLineBreaksOnBuffer = buffer => {
+  const int32Array = new Int32Array(buffer, 0, buffer.length);
+  const int32ArrayWithLineBreaksNormalized = int32Array.filter((element, index, typedArray) => {
+    if (element === 0x0d) {
+      if (typedArray[index + 1] === 0x0a) {
+        // Windows -> Unix
+        return false;
+      }
+      // Mac OS -> Unix
+      typedArray[index] = 0x0a;
+    }
+    return true;
+  });
+  return Buffer.from(int32ArrayWithLineBreaksNormalized);
+};
+
+const jsenvPluginLineBreakNormalization = () => {
+  return {
+    name: "jsenv:line_break_normalizer",
+    appliesDuring: "build",
+    transformUrlContent: urlInfo => {
+      if (CONTENT_TYPE.isTextual(urlInfo.contentType)) {
+        return ensureUnixLineBreaks(urlInfo.content);
+      }
+      return null;
+    }
+  };
+};
+
 const GRAPH = {
   map: (graph, callback) => {
     const array = [];
@@ -20472,42 +20523,13 @@ const injectVersionMappingsAsImportmap = async ({
   });
 };
 
-const ensureUnixLineBreaks = stringOrBuffer => {
-  if (typeof stringOrBuffer === "string") {
-    const stringWithLinuxBreaks = stringOrBuffer.replace(/\r\n/g, "\n");
-    return stringWithLinuxBreaks;
-  }
-  return ensureUnixLineBreaksOnBuffer(stringOrBuffer);
-};
-
-// https://github.com/nodejs/help/issues/1738#issuecomment-458460503
-const ensureUnixLineBreaksOnBuffer = buffer => {
-  const int32Array = new Int32Array(buffer, 0, buffer.length);
-  const int32ArrayWithLineBreaksNormalized = int32Array.filter((element, index, typedArray) => {
-    if (element === 0x0d) {
-      if (typedArray[index + 1] === 0x0a) {
-        // Windows -> Unix
-        return false;
-      }
-      // Mac OS -> Unix
-      typedArray[index] = 0x0a;
-    }
-    return true;
-  });
-  return Buffer.from(int32ArrayWithLineBreaksNormalized);
-};
-
 // https://github.com/rollup/rollup/blob/19e50af3099c2f627451a45a84e2fa90d20246d5/src/utils/FileEmitter.ts#L47
 // https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
 const createVersionGenerator = () => {
   const hash = createHash("sha256");
   return {
-    augmentWithContent: ({
-      content,
-      contentType = "application/octet-stream",
-      lineBreakNormalization = false
-    }) => {
-      hash.update(lineBreakNormalization && CONTENT_TYPE.isTextual(contentType) ? ensureUnixLineBreaks(content) : content);
+    augmentWithContent: content => {
+      hash.update(content);
     },
     augment: value => {
       hash.update(value);
@@ -20759,7 +20781,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       build: true,
       runtimeCompat,
       ...contextSharedDuringBuild,
-      plugins: [urlAnalysisPlugin, jsenvPluginAsJsClassic({
+      plugins: [urlAnalysisPlugin, ...(lineBreakNormalization ? [jsenvPluginLineBreakNormalization()] : []), jsenvPluginAsJsClassic({
         jsClassicLibrary: false,
         jsClassicFallback: true,
         systemJsInjection: true
@@ -21351,11 +21373,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               cleanupJsenvAttributes: true
             }) : urlInfo.content;
             const contentVersionGenerator = createVersionGenerator();
-            contentVersionGenerator.augmentWithContent({
-              content: urlContent,
-              contentType: urlInfo.contentType,
-              lineBreakNormalization
-            });
+            contentVersionGenerator.augmentWithContent(urlContent);
             const contentVersion = contentVersionGenerator.generate();
             contentVersionMap.set(urlInfo.url, contentVersion);
             const versionMutations = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "30.3.7",
+  "version": "30.3.9",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/build/build.js

@@ -67,6 +67,7 @@ import { jsenvPluginUrlAnalysis } from "../plugins/url_analysis/jsenv_plugin_url
 import { jsenvPluginInline } from "../plugins/inline/jsenv_plugin_inline.js"
 import { jsenvPluginAsJsClassic } from "../plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js"
 import { getCorePlugins } from "../plugins/plugins.js"
+import { jsenvPluginLineBreakNormalization } from "./jsenv_plugin_line_break_normalization.js"
 
 import { GRAPH } from "./graph_utils.js"
 import { createBuildUrlsGenerator } from "./build_urls_generator.js"
@@ -333,6 +334,9 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       ...contextSharedDuringBuild,
       plugins: [
         urlAnalysisPlugin,
+        ...(lineBreakNormalization
+          ? [jsenvPluginLineBreakNormalization()]
+          : []),
         jsenvPluginAsJsClassic({
           jsClassicLibrary: false,
           jsClassicFallback: true,
@@ -1017,11 +1021,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   )
                 : urlInfo.content
             const contentVersionGenerator = createVersionGenerator()
-            contentVersionGenerator.augmentWithContent({
-              content: urlContent,
-              contentType: urlInfo.contentType,
-              lineBreakNormalization,
-            })
+            contentVersionGenerator.augmentWithContent(urlContent)
             const contentVersion = contentVersionGenerator.generate()
             contentVersionMap.set(urlInfo.url, contentVersion)
             const versionMutations = []

package/src/build/jsenv_plugin_line_break_normalization.js

@@ -0,0 +1,16 @@
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+
+import { ensureUnixLineBreaks } from "./line_break_unix.js"
+
+export const jsenvPluginLineBreakNormalization = () => {
+  return {
+    name: "jsenv:line_break_normalizer",
+    appliesDuring: "build",
+    transformUrlContent: (urlInfo) => {
+      if (CONTENT_TYPE.isTextual(urlInfo.contentType)) {
+        return ensureUnixLineBreaks(urlInfo.content)
+      }
+      return null
+    },
+  }
+}

package/src/build/version_generator.js

@@ -1,24 +1,13 @@
 import { createHash } from "node:crypto"
 
-import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
-import { ensureUnixLineBreaks } from "./line_break_unix.js"
-
 // https://github.com/rollup/rollup/blob/19e50af3099c2f627451a45a84e2fa90d20246d5/src/utils/FileEmitter.ts#L47
 // https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
 export const createVersionGenerator = () => {
   const hash = createHash("sha256")
 
   return {
-    augmentWithContent: ({
-      content,
-      contentType = "application/octet-stream",
-      lineBreakNormalization = false,
-    }) => {
-      hash.update(
-        lineBreakNormalization && CONTENT_TYPE.isTextual(contentType)
-          ? ensureUnixLineBreaks(content)
-          : content,
-      )
+    augmentWithContent: (content) => {
+      hash.update(content)
     },
     augment: (value) => {
       hash.update(value)

package/src/plugins/transpilation/as_js_classic/babel_plugin_transform_modules_systemjs.cjs

@@ -0,0 +1,608 @@
+"use strict"
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+})
+exports.default = void 0
+exports.getExportSpecifierName = getExportSpecifierName
+var _helperPluginUtils = require("@babel/helper-plugin-utils")
+var _helperHoistVariables = require("@babel/helper-hoist-variables")
+var _core = require("@babel/core")
+var _helperModuleTransforms = require("@babel/helper-module-transforms")
+var _helperValidatorIdentifier = require("@babel/helper-validator-identifier")
+const buildTemplate = _core.template.statement(`
+  SYSTEM_REGISTER(MODULE_NAME, SOURCES, function (EXPORT_IDENTIFIER, CONTEXT_IDENTIFIER) {
+    "use strict";
+    BEFORE_BODY;
+    return {
+      setters: SETTERS,
+      execute: EXECUTE,
+    };
+  });
+`)
+const buildExportAll = _core.template.statement(`
+  for (var KEY in TARGET) {
+    if (KEY !== "default" && KEY !== "__esModule") EXPORT_OBJ[KEY] = TARGET[KEY];
+  }
+`)
+const MISSING_PLUGIN_WARNING = `\
+WARNING: Dynamic import() transformation must be enabled using the
+         @babel/plugin-proposal-dynamic-import plugin. Babel 8 will
+         no longer transform import() without using that plugin.
+`
+const MISSING_PLUGIN_ERROR = `\
+ERROR: Dynamic import() transformation must be enabled using the
+       @babel/plugin-proposal-dynamic-import plugin. Babel 8
+       no longer transforms import() without using that plugin.
+`
+
+function getExportSpecifierName(node, stringSpecifiers) {
+  if (node.type === "Identifier") {
+    return node.name
+  } else if (node.type === "StringLiteral") {
+    const stringValue = node.value
+    if (!(0, _helperValidatorIdentifier.isIdentifierName)(stringValue)) {
+      stringSpecifiers.add(stringValue)
+    }
+    return stringValue
+  } else {
+    throw new Error(
+      `Expected export specifier to be either Identifier or StringLiteral, got ${node.type}`,
+    )
+  }
+}
+function constructExportCall(
+  path,
+  exportIdent,
+  exportNames,
+  exportValues,
+  exportStarTarget,
+  stringSpecifiers,
+) {
+  const statements = []
+  if (!exportStarTarget) {
+    if (exportNames.length === 1) {
+      statements.push(
+        _core.types.expressionStatement(
+          _core.types.callExpression(exportIdent, [
+            _core.types.stringLiteral(exportNames[0]),
+            exportValues[0],
+          ]),
+        ),
+      )
+    } else {
+      const objectProperties = []
+      for (let i = 0; i < exportNames.length; i++) {
+        const exportName = exportNames[i]
+        const exportValue = exportValues[i]
+        objectProperties.push(
+          _core.types.objectProperty(
+            stringSpecifiers.has(exportName)
+              ? _core.types.stringLiteral(exportName)
+              : _core.types.identifier(exportName),
+            exportValue,
+          ),
+        )
+      }
+      statements.push(
+        _core.types.expressionStatement(
+          _core.types.callExpression(exportIdent, [
+            _core.types.objectExpression(objectProperties),
+          ]),
+        ),
+      )
+    }
+  } else {
+    const exportObj = path.scope.generateUid("exportObj")
+    statements.push(
+      _core.types.variableDeclaration("var", [
+        _core.types.variableDeclarator(
+          _core.types.identifier(exportObj),
+          _core.types.objectExpression([]),
+        ),
+      ]),
+    )
+    statements.push(
+      buildExportAll({
+        KEY: path.scope.generateUidIdentifier("key"),
+        EXPORT_OBJ: _core.types.identifier(exportObj),
+        TARGET: exportStarTarget,
+      }),
+    )
+    for (let i = 0; i < exportNames.length; i++) {
+      const exportName = exportNames[i]
+      const exportValue = exportValues[i]
+      statements.push(
+        _core.types.expressionStatement(
+          _core.types.assignmentExpression(
+            "=",
+            _core.types.memberExpression(
+              _core.types.identifier(exportObj),
+              _core.types.identifier(exportName),
+            ),
+            exportValue,
+          ),
+        ),
+      )
+    }
+    statements.push(
+      _core.types.expressionStatement(
+        _core.types.callExpression(exportIdent, [
+          _core.types.identifier(exportObj),
+        ]),
+      ),
+    )
+  }
+  return statements
+}
+var _default = (0, _helperPluginUtils.declare)((api, options) => {
+  api.assertVersion(7)
+  const { systemGlobal = "System", allowTopLevelThis = false } = options
+  const reassignmentVisited = new WeakSet()
+  const reassignmentVisitor = {
+    "AssignmentExpression|UpdateExpression"(path) {
+      if (reassignmentVisited.has(path.node)) return
+      reassignmentVisited.add(path.node)
+      const arg = path.isAssignmentExpression()
+        ? path.get("left")
+        : path.get("argument")
+      if (arg.isObjectPattern() || arg.isArrayPattern()) {
+        const exprs = [path.node]
+        for (const name of Object.keys(arg.getBindingIdentifiers())) {
+          if (this.scope.getBinding(name) !== path.scope.getBinding(name)) {
+            return
+          }
+          const exportedNames = this.exports[name]
+          if (!exportedNames) continue
+          for (const exportedName of exportedNames) {
+            exprs.push(
+              this.buildCall(exportedName, _core.types.identifier(name))
+                .expression,
+            )
+          }
+        }
+        path.replaceWith(_core.types.sequenceExpression(exprs))
+        return
+      }
+      if (!arg.isIdentifier()) return
+      const name = arg.node.name
+
+      if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return
+      const exportedNames = this.exports[name]
+      if (!exportedNames) return
+      let node = path.node
+
+      const isPostUpdateExpression = _core.types.isUpdateExpression(node, {
+        prefix: false,
+      })
+      if (isPostUpdateExpression) {
+        node = _core.types.binaryExpression(
+          node.operator[0],
+          _core.types.unaryExpression(
+            "+",
+            _core.types.cloneNode(node.argument),
+          ),
+          _core.types.numericLiteral(1),
+        )
+      }
+      for (const exportedName of exportedNames) {
+        node = this.buildCall(exportedName, node).expression
+      }
+      if (isPostUpdateExpression) {
+        node = _core.types.sequenceExpression([node, path.node])
+      }
+      path.replaceWith(node)
+    },
+  }
+  return {
+    name: "transform-modules-systemjs",
+    pre() {
+      this.file.set("@babel/plugin-transform-modules-*", "systemjs")
+    },
+    visitor: {
+      CallExpression(path, state) {
+        if (_core.types.isImport(path.node.callee)) {
+          if (!this.file.has("@babel/plugin-proposal-dynamic-import")) {
+            {
+              console.warn(MISSING_PLUGIN_WARNING)
+            }
+          }
+          path.replaceWith(
+            (0, _helperModuleTransforms.buildDynamicImport)(
+              path.node,
+              false,
+              true,
+              (specifier) =>
+                _core.types.callExpression(
+                  _core.types.memberExpression(
+                    _core.types.identifier(state.contextIdent),
+                    _core.types.identifier("import"),
+                  ),
+                  [specifier],
+                ),
+            ),
+          )
+        }
+      },
+      MetaProperty(path, state) {
+        if (
+          path.node.meta.name === "import" &&
+          path.node.property.name === "meta"
+        ) {
+          path.replaceWith(
+            _core.types.memberExpression(
+              _core.types.identifier(state.contextIdent),
+              _core.types.identifier("meta"),
+            ),
+          )
+        }
+      },
+      ReferencedIdentifier(path, state) {
+        if (
+          path.node.name === "__moduleName" &&
+          !path.scope.hasBinding("__moduleName")
+        ) {
+          path.replaceWith(
+            _core.types.memberExpression(
+              _core.types.identifier(state.contextIdent),
+              _core.types.identifier("id"),
+            ),
+          )
+        }
+      },
+      Program: {
+        enter(path, state) {
+          state.contextIdent = path.scope.generateUid("context")
+          state.stringSpecifiers = new Set()
+          if (!allowTopLevelThis) {
+            ;(0, _helperModuleTransforms.rewriteThis)(path)
+          }
+        },
+        exit(path, state) {
+          const scope = path.scope
+          const exportIdent = scope.generateUid("export")
+          const { contextIdent, stringSpecifiers } = state
+          const exportMap = Object.create(null)
+          const modules = []
+          const beforeBody = []
+          const setters = []
+          const sources = []
+          const variableIds = []
+          const removedPaths = []
+          function addExportName(key, val) {
+            exportMap[key] = exportMap[key] || []
+            exportMap[key].push(val)
+          }
+          function pushModule(source, key, specifiers) {
+            let module
+            modules.forEach(function (m) {
+              if (m.key === source) {
+                module = m
+              }
+            })
+            if (!module) {
+              modules.push(
+                (module = {
+                  key: source,
+                  imports: [],
+                  exports: [],
+                }),
+              )
+            }
+            module[key] = module[key].concat(specifiers)
+          }
+          function buildExportCall(name, val) {
+            return _core.types.expressionStatement(
+              _core.types.callExpression(_core.types.identifier(exportIdent), [
+                _core.types.stringLiteral(name),
+                val,
+              ]),
+            )
+          }
+          const exportNames = []
+          const exportValues = []
+          const body = path.get("body")
+          for (const path of body) {
+            if (path.isFunctionDeclaration()) {
+              beforeBody.push(path.node)
+              removedPaths.push(path)
+            } else if (path.isClassDeclaration()) {
+              variableIds.push(_core.types.cloneNode(path.node.id))
+              path.replaceWith(
+                _core.types.expressionStatement(
+                  _core.types.assignmentExpression(
+                    "=",
+                    _core.types.cloneNode(path.node.id),
+                    _core.types.toExpression(path.node),
+                  ),
+                ),
+              )
+            } else if (path.isVariableDeclaration()) {
+              path.node.kind = "var"
+            } else if (path.isImportDeclaration()) {
+              const source = path.node.source.value
+              pushModule(source, "imports", path.node.specifiers)
+              for (const name of Object.keys(path.getBindingIdentifiers())) {
+                scope.removeBinding(name)
+                variableIds.push(_core.types.identifier(name))
+              }
+              path.remove()
+            } else if (path.isExportAllDeclaration()) {
+              pushModule(path.node.source.value, "exports", path.node)
+              path.remove()
+            } else if (path.isExportDefaultDeclaration()) {
+              const declar = path.node.declaration
+              if (_core.types.isClassDeclaration(declar)) {
+                const id = declar.id
+                if (id) {
+                  exportNames.push("default")
+                  exportValues.push(scope.buildUndefinedNode())
+                  variableIds.push(_core.types.cloneNode(id))
+                  addExportName(id.name, "default")
+                  path.replaceWith(
+                    _core.types.expressionStatement(
+                      _core.types.assignmentExpression(
+                        "=",
+                        _core.types.cloneNode(id),
+                        _core.types.toExpression(declar),
+                      ),
+                    ),
+                  )
+                } else {
+                  exportNames.push("default")
+                  exportValues.push(_core.types.toExpression(declar))
+                  removedPaths.push(path)
+                }
+              } else if (_core.types.isFunctionDeclaration(declar)) {
+                const id = declar.id
+                if (id) {
+                  beforeBody.push(declar)
+                  exportNames.push("default")
+                  exportValues.push(_core.types.cloneNode(id))
+                  addExportName(id.name, "default")
+                } else {
+                  exportNames.push("default")
+                  exportValues.push(_core.types.toExpression(declar))
+                }
+                removedPaths.push(path)
+              } else {
+                path.replaceWith(buildExportCall("default", declar))
+              }
+            } else if (path.isExportNamedDeclaration()) {
+              const declar = path.node.declaration
+              if (declar) {
+                path.replaceWith(declar)
+                if (_core.types.isFunction(declar)) {
+                  const name = declar.id.name
+                  addExportName(name, name)
+                  beforeBody.push(declar)
+                  exportNames.push(name)
+                  exportValues.push(_core.types.cloneNode(declar.id))
+                  removedPaths.push(path)
+                } else if (_core.types.isClass(declar)) {
+                  const name = declar.id.name
+                  exportNames.push(name)
+                  exportValues.push(scope.buildUndefinedNode())
+                  variableIds.push(_core.types.cloneNode(declar.id))
+                  path.replaceWith(
+                    _core.types.expressionStatement(
+                      _core.types.assignmentExpression(
+                        "=",
+                        _core.types.cloneNode(declar.id),
+                        _core.types.toExpression(declar),
+                      ),
+                    ),
+                  )
+                  addExportName(name, name)
+                } else {
+                  if (_core.types.isVariableDeclaration(declar)) {
+                    declar.kind = "var"
+                  }
+                  for (const name of Object.keys(
+                    _core.types.getBindingIdentifiers(declar),
+                  )) {
+                    addExportName(name, name)
+                  }
+                }
+              } else {
+                const specifiers = path.node.specifiers
+                if (specifiers != null && specifiers.length) {
+                  if (path.node.source) {
+                    pushModule(path.node.source.value, "exports", specifiers)
+                    path.remove()
+                  } else {
+                    const nodes = []
+                    for (const specifier of specifiers) {
+                      const { local, exported } = specifier
+                      const binding = scope.getBinding(local.name)
+                      const exportedName = getExportSpecifierName(
+                        exported,
+                        stringSpecifiers,
+                      )
+                      if (
+                        binding &&
+                        _core.types.isFunctionDeclaration(binding.path.node)
+                      ) {
+                        exportNames.push(exportedName)
+                        exportValues.push(_core.types.cloneNode(local))
+                      } else if (!binding) {
+                        nodes.push(buildExportCall(exportedName, local))
+                      }
+                      addExportName(local.name, exportedName)
+                    }
+                    path.replaceWithMultiple(nodes)
+                  }
+                } else {
+                  path.remove()
+                }
+              }
+            }
+          }
+          modules.forEach(function (specifiers) {
+            const setterBody = []
+            // --- START FORK CHANGES ---
+            const targetHint = state.opts.generateIdentifierHint
+              ? state.opts.generateIdentifierHint(specifiers.key)
+              : specifiers.key
+            const target = scope.generateUid(targetHint)
+            // --- END FORK CHANGES ---
+            for (let specifier of specifiers.imports) {
+              if (_core.types.isImportNamespaceSpecifier(specifier)) {
+                setterBody.push(
+                  _core.types.expressionStatement(
+                    _core.types.assignmentExpression(
+                      "=",
+                      specifier.local,
+                      _core.types.identifier(target),
+                    ),
+                  ),
+                )
+              } else if (_core.types.isImportDefaultSpecifier(specifier)) {
+                specifier = _core.types.importSpecifier(
+                  specifier.local,
+                  _core.types.identifier("default"),
+                )
+              }
+              if (_core.types.isImportSpecifier(specifier)) {
+                const { imported } = specifier
+                setterBody.push(
+                  _core.types.expressionStatement(
+                    _core.types.assignmentExpression(
+                      "=",
+                      specifier.local,
+                      _core.types.memberExpression(
+                        _core.types.identifier(target),
+                        specifier.imported,
+                        imported.type === "StringLiteral",
+                      ),
+                    ),
+                  ),
+                )
+              }
+            }
+            if (specifiers.exports.length) {
+              const exportNames = []
+              const exportValues = []
+              let hasExportStar = false
+              for (const node of specifiers.exports) {
+                if (_core.types.isExportAllDeclaration(node)) {
+                  hasExportStar = true
+                } else if (_core.types.isExportSpecifier(node)) {
+                  const exportedName = getExportSpecifierName(
+                    node.exported,
+                    stringSpecifiers,
+                  )
+                  exportNames.push(exportedName)
+                  exportValues.push(
+                    _core.types.memberExpression(
+                      _core.types.identifier(target),
+                      node.local,
+                      _core.types.isStringLiteral(node.local),
+                    ),
+                  )
+                } else {
+                }
+              }
+
+              setterBody.push(
+                ...constructExportCall(
+                  path,
+                  _core.types.identifier(exportIdent),
+                  exportNames,
+                  exportValues,
+                  hasExportStar ? _core.types.identifier(target) : null,
+                  stringSpecifiers,
+                ),
+              )
+            }
+            sources.push(_core.types.stringLiteral(specifiers.key))
+            setters.push(
+              _core.types.functionExpression(
+                null,
+                [_core.types.identifier(target)],
+                _core.types.blockStatement(setterBody),
+              ),
+            )
+          })
+          let moduleName = (0, _helperModuleTransforms.getModuleName)(
+            this.file.opts,
+            options,
+          )
+          if (moduleName) moduleName = _core.types.stringLiteral(moduleName)
+          ;(0, _helperHoistVariables.default)(path, (id, name, hasInit) => {
+            variableIds.push(id)
+            if (!hasInit && name in exportMap) {
+              for (const exported of exportMap[name]) {
+                exportNames.push(exported)
+                exportValues.push(scope.buildUndefinedNode())
+              }
+            }
+          })
+          if (variableIds.length) {
+            beforeBody.unshift(
+              _core.types.variableDeclaration(
+                "var",
+                variableIds.map((id) => _core.types.variableDeclarator(id)),
+              ),
+            )
+          }
+          if (exportNames.length) {
+            beforeBody.push(
+              ...constructExportCall(
+                path,
+                _core.types.identifier(exportIdent),
+                exportNames,
+                exportValues,
+                null,
+                stringSpecifiers,
+              ),
+            )
+          }
+          path.traverse(reassignmentVisitor, {
+            exports: exportMap,
+            buildCall: buildExportCall,
+            scope,
+          })
+          for (const path of removedPaths) {
+            path.remove()
+          }
+          let hasTLA = false
+          path.traverse({
+            AwaitExpression(path) {
+              hasTLA = true
+              path.stop()
+            },
+            Function(path) {
+              path.skip()
+            },
+            noScope: true,
+          })
+          path.node.body = [
+            buildTemplate({
+              SYSTEM_REGISTER: _core.types.memberExpression(
+                _core.types.identifier(systemGlobal),
+                _core.types.identifier("register"),
+              ),
+              BEFORE_BODY: beforeBody,
+              MODULE_NAME: moduleName,
+              SETTERS: _core.types.arrayExpression(setters),
+              EXECUTE: _core.types.functionExpression(
+                null,
+                [],
+                _core.types.blockStatement(path.node.body),
+                false,
+                hasTLA,
+              ),
+              SOURCES: _core.types.arrayExpression(sources),
+              EXPORT_IDENTIFIER: _core.types.identifier(exportIdent),
+              CONTEXT_IDENTIFIER: _core.types.identifier(contextIdent),
+            }),
+          ]
+        },
+      },
+    },
+  }
+})
+exports.default = _default
+
+//# sourceMappingURL=index.js.map

package/src/plugins/transpilation/as_js_classic/convert_js_module_to_js_classic.js

@@ -1,3 +1,5 @@
+import { fileURLToPath } from "node:url"
+import { urlToRelativeUrl } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
 import {
   createMagicSource,
@@ -15,7 +17,24 @@ import { babelPluginTransformImportMetaResolve } from "./helpers/babel_plugin_tr
 // because of https://github.com/rpetrich/babel-plugin-transform-async-to-promises/issues/84
 import customAsyncToPromises from "./async-to-promises.js"
 
+/*
+ * When systemjs format is used by babel, it will generated UID based on
+ * the import specifier:
+ * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
+ * But at this stage import specifier are absolute file urls
+ * So without minification these specifier are long and dependent
+ * on where the files are on the filesystem.
+ * This can be mitigated by minification that will rename them.
+ * But to fix this issue once and for all I have copy-pasted
+ * "@babel/plugin-transform-modules-systemjs" to introduce
+ * "generateIdentifierHint" options and prevent that from hapenning
+ */
+const TRANSFORM_MODULES_SYSTEMJS_PATH = fileURLToPath(
+  new URL("./babel_plugin_transform_modules_systemjs.cjs", import.meta.url),
+)
+
 export const convertJsModuleToJsClassic = async ({
+  rootDirectoryUrl,
   systemJsInjection,
   systemJsClientFileUrl,
   urlInfo,
@@ -41,7 +60,18 @@ export const convertJsModuleToJsClassic = async ({
             // proposal-dynamic-import required with systemjs for babel8:
             // https://github.com/babel/babel/issues/10746
             requireFromJsenv("@babel/plugin-proposal-dynamic-import"),
-            requireFromJsenv("@babel/plugin-transform-modules-systemjs"),
+            [
+              // eslint-disable-next-line import/no-dynamic-require
+              requireFromJsenv(TRANSFORM_MODULES_SYSTEMJS_PATH),
+              {
+                generateIdentifierHint: (key) => {
+                  if (key.startsWith("file://")) {
+                    return urlToRelativeUrl(key, rootDirectoryUrl)
+                  }
+                  return key
+                },
+              },
+            ],
             [
               customAsyncToPromises,
               {

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js

@@ -1,16 +1,3 @@
-/*
- * Something to keep in mind:
- * When systemjs format is used by babel, it will generated UID based on
- * the import specifier:
- * https://github.com/babel/babel/blob/97d1967826077f15e766778c0d64711399e9a72a/packages/babel-plugin-transform-modules-systemjs/src/index.ts#L498
- * But at this stage import specifier are absolute file urls
- * So without minification these specifier are long and dependent
- * on where the files are on the filesystem.
- * This is mitigated by minification that will shorten them
- * But ideally babel should not generate this in the first place
- * and prefer to unique identifier based solely on the specifier basename for instance
- */
-
 import { urlToFilename } from "@jsenv/urls"
 import { jsenvPluginAsJsClassicConversion } from "./jsenv_plugin_as_js_classic_conversion.js"
 import { jsenvPluginAsJsClassicHtml } from "./jsenv_plugin_as_js_classic_html.js"

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_conversion.js

@@ -98,6 +98,7 @@ export const jsenvPluginAsJsClassicConversion = ({
         context.urlGraph.deleteUrlInfo(jsModuleUrlInfo.url)
       }
       const { content, sourcemap } = await convertJsModuleToJsClassic({
+        rootDirectoryUrl: context.rootDirectoryUrl,
         systemJsInjection,
         systemJsClientFileUrl,
         urlInfo,

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_library.js

@@ -74,6 +74,7 @@ export const jsenvPluginAsJsClassicLibrary = ({
         })
       }
       const { content, sourcemap } = await convertJsModuleToJsClassic({
+        rootDirectoryUrl: context.rootDirectoryUrl,
         systemJsInjection,
         systemJsClientFileUrl,
         urlInfo,