@jsenv/plugin-commonjs 2.1.1 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,18 +24,18 @@
     "test": "node --conditions=development ./scripts/test.mjs"
   },
   "dependencies": {
-    "@jsenv/filesystem": "4.2.3",
+    "@jsenv/filesystem": "4.2.4",
     "@jsenv/log": "3.4.0",
     "@jsenv/url-meta": "8.1.0",
-    "@jsenv/urls": "2.0.0",
-    "@rollup/plugin-commonjs": "25.0.0",
+    "@jsenv/urls": "2.1.0",
+    "@rollup/plugin-commonjs": "25.0.2",
     "@rollup/plugin-json": "6.0.0",
     "@rollup/plugin-node-resolve": "15.1.0",
     "@rollup/plugin-replace": "5.0.2",
-    "cjs-module-lexer": "1.2.2",
+    "cjs-module-lexer": "1.2.3",
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.2",
-    "rollup": "3.24.0",
+    "rollup": "3.26.2",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-polyfill-node": "0.12.0",
     "vm2": "3.9.19"

package/src/jsenv_plugin_commonjs.js

@@ -4,19 +4,21 @@ import { defaultLookupPackageScope } from "@jsenv/node-esm-resolution";
 
 import { commonJsToJsModule } from "./cjs_to_esm.js";
 
-const compileCacheDirectoryUrl = new URL("../.cache/", import.meta.url);
+const compileCacheDirectoryUrlDefault = new URL("../.cache/", import.meta.url);
 
 export const jsenvPluginCommonJs = ({
   name = "jsenv:commonjs",
   logLevel,
   include,
+  compileCacheDirectoryUrl = compileCacheDirectoryUrlDefault,
+  dev,
 }) => {
   const markAsJsModuleProxy = (reference) => {
     reference.expectedType = "js_module";
     const packageFileUrl = defaultLookupPackageScope(reference.url);
     if (packageFileUrl) {
       reference.filename = `${reference.specifier}${urlToExtension(
-        reference.parentUrl,
+        reference.ownerUrlInfo.url,
       )}`;
     }
   };
@@ -56,31 +58,29 @@ export const jsenvPluginCommonJs = ({
       reference.data.commonjs = commonjs;
       return turnIntoJsModuleProxy(reference);
     },
-    fetchUrlContent: async (urlInfo, context) => {
-      const [commonJsReference, commonJsUrlInfo] =
-        context.getWithoutSearchParam({
-          urlInfo,
-          context,
-          searchParam: "cjs_as_js_module",
+    fetchUrlContent: async (urlInfo) => {
+      const commonJsUrlInfo = urlInfo.getWithoutSearchParam(
+        "cjs_as_js_module",
+        {
           // during this fetch we don't want to alter the original file
           // so we consider it as text
           expectedType: "text",
-        });
-      if (!commonJsReference) {
+        },
+      );
+      if (!commonJsUrlInfo) {
         return null;
       }
-      await context.fetchUrlContent(commonJsUrlInfo, {
-        reference: commonJsReference,
-      });
-      const nodeRuntimeEnabled = Object.keys(context.runtimeCompat).includes(
-        "node",
-      );
+      await commonJsUrlInfo.fetchContent();
+      const nodeRuntimeEnabled = Object.keys(
+        urlInfo.context.runtimeCompat,
+      ).includes("node");
       const { content, sourcemap, isValid } = await commonJsToJsModule({
         logLevel,
         compileCacheDirectoryUrl,
         sourceFileUrl: commonJsUrlInfo.url,
         browsers: !nodeRuntimeEnabled,
-        processEnvNodeEnv: context.dev ? "development" : "production",
+        processEnvNodeEnv:
+          dev || urlInfo.context.dev ? "development" : "production",
         ...urlInfo.data.commonjs,
       });
       if (isValid) {