@jsenv/plugin-commonjs 2.3.1 → 2.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "2.3.1",
+  "version": "2.4.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,14 +28,14 @@
     "@jsenv/log": "3.4.0",
     "@jsenv/url-meta": "8.1.0",
     "@jsenv/urls": "2.1.0",
-    "@rollup/plugin-commonjs": "25.0.2",
+    "@rollup/plugin-commonjs": "25.0.3",
     "@rollup/plugin-json": "6.0.0",
     "@rollup/plugin-node-resolve": "15.1.0",
     "@rollup/plugin-replace": "5.0.2",
     "cjs-module-lexer": "1.2.3",
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.2",
-    "rollup": "3.26.2",
+    "rollup": "3.26.3",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-polyfill-node": "0.12.0",
     "vm2": "3.9.19"

package/src/jsenv_plugin_commonjs.js

@@ -1,5 +1,5 @@
 import { URL_META } from "@jsenv/url-meta";
-import { injectQueryParams, urlToExtension } from "@jsenv/urls";
+import { injectQueryParams, urlToExtension, urlToBasename } from "@jsenv/urls";
 import { defaultLookupPackageScope } from "@jsenv/node-esm-resolution";
 
 import { commonJsToJsModule } from "./cjs_to_esm.js";
@@ -15,11 +15,16 @@ export const jsenvPluginCommonJs = ({
 }) => {
   const markAsJsModuleProxy = (reference) => {
     reference.expectedType = "js_module";
-    const packageFileUrl = defaultLookupPackageScope(reference.url);
-    if (packageFileUrl) {
-      reference.filename = `${reference.specifier}${urlToExtension(
-        reference.ownerUrlInfo.url,
-      )}`;
+    const onwerUrlExtension = urlToExtension(reference.ownerUrlInfo.url);
+    const referenceUrlExtension = urlToExtension(reference.url);
+    if (referenceUrlExtension !== onwerUrlExtension) {
+      const packageFileUrl = defaultLookupPackageScope(reference.url);
+      if (packageFileUrl) {
+        const basename = isBareSpecifier(reference.specifier)
+          ? reference.specifier
+          : urlToBasename(reference.url);
+        reference.filename = `${basename}${onwerUrlExtension}`;
+      }
     }
   };
   const turnIntoJsModuleProxy = (reference) => {
@@ -108,3 +113,20 @@ export const jsenvPluginCommonJs = ({
     },
   };
 };
+
+const isBareSpecifier = (specifier) => {
+  if (
+    specifier[0] === "/" ||
+    specifier.startsWith("./") ||
+    specifier.startsWith("../")
+  ) {
+    return false;
+  }
+  try {
+    // eslint-disable-next-line no-new
+    new URL(specifier);
+    return false;
+  } catch (e) {
+    return true;
+  }
+};