@jsenv/plugin-commonjs 0.3.3 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-commonjs",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
     "cjs-module-lexer": "1.2.2",
     "is-valid-identifier": "2.0.2",
     "resolve": "1.22.1",
-    "rollup": "2.76.0",
+    "rollup": "2.77.0",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-polyfill-node": "0.10.1",
     "vm2": "3.9.10"

package/src/cjs_to_esm_raw.js

@@ -7,15 +7,16 @@ export const commonJsToJsModuleRaw = async ({
   logLevel,
   sourceFileUrl,
 
-  replaceGlobalObject = true,
-  replaceGlobalFilename = true,
-  replaceGlobalDirname = true,
-  replaceProcessEnvNodeEnv = true,
-  replaceProcess = true,
-  replaceBuffer = true,
+  browsers = true,
+  replaceGlobalObject = browsers,
+  replaceGlobalFilename = browsers,
+  replaceGlobalDirname = browsers,
+  replaceProcessEnvNodeEnv = browsers,
+  replaceProcess = browsers,
+  replaceBuffer = browsers,
   processEnvNodeEnv = process.env.NODE_ENV,
   replaceMap = {},
-  convertBuiltinsToBrowser = true,
+  convertBuiltinsToBrowser = browsers,
   external = [],
   sourcemapExcludeSources,
 } = {}) => {
@@ -31,14 +32,16 @@ export const commonJsToJsModuleRaw = async ({
 
   const { nodeResolve } = await import("@rollup/plugin-node-resolve")
   const nodeResolveRollupPlugin = nodeResolve({
-    mainFields: [
-      "browser:module",
-      "module",
-      "browser",
-      "main:esnext",
-      "jsnext:main",
-      "main",
-    ],
+    mainFields: browsers
+      ? [
+          "browser:module",
+          "module",
+          "browser",
+          "main:esnext",
+          "jsnext:main",
+          "main",
+        ]
+      : ["module", "main:esnext", "jsxnext:main", "main"],
     extensions: [".mjs", ".cjs", ".js", ".json"],
     preferBuiltins: false,
     exportConditions: [],
@@ -82,13 +85,6 @@ export const commonJsToJsModuleRaw = async ({
   const { default: createNodeGlobalRollupPlugin } = await import(
     "rollup-plugin-node-globals"
   )
-  const nodeGlobalRollupPlugin = createNodeGlobalRollupPlugin({
-    global: false, // handled by replaceMap
-    dirname: false, // handled by replaceMap
-    filename: false, // handled by replaceMap
-    process: replaceProcess,
-    buffer: replaceBuffer,
-  })
 
   const commonJsNamedExportsRollupPlugin = rollupPluginCommonJsNamedExports({
     logger,
@@ -109,7 +105,17 @@ export const commonJsToJsModuleRaw = async ({
       replaceRollupPlugin,
       commonJsRollupPlugin,
       commonJsNamedExportsRollupPlugin,
-      nodeGlobalRollupPlugin,
+      ...(replaceProcess || replaceBuffer
+        ? [
+            createNodeGlobalRollupPlugin({
+              global: false, // handled by replaceMap
+              dirname: false, // handled by replaceMap
+              filename: false, // handled by replaceMap
+              process: replaceProcess,
+              buffer: replaceBuffer,
+            }),
+          ]
+        : []),
       ...(convertBuiltinsToBrowser
         ? [
             rollupPluginNodePolyfills({
@@ -119,6 +125,13 @@ export const commonJsToJsModuleRaw = async ({
         : []),
     ],
     onwarn: (warning) => {
+      if (
+        warning.code === "UNRESOLVED_IMPORT" &&
+        warning.importer.endsWith("?commonjs-external")
+      ) {
+        return
+      }
+
       const { loc, message } = warning
       const logMessage = loc
         ? `${loc.file}:${loc.line}:${loc.column} ${message}`

package/src/jsenv_plugin_commonjs.js

@@ -48,10 +48,14 @@ export const jsenvPluginCommonJs = ({
       if (!originalUrlInfo) {
         return null
       }
+      const nodeRuntimeEnabled = Object.keys(context.runtimeCompat).includes(
+        "node",
+      )
       const { content, sourcemap, isValid } = await commonJsToJsModule({
         logLevel,
         rootDirectoryUrl: context.rootDirectoryUrl,
         sourceFileUrl: originalUrlInfo.url,
+        browsers: !nodeRuntimeEnabled,
         processEnvNodeEnv:
           context.scenario === "dev" || context.scenario === "test"
             ? "development"