@jsenv/plugin-commonjs 2.10.14 → 2.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "2.10.14",
+  "version": "2.11.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/core",
@@ -19,11 +19,11 @@
     "/src/"
   ],
   "dependencies": {
-    "@jsenv/filesystem": "4.15.5",
+    "@jsenv/filesystem": "4.15.6",
     "@jsenv/humanize": "1.6.0",
-    "@jsenv/node-esm-resolution": "1.2.6",
+    "@jsenv/node-esm-resolution": "1.2.7",
     "@jsenv/url-meta": "8.5.7",
-    "@jsenv/urls": "2.9.0",
+    "@jsenv/urls": "2.9.1",
     "@rollup/plugin-commonjs": "28.0.3",
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "16.0.1",
@@ -32,7 +32,6 @@
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.10",
     "rollup": "4.40.1",
-    "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-polyfill-node": "0.13.0"
   },
   "devDependencies": {

package/src/cjs_to_esm_raw.js

@@ -11,8 +11,6 @@ export const commonJsToJsModuleRaw = async ({
   replaceGlobalFilename = browsers,
   replaceGlobalDirname = browsers,
   replaceProcessEnvNodeEnv = browsers,
-  replaceProcess = browsers,
-  replaceBuffer = browsers,
   processEnvNodeEnv = process.env.NODE_ENV,
   replaceMap = {},
   convertBuiltinsToBrowser = browsers,
@@ -82,10 +80,6 @@ export const commonJsToJsModuleRaw = async ({
     requireReturnsDefault: "auto",
   });
 
-  const { default: createNodeGlobalRollupPlugin } = await import(
-    "rollup-plugin-node-globals"
-  );
-
   const commonJsNamedExportsRollupPlugin = rollupPluginCommonJsNamedExports({
     logger,
   });
@@ -111,17 +105,6 @@ export const commonJsToJsModuleRaw = async ({
       replaceRollupPlugin,
       commonJsRollupPlugin,
       commonJsNamedExportsRollupPlugin,
-      ...(replaceProcess || replaceBuffer
-        ? [
-            createNodeGlobalRollupPlugin({
-              global: false, // handled by replaceMap
-              dirname: false, // handled by replaceMap
-              filename: false, // handled by replaceMap
-              process: replaceProcess,
-              buffer: replaceBuffer,
-            }),
-          ]
-        : []),
       ...(convertBuiltinsToBrowser
         ? [
             rollupPluginNodePolyfills({

package/src/jsenv_plugin_commonjs.js

@@ -1,7 +1,15 @@
 // for reference this is how Node.js detect module format https://github.com/nodejs/node/blob/a446e3bdc96b0f263fd363ce89b9c739b066240f/lib/internal/modules/esm/get_format.js#L1
-import { defaultLookupPackageScope } from "@jsenv/node-esm-resolution";
+import {
+  applyNodeEsmResolution,
+  defaultLookupPackageScope,
+} from "@jsenv/node-esm-resolution";
 import { URL_META } from "@jsenv/url-meta";
-import { injectQueryParams, urlToBasename, urlToExtension } from "@jsenv/urls";
+import {
+  injectQueryParams,
+  pathnameToExtension,
+  urlToBasename,
+  urlToExtension,
+} from "@jsenv/urls";
 import { commonJsToJsModule } from "./cjs_to_esm.js";
 
 const compileCacheDirectoryUrlDefault = new URL("../.cache/", import.meta.url);
@@ -38,10 +46,23 @@ export const jsenvPluginCommonJs = ({
   let associations;
   let nodeRuntimeEnabled;
 
+  const packageConditionsConfig = {};
+  const onIncludedUrl = (url) => {
+    url = String(url);
+    if (url.endsWith(".map")) {
+      return;
+    }
+    packageConditionsConfig[url] = ["node", "import", "require"];
+  };
+
   return {
     name,
     appliesDuring: "*",
-    init: ({ rootDirectoryUrl, outDirectoryUrl, runtimeCompat }) => {
+    init: (kitchenContext) => {
+      const { rootDirectoryUrl, outDirectoryUrl, runtimeCompat } =
+        kitchenContext;
+      kitchenContext.packageConditionsConfig = packageConditionsConfig;
+
       associations = URL_META.resolveAssociations(
         {
           commonjs: {
@@ -49,7 +70,37 @@ export const jsenvPluginCommonJs = ({
             "/**/*.map": false,
           },
         },
-        rootDirectoryUrl,
+        (pattern) => {
+          if (!isBareSpecifier(pattern)) {
+            const url = new URL(pattern, rootDirectoryUrl);
+            onIncludedUrl(url);
+            return url;
+          }
+          try {
+            if (!pattern.endsWith("/") && !pathnameToExtension(pattern)) {
+              pattern = `${pattern}/`;
+            }
+            if (pattern.endsWith("/")) {
+              // avoid package path not exported
+              const { packageDirectoryUrl } = applyNodeEsmResolution({
+                specifier: pattern.slice(0, -1),
+                parentUrl: rootDirectoryUrl,
+              });
+              onIncludedUrl(packageDirectoryUrl);
+              return packageDirectoryUrl;
+            }
+            const { url } = applyNodeEsmResolution({
+              specifier: pattern,
+              parentUrl: rootDirectoryUrl,
+            });
+            onIncludedUrl(url);
+            return url;
+          } catch {
+            const url = new URL(pattern, rootDirectoryUrl);
+            onIncludedUrl(url);
+            return url;
+          }
+        },
       );
       nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
       if (compileCacheDirectoryUrl === undefined) {