fix(rollup): resolve unenv paths with expected version (#3073)

Author: pi0

package.json

@@ -163,7 +163,7 @@
     "ultrahtml": "^1.5.3",
     "uncrypto": "^0.1.3",
     "unctx": "^2.4.1",
-    "unenv": "2.0.0-rc.2",
+    "unenv": "2.0.0-rc.3",
     "unimport": "^4.0.0",
     "unstorage": "^1.14.4",
     "untyped": "^1.5.2",

pnpm-lock.yaml

@@ -45,22 +45,33 @@ const resolvePresetRuntime = (m: string) => join(presetRuntimeDir, `${m}.mjs`);
 export const unenvCfPreset: Preset = {
   external: nodeCompatModules.map((m) => `node:${m}`),
   alias: {
-    // <id> => node:<id>
-    ...Object.fromEntries(nodeCompatModules.map((m) => [m, `node:${m}`])),
-    ...Object.fromEntries(hybridNodeCompatModules.map((m) => [m, `node:${m}`])),
-    // node:<id> => runtime/<id>.mjs (hybrid)
+    // (native)
     ...Object.fromEntries(
-      hybridNodeCompatModules.map((m) => [
-        `node:${m}`,
-        resolvePresetRuntime(m === "sys" ? "util" : m),
+      nodeCompatModules.flatMap((m) => [
+        [m, `node:${m}`],
+        [`node:${m}`, `node:${m}`],
       ])
     ),
+    // (hybrid)
+    ...Object.fromEntries(
+      hybridNodeCompatModules.flatMap((m) => {
+        const resolved = resolvePresetRuntime(m);
+        return [
+          [`node:${m}`, resolved],
+          [m, resolved],
+        ];
+      })
+    ),
     sys: resolvePresetRuntime("util"),
     "node:sys": resolvePresetRuntime("util"),
     "node-mock-http/_polyfill/events": "node:events",
     "node-mock-http/_polyfill/buffer": "node:buffer",
   },
   inject: {
+    // process: "TODO",
+    // console: "TODO",
+    Buffer: ["node:buffer", "Buffer"],
+    "global.Buffer": ["node:buffer", "Buffer"],
     "globalThis.Buffer": ["node:buffer", "Buffer"],
   },
 };

src/presets/cloudflare/unenv/preset.ts

@@ -20,7 +20,7 @@ import { dirname, join, normalize, resolve } from "pathe";
 import type { Plugin } from "rollup";
 import { visualizer } from "rollup-plugin-visualizer";
 import { isTest, isWindows } from "std-env";
-import * as unenv from "unenv";
+import { defineEnv } from "unenv";
 import type { Preset } from "unenv";
 import unimportPlugin from "unimport/unplugin";
 import { rollup as unwasm } from "unwasm/plugin";
@@ -54,27 +54,46 @@ export const getRollupConfig = (nitro: Nitro): RollupConfig => {
     ".jsx",
   ];
 
-  const nodePreset = nitro.options.node === false ? unenv.nodeless : unenv.node;
-
-  const builtinPreset: Preset = {
-    alias: {
-      // General
-      ...(nitro.options.dev
-        ? {}
-        : {
-            debug: "unenv/npm/debug",
-          }),
-      ...(nitro.options.node === false
-        ? {}
-        : {
-            "node-mock-http/_polyfill/events": "node:events",
-            "node-mock-http/_polyfill/buffer": "node:buffer",
-          }),
-      ...nitro.options.alias,
+  const isNodeless = nitro.options.node === false;
+
+  const { env } = defineEnv({
+    nodeCompat: isNodeless,
+    resolve: true,
+    presets: [
+      isNodeless
+        ? {
+            // Backward compatibility (remove in v2)
+            // https://github.com/unjs/unenv/pull/427
+            inject: {
+              performance: "unenv/polyfill/performance",
+            },
+            polyfill: [
+              "unenv/polyfill/globalthis-global",
+              "unenv/polyfill/process",
+              "unenv/polyfill/performance",
+            ],
+          }
+        : {},
+      nitro.options.unenv,
+    ],
+    overrides: {
+      alias: {
+        // General
+        ...(nitro.options.dev
+          ? {}
+          : {
+              debug: "unenv/npm/debug",
+            }),
+        ...(isNodeless
+          ? {}
+          : {
+              "node-mock-http/_polyfill/events": "node:events",
+              "node-mock-http/_polyfill/buffer": "node:buffer",
+            }),
+        ...nitro.options.alias,
+      },
     },
-  };
-
-  const env = unenv.env(nodePreset, builtinPreset, nitro.options.unenv);
+  });
 
   const buildServerDir = join(nitro.options.buildDir, "dist/server");