chore: manually apply changes from #2524 to main

src/core/config/defaults.ts

@@ -1,6 +1,7 @@
 import { runtimeDir } from "nitro/runtime/meta";
 import type { NitroConfig } from "nitro/types";
 import { resolve } from "pathe";
+import { join } from "pathe";
 import { isDebug, isTest } from "std-env";
 
 export const NitroDefaults: NitroConfig = {
@@ -58,8 +59,7 @@ export const NitroDefaults: NitroConfig = {
   baseURL: process.env.NITRO_APP_BASE_URL || "/",
   handlers: [],
   devHandlers: [],
-  // errorHandler: "nitro/runtime/internal/error",
-  errorHandler: "#internal/nitro/internal/error",
+  errorHandler: join(runtimeDir, "internal/error"),
   routeRules: {},
   prerender: {
     autoSubfolderIndex: true,

src/core/config/resolvers/open-api.ts

@@ -1,18 +1,20 @@
+import { runtimeDir } from "nitro/runtime/meta";
 import type { NitroOptions } from "nitro/types";
+import { join } from "pathe";
 
 export async function resolveOpenAPIOptions(options: NitroOptions) {
   if (options.dev && options.experimental.openAPI) {
     options.handlers.push({
       route: "/_nitro/openapi.json",
-      handler: "nitro/runtime/internal/routes/openapi",
+      handler: join(runtimeDir, "internal/routes/openapi"),
     });
     options.handlers.push({
       route: "/_nitro/scalar",
-      handler: "nitro/runtime/internal/routes/scalar",
+      handler: join(runtimeDir, "internal/routes/scalar"),
     });
     options.handlers.push({
       route: "/_nitro/swagger",
-      handler: "nitro/runtime/internal/routes/swagger",
+      handler: join(runtimeDir, "internal/routes/swagger"),
     });
   }
 }

src/core/nitro.ts

@@ -1,11 +1,13 @@
 import { consola } from "consola";
 import { createDebugger, createHooks } from "hookable";
+import { runtimeDir } from "nitro/runtime/meta";
 import type {
   LoadConfigOptions,
   Nitro,
   NitroConfig,
   NitroDynamicConfig,
 } from "nitro/types";
+import { join } from "pathe";
 import { createUnimport } from "unimport";
 import { loadOptions } from "./config/loader";
 import { updateNitroConfig } from "./config/update";
@@ -48,10 +50,10 @@ export async function createNitro(
   // Debug and timing
   if (nitro.options.debug) {
     createDebugger(nitro.hooks, { tag: "nitro" });
-    nitro.options.plugins.push("nitro/runtime/internal/debug");
+    nitro.options.plugins.push(join(runtimeDir, "internal/debug"));
   }
   if (nitro.options.timing) {
-    nitro.options.plugins.push("nitro/runtime/internal/timing");
+    nitro.options.plugins.push(join(runtimeDir, "internal/timing"));
   }
 
   // Logger

src/presets/_nitro/runtime/nitro-dev.ts

@@ -1,8 +1,10 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { runTask } from "nitro/runtime/internal/task";
-import { startScheduleRunner } from "nitro/runtime/internal/task";
-import { trapUnhandledNodeErrors } from "nitro/runtime/internal/utils";
+import { runTask } from "nitro/runtime";
+import {
+  startScheduleRunner,
+  trapUnhandledNodeErrors,
+} from "nitro/runtime/internal";
 import { scheduledTasks, tasks } from "#nitro-internal-virtual/tasks";
 
 import { mkdirSync } from "node:fs";

src/presets/_nitro/runtime/nitro-prerenderer.ts

@@ -1,6 +1,6 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { trapUnhandledNodeErrors } from "nitro/runtime/internal/utils";
+import { trapUnhandledNodeErrors } from "nitro/runtime/internal";
 
 const nitroApp = useNitroApp();
 

src/presets/aws-lambda/runtime/aws-lambda-streaming.ts

@@ -8,7 +8,7 @@ import { useNitroApp } from "nitro/runtime";
 import {
   normalizeLambdaIncomingHeaders,
   normalizeLambdaOutgoingHeaders,
-} from "nitro/runtime/internal/utils.lambda";
+} from "nitro/runtime/internal";
 import { withQuery } from "ufo";
 
 declare global {

src/presets/aws-lambda/runtime/aws-lambda.ts

@@ -7,13 +7,12 @@ import type {
 } from "aws-lambda";
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { normalizeCookieHeader } from "nitro/runtime/internal/utils";
 import {
   normalizeCookieHeader,
   normalizeLambdaIncomingHeaders,
   normalizeLambdaOutgoingBody,
   normalizeLambdaOutgoingHeaders,
-} from "nitro/runtime/internal/utils.lambda";
+} from "nitro/runtime/internal";
 import { withQuery } from "ufo";
 
 const nitroApp = useNitroApp();

src/presets/azure/runtime/azure-functions.ts

@@ -1,7 +1,9 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { getAzureParsedCookiesFromHeaders } from "nitro/runtime/internal/utils.azure";
-import { normalizeLambdaOutgoingHeaders } from "nitro/runtime/internal/utils.lambda";
+import {
+  getAzureParsedCookiesFromHeaders,
+  normalizeLambdaOutgoingHeaders,
+} from "nitro/runtime/internal";
 
 import type { HttpRequest, HttpResponse } from "@azure/functions";
 

src/presets/azure/runtime/azure-swa.ts

@@ -1,7 +1,9 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { getAzureParsedCookiesFromHeaders } from "nitro/runtime/internal/utils.azure";
-import { normalizeLambdaOutgoingHeaders } from "nitro/runtime/internal/utils.lambda";
+import {
+  getAzureParsedCookiesFromHeaders,
+  normalizeLambdaOutgoingHeaders,
+} from "nitro/runtime/internal";
 
 import type { HttpRequest, HttpResponse } from "@azure/functions";
 import { parseURL } from "ufo";

src/presets/bun/runtime/bun.ts

@@ -1,6 +1,6 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { startScheduleRunner } from "nitro/runtime/internal/task";
+import { startScheduleRunner } from "nitro/runtime/internal";
 
 import type {} from "bun";
 import wsAdapter from "crossws/adapters/bun";

src/presets/cloudflare/runtime/cloudflare-module.ts

@@ -1,8 +1,8 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
 import { useRuntimeConfig } from "nitro/runtime";
-import { runCronTasks } from "nitro/runtime/internal/task";
-import { requestHasBody } from "nitro/runtime/internal/utils";
+import { runCronTasks } from "nitro/runtime/internal";
+import { requestHasBody } from "nitro/runtime/internal";
 import { getPublicAssetMeta } from "#nitro-internal-virtual/public-assets";
 
 import {

src/presets/cloudflare/runtime/cloudflare-pages.ts

@@ -1,7 +1,6 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { runCronTasks } from "nitro/runtime/internal/task";
-import { requestHasBody } from "nitro/runtime/internal/utils";
+import { requestHasBody, runCronTasks } from "nitro/runtime/internal";
 import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
 
 import type {

src/presets/cloudflare/runtime/cloudflare-worker.ts

@@ -1,7 +1,7 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
 import { useRuntimeConfig } from "nitro/runtime";
-import { requestHasBody } from "nitro/runtime/internal/utils";
+import { requestHasBody } from "nitro/runtime/internal";
 import { getPublicAssetMeta } from "#nitro-internal-virtual/public-assets";
 
 import {

src/presets/deno/preset.ts

@@ -20,9 +20,6 @@ const denoDeploy = defineNitroPreset(
       deploy:
         "cd ./ && deployctl deploy --project=<project_name> server/index.ts",
     },
-    unenv: {
-      polyfill: ["nitro/runtime/internal/polyfill/deno-env"],
-    },
     rollupConfig: {
       preserveEntrySignatures: false,
       external: (id) => id.startsWith("https://"),

src/presets/deno/runtime/deno-server.ts

@@ -1,7 +1,7 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
 import { useRuntimeConfig } from "nitro/runtime";
-import { startScheduleRunner } from "nitro/runtime/internal/task";
+import { startScheduleRunner } from "nitro/runtime/internal";
 
 import type { Deno as _Deno } from "@deno/types";
 import wsAdapter from "crossws/adapters/deno";

src/presets/netlify/legacy/preset.ts

@@ -91,9 +91,6 @@ const netlifyEdge = defineNitroPreset(
         format: "esm",
       },
     },
-    unenv: {
-      polyfill: ["nitro/runtime/internal/polyfill/deno-env"],
-    },
     hooks: {
       "rollup:before": (nitro: Nitro) => {
         deprecateSWR(nitro);

src/presets/netlify/legacy/runtime/netlify-lambda.ts

@@ -1,12 +1,11 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { normalizeCookieHeader } from "nitro/runtime/internal/utils";
 import {
   normalizeCookieHeader,
   normalizeLambdaIncomingHeaders,
   normalizeLambdaOutgoingBody,
   normalizeLambdaOutgoingHeaders,
-} from "nitro/runtime/internal/utils.lambda";
+} from "nitro/runtime/internal";
 
 import type {
   HandlerContext,

src/presets/netlify/legacy/runtime/netlify.ts

@@ -1,5 +1,5 @@
 import "#nitro-internal-pollyfills";
-import { getRouteRulesForPath } from "nitro/runtime/internal/route-rules";
+import { getRouteRulesForPath } from "nitro/runtime/internal";
 
 import type { Handler } from "@netlify/functions/dist/main";
 import { withQuery } from "ufo";

src/presets/netlify/preset.ts

@@ -74,9 +74,6 @@ const netlifyEdge = defineNitroPreset(
         format: "esm",
       },
     },
-    unenv: {
-      polyfill: ["nitro/runtime/internal/polyfill/deno-env"],
-    },
     hooks: {
       async compiled(nitro: Nitro) {
         await writeHeaders(nitro);

src/presets/netlify/runtime/netlify.ts

@@ -1,11 +1,10 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { getRouteRulesForPath } from "nitro/runtime/internal/route-rules";
 import {
   getRouteRulesForPath,
   joinHeaders,
   normalizeCookieHeader,
-} from "nitro/runtime/internal/utils";
+} from "nitro/runtime/internal";
 
 const nitroApp = useNitroApp();
 

src/presets/node/runtime/cluster.ts

@@ -1,7 +1,9 @@
 import cluster from "node:cluster";
 import os from "node:os";
-import { getGracefulShutdownConfig } from "nitro/runtime/internal/shutdown";
-import { trapUnhandledNodeErrors } from "nitro/runtime/internal/utils";
+import {
+  getGracefulShutdownConfig,
+  trapUnhandledNodeErrors,
+} from "nitro/runtime/internal";
 
 function runMaster() {
   const numberOfWorkers =

src/presets/node/runtime/node-listener.ts

@@ -1,8 +1,10 @@
 import "#nitro-internal-pollyfills";
 import { toNodeListener } from "h3";
 import { useNitroApp } from "nitro/runtime";
-import { startScheduleRunner } from "nitro/runtime/internal/task";
-import { trapUnhandledNodeErrors } from "nitro/runtime/internal/utils";
+import {
+  startScheduleRunner,
+  trapUnhandledNodeErrors,
+} from "nitro/runtime/internal";
 
 const nitroApp = useNitroApp();
 

src/presets/node/runtime/node-server.ts

@@ -7,9 +7,11 @@ import destr from "destr";
 import { toNodeListener } from "h3";
 import { useNitroApp } from "nitro/runtime";
 import { useRuntimeConfig } from "nitro/runtime";
-import { setupGracefulShutdown } from "nitro/runtime/internal/shutdown";
-import { startScheduleRunner } from "nitro/runtime/internal/task";
-import { trapUnhandledNodeErrors } from "nitro/runtime/internal/utils";
+import {
+  setupGracefulShutdown,
+  startScheduleRunner,
+  trapUnhandledNodeErrors,
+} from "nitro/runtime/internal";
 
 const cert = process.env.NITRO_SSL_CERT;
 const key = process.env.NITRO_SSL_KEY;

src/presets/stormkit/runtime/stormkit.ts

@@ -1,6 +1,6 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitro/runtime";
-import { normalizeLambdaOutgoingBody } from "nitro/runtime/internal/utils.lambda";
+import { normalizeLambdaOutgoingBody } from "nitro/runtime/internal";
 
 import type { Handler } from "aws-lambda";
 

src/presets/winterjs/runtime/winterjs.ts

@@ -2,7 +2,7 @@
 import "#nitro-internal-pollyfills";
 import { toPlainHandler } from "h3";
 import { useNitroApp } from "nitro/runtime";
-import { toBuffer } from "nitro/runtime/internal/utils";
+import { toBuffer } from "nitro/runtime/internal";
 import { hasProtocol, joinURL } from "ufo";
 
 // Types are reverse engineered from runtime

src/rollup/plugins/handlers.ts

@@ -1,5 +1,7 @@
+import { runtimeDir } from "nitro/runtime/meta";
 import type { Nitro, NitroEventHandler, NitroRouteRules } from "nitro/types";
 import { hash } from "ohash";
+import { join } from "pathe";
 import { virtual } from "./virtual";
 
 export function handlers(nitro: Nitro) {
@@ -32,7 +34,7 @@ export function handlers(nitro: Nitro) {
         if (nitro.options.serveStatic) {
           handlers.unshift({
             middleware: true,
-            handler: "nitro/runtime/internal/static",
+            handler: join(runtimeDir, "internal/static"),
           });
         }
         if (nitro.options.renderer) {

tsconfig.json

@@ -25,6 +25,7 @@
       "nitro": ["./src/core"],
       // Runtime
       "nitro/runtime": ["./src/runtime"],
+      "nitro/runtime/internal": ["./src/runtime/internal"],
       // Runtime meta
       "nitro/runtime/meta": ["./runtime-meta"],
       // Kit