feat: upgrade to unenv v2 (#3072)

pi0 · web-flow · commit ac78f21d5b1b · 2025-02-06T21:45:54.000+01:00
diff --git a/docs/3.config/0.index.md b/docs/3.config/0.index.md
@@ -547,7 +547,7 @@ If enabled, will analyze server bundle after build using [rollup-plugin-visualiz
 
 ### `moduleSideEffects`
 
-Default: `['unenv/runtime/polyfill/', 'node-fetch-native/polyfill']`
+Default: `['unenv/polyfill/', 'node-fetch-native/polyfill']`
 
 Rollup specific option. Specifies module imports that have side-effects
 
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -5,6 +5,7 @@ export default unjs({
     "**/.output",
     "**/.nitro",
     "**/.netlify",
+    "**/.vercel",
     "**/.nuxt",
     "**/*.gen.*",
     "**/dist",
diff --git a/package.json b/package.json
@@ -129,7 +129,7 @@
     "fs-extra": "^11.3.0",
     "globby": "^14.0.2",
     "gzip-size": "^7.0.0",
-    "h3": "^1.14.0",
+    "h3": "^1.15.0",
     "hookable": "^5.5.3",
     "httpxy": "^0.1.7",
     "ioredis": "^5.4.2",
@@ -163,7 +163,7 @@
     "ultrahtml": "^1.5.3",
     "uncrypto": "^0.1.3",
     "unctx": "^2.4.1",
-    "unenv": "^1.10.0",
+    "unenv": "2.0.0-rc.2",
     "unimport": "^4.0.0",
     "unstorage": "^1.14.4",
     "untyped": "^1.5.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/runtime-meta.mjs b/runtime-meta.mjs
@@ -15,6 +15,7 @@ export const runtimeDependencies = [
   "iron-webcrypto",
   "klona",
   "node-fetch-native",
+  "node-mock-http",
   "ofetch",
   "ohash",
   "pathe",
diff --git a/src/core/config/defaults.ts b/src/core/config/defaults.ts
@@ -76,7 +76,7 @@ export const NitroDefaults: NitroConfig = {
   unenv: {},
   analyze: false,
   moduleSideEffects: [
-    "unenv/runtime/polyfill/",
+    "unenv/polyfill/",
     "node-fetch-native/polyfill",
     "node-fetch-native/dist/polyfill",
     resolve(runtimeDir, "polyfill/"),
diff --git a/src/core/config/resolvers/fetch.ts b/src/core/config/resolvers/fetch.ts
@@ -13,7 +13,7 @@ export async function resolveFetchOptions(options: NitroOptions) {
   }
   if (!options.experimental.nodeFetchCompat) {
     options.alias = {
-      "node-fetch-native/polyfill": "unenv/runtime/mock/empty",
+      "node-fetch-native/polyfill": "unenv/mock/empty",
       "node-fetch-native": "node-fetch-native/native",
       ...options.alias,
     };
diff --git a/src/presets/cloudflare/unenv/preset.ts b/src/presets/cloudflare/unenv/preset.ts
@@ -57,6 +57,8 @@ export const unenvCfPreset: Preset = {
     ),
     sys: resolvePresetRuntime("util"),
     "node:sys": resolvePresetRuntime("util"),
+    "node-mock-http/_polyfill/events": "node:events",
+    "node-mock-http/_polyfill/buffer": "node:buffer",
   },
   inject: {
     "globalThis.Buffer": ["node:buffer", "Buffer"],
diff --git a/src/presets/cloudflare/unenv/runtime/async_hooks.mjs b/src/presets/cloudflare/unenv/runtime/async_hooks.mjs
@@ -3,24 +3,25 @@
 import workerdAsyncHooks from "#workerd/node:async_hooks";
 
 import {
-  // asyncWrapProviders,
+  asyncWrapProviders,
   createHook,
   executionAsyncId,
   executionAsyncResource,
   triggerAsyncId,
-} from "unenv/runtime/node/async_hooks/index";
+} from "unenv/node/async_hooks";
 
 export {
-  // asyncWrapProviders,
+  asyncWrapProviders,
   createHook,
   executionAsyncId,
   executionAsyncResource,
   triggerAsyncId,
-} from "unenv/runtime/node/async_hooks/index";
+} from "unenv/node/async_hooks";
 
 export const { AsyncLocalStorage, AsyncResource } = workerdAsyncHooks;
 
 export default {
+  asyncWrapProviders,
   createHook,
   executionAsyncId,
   executionAsyncResource,
diff --git a/src/presets/cloudflare/unenv/runtime/crypto.mjs b/src/presets/cloudflare/unenv/runtime/crypto.mjs
@@ -18,7 +18,7 @@ import {
   diffieHellman,
   ECDH,
   getCipherInfo,
-  // hash,
+  hash,
   privateDecrypt,
   privateEncrypt,
   pseudoRandomBytes,
@@ -29,7 +29,7 @@ import {
   webcrypto as unenvCryptoWebcrypto,
   Verify,
   verify,
-} from "unenv/runtime/node/crypto/index";
+} from "unenv/node/crypto";
 
 export {
   Cipher,
@@ -47,14 +47,14 @@ export {
   createVerify,
   diffieHellman,
   getCipherInfo,
-  // hash,
+  hash,
   privateDecrypt,
   privateEncrypt,
   publicDecrypt,
   publicEncrypt,
   sign,
   verify,
-} from "unenv/runtime/node/crypto/index";
+} from "unenv/node/crypto";
 
 export const {
   Certificate,
@@ -133,7 +133,7 @@ export default {
   createVerify,
   diffieHellman,
   getCipherInfo,
-  // hash,
+  hash,
   privateDecrypt,
   privateEncrypt,
   publicDecrypt,
diff --git a/src/presets/cloudflare/unenv/runtime/util.mjs b/src/presets/cloudflare/unenv/runtime/util.mjs
@@ -23,9 +23,9 @@ import {
   isString,
   isSymbol,
   isUndefined,
-  // parseEnv,
-  // styleText,
-} from "unenv/runtime/node/util/index";
+  parseEnv,
+  styleText,
+} from "unenv/node/util";
 
 export {
   _errnoException,
@@ -48,9 +48,9 @@ export {
   isString,
   isSymbol,
   isUndefined,
-  // parseEnv,
-  // styleText,
-} from "unenv/runtime/node/util/index";
+  parseEnv,
+  styleText,
+} from "unenv/node/util";
 
 export const {
   MIMEParams,
@@ -100,8 +100,8 @@ export default {
   isString,
   isSymbol,
   isUndefined,
-  // parseEnv,
-  // styleText,
+  parseEnv,
+  styleText,
   MIMEParams,
   MIMEType,
   TextDecoder,
diff --git a/src/presets/deno/preset-legacy.ts b/src/presets/deno/preset-legacy.ts
@@ -18,7 +18,7 @@ export const denoServerLegacy = defineNitroPreset(
     },
     unenv: {
       inject: {
-        global: ["unenv/runtime/polyfill/global-this", "default"],
+        global: ["unenv/polyfill/global-this", "default"],
         Buffer: ["node:buffer", "Buffer"],
         setTimeout: ["node:timers", "setTimeout"],
         clearTimeout: ["node:timers", "clearTimeout"],
diff --git a/src/rollup/config.ts b/src/rollup/config.ts
@@ -62,9 +62,15 @@ export const getRollupConfig = (nitro: Nitro): RollupConfig => {
       ...(nitro.options.dev
         ? {}
         : {
-            debug: "unenv/runtime/npm/debug",
+            debug: "unenv/npm/debug",
             "consola/core": "consola/core",
-            consola: "unenv/runtime/npm/consola",
+            consola: "unenv/npm/consola",
+          }),
+      ...(nitro.options.node === false
+        ? {}
+        : {
+            "node-mock-http/_polyfill/events": "node:events",
+            "node-mock-http/_polyfill/buffer": "node:buffer",
           }),
       ...nitro.options.alias,
     },
@@ -349,9 +355,9 @@ export const getRollupConfig = (nitro: Nitro): RollupConfig => {
   rollupConfig.plugins.push(
     virtual(
       {
-        "#nitro-internal-pollyfills": env.polyfill
-          .map((p) => `import '${p}';`)
-          .join("\n"),
+        "#nitro-internal-pollyfills":
+          env.polyfill.map((p) => `import '${p}';`).join("\n") ||
+          `/* No polyfills */`,
       },
       nitro.vfs
     )
diff --git a/src/rollup/plugins/automock.ts b/src/rollup/plugins/automock.ts
@@ -9,7 +9,7 @@ export function autoMock() {
       if (src && !internalRegex.test(src)) {
         consola.warn("Auto mock external ", src);
         return {
-          id: "unenv/runtime/mock/proxy-cjs",
+          id: "unenv/mock/proxy-cjs",
         };
       }
       return null;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export async function resolveFetchOptions(options: NitroOptions) {`
`13`	`13`	`}`
`14`	`14`	`if (!options.experimental.nodeFetchCompat) {`
`15`	`15`	`options.alias = {`
`16`		`- "node-fetch-native/polyfill": "unenv/runtime/mock/empty",`
	`16`	`+ "node-fetch-native/polyfill": "unenv/mock/empty",`
`17`	`17`	`"node-fetch-native": "node-fetch-native/native",`
`18`	`18`	`...options.alias,`
`19`	`19`	`};`