Merge remote-tracking branch 'origin/upstream'

docs/3.config/0.index.md

@@ -547,7 +547,7 @@ Rollup 别名选项。
 
 ### `moduleSideEffects`
 
-默认值: `['unenv/runtime/polyfill/', 'node-fetch-native/polyfill']`
+默认值: `['unenv/polyfill/', 'node-fetch-native/polyfill']`
 
 Rollup 特定选项。指定具有副作用的模块导入。
 

eslint.config.mjs

@@ -5,6 +5,7 @@ export default unjs({
     "**/.output",
     "**/.nitro",
     "**/.netlify",
+    "**/.vercel",
     "**/.nuxt",
     "**/*.gen.*",
     "**/dist",

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",
@@ -142,6 +142,7 @@
     "mime": "^4.0.6",
     "mlly": "^1.7.4",
     "node-fetch-native": "^1.6.6",
+    "node-mock-http": "^1.0.0",
     "ofetch": "^1.4.1",
     "ohash": "^1.1.4",
     "openapi-typescript": "^7.6.0",
@@ -162,7 +163,7 @@
     "ultrahtml": "^1.5.3",
     "uncrypto": "^0.1.3",
     "unctx": "^2.4.1",
-    "unenv": "^1.10.0",
+    "unenv": "2.0.0-rc.3",
     "unimport": "^4.0.0",
     "unstorage": "^1.14.4",
     "untyped": "^1.5.2",

runtime-meta.mjs

@@ -15,6 +15,7 @@ export const runtimeDependencies = [
   "iron-webcrypto",
   "klona",
   "node-fetch-native",
+  "node-mock-http",
   "ofetch",
   "ohash",
   "pathe",

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/"),

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,
     };

src/presets/cloudflare/unenv/preset.ts

@@ -45,20 +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/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,

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,

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,

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"],