nitro-nightly 3.0.1-alpha.1 → 3.0.1-alpha.2

package/dist/presets/netlify/runtime/netlify-edge.mjs

@@ -1,11 +1,12 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { useNitroApp } from "nitro/app";
-import { isPublicAssetURL } from "#nitro-internal-virtual/public-assets";
+import { isPublicAssetURL } from "#nitro/virtual/public-assets";
 const nitroApp = useNitroApp();
 // https://docs.netlify.com/edge-functions/api/
 export default async function netlifyEdge(netlifyReq, context) {
 	// srvx compatibility
 	const req = netlifyReq;
+	req.ip = context.ip;
 	req.runtime ??= { name: "netlify-edge" };
 	// @ts-expect-error (add to srvx types)
 	req.runtime.netlify ??= { context };

package/dist/presets/netlify/runtime/netlify.d.mts

@@ -1,3 +1,4 @@
-import "#nitro-internal-pollyfills";
-declare const handler: (req: Request) => Promise<Response>;
+import "#nitro/virtual/polyfills";
+import type { ServerRequest } from "srvx";
+declare const handler: (req: ServerRequest) => Promise<Response>;
 export default handler;

package/dist/presets/netlify/runtime/netlify.mjs

@@ -1,8 +1,10 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { useNitroApp } from "nitro/app";
 const nitroApp = useNitroApp();
 const ONE_YEAR_IN_SECONDS = 365 * 24 * 60 * 60;
 const handler = async (req) => {
+	req.runtime ??= { name: "netlify" };
+	req.ip = req.headers.get("x-nf-client-connection-ip") || undefined;
 	const response = await nitroApp.fetch(req);
 	const isr = (req.context?.routeRules || {})?.isr?.options;
 	if (isr) {

package/dist/presets/node/runtime/node-cluster.d.mts

@@ -1,3 +1,3 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 declare const _default: {};
 export default _default;

package/dist/presets/node/runtime/node-cluster.mjs

@@ -1,12 +1,11 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import cluster from "node:cluster";
 import { NodeRequest, serve } from "srvx/node";
 import wsAdapter from "crossws/adapters/node";
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { trapUnhandledErrors } from "nitro/~internal/runtime/error/hooks";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { startScheduleRunner } from "#nitro/runtime/task";
+import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
 const port = Number.parseInt(process.env.NITRO_PORT || process.env.PORT || "") || 3e3;
 const host = process.env.NITRO_HOST || process.env.HOST;
 const cert = process.env.NITRO_SSL_CERT;
@@ -28,7 +27,7 @@ const server = serve({
 	silent: clusterId ? clusterId !== "1" : undefined,
 	fetch: nitroApp.fetch
 });
-if (hasWebSocket) {
+if (import.meta._websocket) {
 	const { handleUpgrade } = wsAdapter({ resolve: resolveWebsocketHooks });
 	server.node.server.on("upgrade", (req, socket, head) => {
 		handleUpgrade(

package/dist/presets/node/runtime/node-middleware.d.mts

@@ -1,3 +1,3 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 export declare const middleware: unknown;
 export declare const handleUpgrade: unknown;

package/dist/presets/node/runtime/node-middleware.mjs

@@ -1,13 +1,12 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { toNodeHandler } from "srvx/node";
 import wsAdapter from "crossws/adapters/node";
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { startScheduleRunner } from "#nitro/runtime/task";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
 const nitroApp = useNitroApp();
 export const middleware = toNodeHandler(nitroApp.fetch);
-const ws = hasWebSocket ? wsAdapter({ resolve: resolveWebsocketHooks }) : undefined;
+const ws = import.meta._websocket ? wsAdapter({ resolve: resolveWebsocketHooks }) : undefined;
 export const handleUpgrade = ws?.handleUpgrade;
 // Scheduled tasks
 if (import.meta._tasks) {

package/dist/presets/node/runtime/node-server.d.mts

@@ -1,3 +1,3 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 declare const _default: {};
 export default _default;

package/dist/presets/node/runtime/node-server.mjs

@@ -1,11 +1,10 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { NodeRequest, serve } from "srvx/node";
 import wsAdapter from "crossws/adapters/node";
 import { useNitroApp } from "nitro/app";
-import { startScheduleRunner } from "nitro/~internal/runtime/task";
-import { trapUnhandledErrors } from "nitro/~internal/runtime/error/hooks";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { startScheduleRunner } from "#nitro/runtime/task";
+import { trapUnhandledErrors } from "#nitro/runtime/error/hooks";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
 const port = Number.parseInt(process.env.NITRO_PORT || process.env.PORT || "") || 3e3;
 const host = process.env.NITRO_HOST || process.env.HOST;
 const cert = process.env.NITRO_SSL_CERT;
@@ -21,7 +20,7 @@ const server = serve({
 	} : undefined,
 	fetch: nitroApp.fetch
 });
-if (hasWebSocket) {
+if (import.meta._websocket) {
 	const { handleUpgrade } = wsAdapter({ resolve: resolveWebsocketHooks });
 	server.node.server.on("upgrade", (req, socket, head) => {
 		handleUpgrade(

package/dist/presets/standard/runtime/server.d.mts

@@ -1,3 +1,3 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 declare const _default: {};
 export default _default;

package/dist/presets/standard/runtime/server.mjs

@@ -1,4 +1,4 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { useNitroApp } from "nitro/app";
 const nitroApp = useNitroApp();
 export default { fetch: nitroApp.fetch };

package/dist/presets/stormkit/runtime/stormkit.d.mts

@@ -1,4 +1,4 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import type { Handler } from "aws-lambda";
 type StormkitEvent = {
 	url: string;

package/dist/presets/stormkit/runtime/stormkit.mjs

@@ -1,4 +1,4 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { useNitroApp } from "nitro/app";
 import { awsResponseBody } from "../../aws-lambda/runtime/_utils.mjs";
 const nitroApp = useNitroApp();

package/dist/presets/vercel/runtime/isr.d.mts

@@ -0,0 +1,2 @@
+export declare const ISR_URL_PARAM = "__isr_route";
+export declare function isrRouteRewrite(reqUrl: string, xNowRouteMatches: string | null): [pathname: string, search: string] | undefined;

package/dist/presets/vercel/runtime/isr.mjs

@@ -0,0 +1,19 @@
+export const ISR_URL_PARAM = "__isr_route";
+export function isrRouteRewrite(reqUrl, xNowRouteMatches) {
+	if (xNowRouteMatches) {
+		const isrURL = new URLSearchParams(xNowRouteMatches).get(ISR_URL_PARAM);
+		if (isrURL) {
+			return [decodeURIComponent(isrURL), ""];
+		}
+	} else {
+		const queryIndex = reqUrl.indexOf("?");
+		if (queryIndex !== -1) {
+			const params = new URLSearchParams(reqUrl.slice(queryIndex + 1));
+			const isrURL = params.get(ISR_URL_PARAM);
+			if (isrURL) {
+				params.delete(ISR_URL_PARAM);
+				return [decodeURIComponent(isrURL), params.toString()];
+			}
+		}
+	}
+}

package/dist/presets/vercel/runtime/vercel.node.d.mts

@@ -1,3 +1,3 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import type { NodeServerRequest, NodeServerResponse } from "srvx";
 export default function nodeHandler(req: NodeServerRequest, res: NodeServerResponse);

package/dist/presets/vercel/runtime/vercel.node.mjs

@@ -1,14 +1,23 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { toNodeHandler } from "srvx/node";
-import { useNitroApp } from "nitro/app";
+import { useNitroApp, getRouteRules } from "nitro/app";
+import { isrRouteRewrite } from "./isr.mjs";
 const nitroApp = useNitroApp();
 const handler = toNodeHandler(nitroApp.fetch);
 export default function nodeHandler(req, res) {
-	const query = req.headers["x-now-route-matches"];
-	if (query) {
-		const url = new URLSearchParams(query).get("url");
-		if (url) {
-			req.url = decodeURIComponent(url);
+	// https://vercel.com/docs/headers/request-headers#x-forwarded-for
+	// srvx node adapter uses req.socket.remoteAddress for req.ip
+	let ip;
+	Object.defineProperty(req.socket, "remoteAddress", { get() {
+		const h = req.headers["x-forwarded-for"];
+		return ip ??= h?.split?.(",").shift()?.trim();
+	} });
+	// ISR route rewrite
+	const isrURL = isrRouteRewrite(req.url, req.headers["x-now-route-matches"]);
+	if (isrURL) {
+		const { routeRules } = getRouteRules("", isrURL[0]);
+		if (routeRules?.isr) {
+			req.url = isrURL[0] + (isrURL[1] ? `?${isrURL[1]}` : "");
 		}
 	}
 	return handler(req, res);

package/dist/presets/vercel/runtime/vercel.web.d.mts

@@ -1,4 +1,4 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import type { ServerRequest } from "srvx";
 declare const _default: {
 	fetch(req: ServerRequest, context: {

package/dist/presets/vercel/runtime/vercel.web.mjs

@@ -1,20 +1,25 @@
-import "#nitro-internal-pollyfills";
-import { useNitroApp } from "nitro/app";
+import "#nitro/virtual/polyfills";
+import { useNitroApp, getRouteRules } from "nitro/app";
+import { isrRouteRewrite } from "./isr.mjs";
 const nitroApp = useNitroApp();
 export default { fetch(req, context) {
-	// Check for ISR request
-	const query = req.headers.get("x-now-route-matches");
-	if (query) {
-		const urlParam = new URLSearchParams(query).get("url");
-		if (urlParam) {
-			const url = new URL(decodeURIComponent(urlParam), req.url).href;
-			req = new Request(url, req);
+	// ISR route rewrite
+	const isrURL = isrRouteRewrite(req.url, req.headers.get("x-now-route-matches"));
+	if (isrURL) {
+		const { routeRules } = getRouteRules("", isrURL[0]);
+		if (routeRules?.isr) {
+			req = new Request(new URL(isrURL[0] + (isrURL[1] ? `?${isrURL[1]}` : ""), req.url).href, req);
 		}
 	}
-	// srvx compatibility
-	req.runtime ??= { name: "vercel" };
-	// @ts-expect-error (add to srvx types)
-	req.runtime.vercel = { context };
+	req.runtime = {
+		name: "vercel",
+		vercel: { context }
+	};
+	let ip;
+	Object.defineProperty(req, "ip", { get() {
+		const h = req.headers.get("x-forwarded-for");
+		return ip ??= h?.split(",").shift()?.trim();
+	} });
 	req.waitUntil = context?.waitUntil;
 	return nitroApp.fetch(req);
 } };

package/dist/presets/winterjs/runtime/winterjs.d.mts

@@ -1,3 +1,2 @@
-// @ts-nocheck TODO: Remove after removing polyfills
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 export {};

package/dist/presets/winterjs/runtime/winterjs.mjs

@@ -1,5 +1,5 @@
 // @ts-nocheck TODO: Remove after removing polyfills
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { useNitroApp } from "nitro/app";
 import { hasProtocol, joinURL } from "ufo";
 const nitroApp = useNitroApp();

package/dist/presets/zeabur/runtime/zeabur.d.mts

@@ -1,3 +1,3 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 declare const _default;
 export default _default;

package/dist/presets/zeabur/runtime/zeabur.mjs

@@ -1,4 +1,4 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import { toNodeHandler } from "srvx/node";
 import { useNitroApp } from "nitro/app";
 export default toNodeHandler(useNitroApp().fetch);

package/dist/runtime/app.d.mts

@@ -1 +1 @@
-export { useNitroApp, useNitroHooks, serverFetch, fetch } from "./internal/app.mjs";
+export { useNitroApp, useNitroHooks, serverFetch, getRouteRules, fetch } from "./internal/app.mjs";

package/dist/runtime/app.mjs

@@ -1 +1 @@
-export { useNitroApp, useNitroHooks, serverFetch, fetch } from "./internal/app.mjs";
+export { useNitroApp, useNitroHooks, serverFetch, getRouteRules, fetch } from "./internal/app.mjs";

package/dist/runtime/internal/app.d.mts

@@ -1,12 +1,16 @@
-import type { NitroApp, NitroRuntimeHooks } from "nitro/types";
+import type { MatchedRouteRules, NitroApp, NitroRuntimeHooks } from "nitro/types";
 import type { ServerRequest, ServerRequestContext } from "srvx";
-import type { H3EventContext, WebSocketHooks } from "h3";
+import type { H3EventContext, Middleware, WebSocketHooks } from "h3";
 import { HookableCore } from "hookable";
 declare global {
-	var __nitro__: NitroApp | undefined;
+	var __nitro__: Partial<Record<"default" | "prerender" | (string & {}), NitroApp | undefined>> | undefined;
 }
 export declare function useNitroApp(): NitroApp;
 export declare function useNitroHooks(): HookableCore<NitroRuntimeHooks>;
 export declare function serverFetch(resource: string | URL | Request, init?: RequestInit, context?: ServerRequestContext | H3EventContext): Promise<Response>;
 export declare function resolveWebsocketHooks(req: ServerRequest): Promise<Partial<WebSocketHooks>>;
 export declare function fetch(resource: string | URL | Request, init?: RequestInit, context?: ServerRequestContext | H3EventContext): Promise<Response>;
+export declare function getRouteRules(method: string, pathname: string): {
+	routeRules?: MatchedRouteRules;
+	routeRuleMiddleware: Middleware[];
+};

package/dist/runtime/internal/app.mjs

@@ -2,12 +2,23 @@ import { H3Core, toRequest } from "h3";
 import { HookableCore } from "hookable";
 import { nitroAsyncContext } from "./context.mjs";
 // IMPORTANT: virtual imports and user code should be imported last to avoid initialization order issues
-import errorHandler from "#nitro-internal-virtual/error-handler";
-import { plugins } from "#nitro-internal-virtual/plugins";
-import { findRoute, findRouteRules, globalMiddleware, findRoutedMiddleware } from "#nitro-internal-virtual/routing";
-import { hasRouteRules, hasRoutedMiddleware, hasGlobalMiddleware, hasRoutes, hasHooks, hasPlugins } from "#nitro-internal-virtual/feature-flags";
+import errorHandler from "#nitro/virtual/error-handler";
+import { plugins } from "#nitro/virtual/plugins";
+import { findRoute, findRouteRules, globalMiddleware, findRoutedMiddleware } from "#nitro/virtual/routing";
+import { hasRouteRules, hasRoutedMiddleware, hasGlobalMiddleware, hasRoutes, hasHooks, hasPlugins } from "#nitro/virtual/feature-flags";
+const APP_ID = import.meta.prerender ? "prerender" : "default";
 export function useNitroApp() {
-	return useNitroApp.__instance__ ??= initNitroApp();
+	let instance = useNitroApp._instance;
+	if (instance) {
+		return instance;
+	}
+	instance = useNitroApp._instance = createNitroApp();
+	globalThis.__nitro__ = globalThis.__nitro__ || {};
+	globalThis.__nitro__[APP_ID] = instance;
+	if (hasPlugins) {
+		initNitroPlugins(instance);
+	}
+	return instance;
 }
 export function useNitroHooks() {
 	const nitroApp = useNitroApp();
@@ -42,21 +53,6 @@ export function fetch(resource, init, context) {
 	resource = resource._request || resource;
 	return fetch(resource, init);
 }
-function initNitroApp() {
-	const nitroApp = createNitroApp();
-	if (hasPlugins) {
-		for (const plugin of plugins) {
-			try {
-				plugin(nitroApp);
-			} catch (error) {
-				nitroApp.captureError?.(error, { tags: ["plugin"] });
-				throw error;
-			}
-		}
-	}
-	globalThis.__nitro__ = nitroApp;
-	return nitroApp;
-}
 function createNitroApp() {
 	const hooks = hasHooks ? new HookableCore() : undefined;
 	const captureError = (error, errorCtx) => {
@@ -71,7 +67,7 @@ function createNitroApp() {
 					context: errorCtx
 				});
 			}
-			if (hasHooks && typeof errorCtx.event.req.waitUntil === "function") {
+			if (hasHooks && promise && typeof errorCtx.event.req.waitUntil === "function") {
 				errorCtx.event.req.waitUntil(promise);
 			}
 		}
@@ -119,6 +115,17 @@ function createNitroApp() {
 	};
 	return app;
 }
+function initNitroPlugins(app) {
+	for (const plugin of plugins) {
+		try {
+			plugin(app);
+		} catch (error) {
+			app.captureError?.(error, { tags: ["plugin"] });
+			throw error;
+		}
+	}
+	return app;
+}
 function createH3App(config) {
 	// Create H3 app
 	const h3App = new H3Core(config);
@@ -148,7 +155,7 @@ function createH3App(config) {
 	}
 	return h3App;
 }
-function getRouteRules(method, pathname) {
+export function getRouteRules(method, pathname) {
 	const m = findRouteRules(method, pathname);
 	if (!m?.length) {
 		return { routeRuleMiddleware: [] };

package/dist/runtime/internal/database.mjs

@@ -1,5 +1,5 @@
 import { createDatabase } from "db0";
-import { connectionConfigs } from "#nitro-internal-virtual/database";
+import { connectionConfigs } from "#nitro/virtual/database";
 const instances = Object.create(null);
 export function useDatabase(name = "default") {
 	if (instances[name]) {

package/dist/runtime/internal/error/dev.d.mts

@@ -6,5 +6,4 @@ export declare function defaultHandler(error: HTTPError, event: HTTPEvent, opts?
 	silent?: boolean;
 	json?: boolean;
 }): Promise<InternalHandlerResponse>;
-// ---- Source Map support ----
 export declare function loadStackTrace(error: any);

package/dist/runtime/internal/error/dev.mjs

@@ -44,7 +44,7 @@ export async function defaultHandler(error, event, opts) {
 		consola.error(`[request error] ${tags} [${event.req.method}] ${url}\n\n`, ansiError);
 	}
 	// Use HTML response only when user-agent expects it (browsers)
-	const useJSON = opts?.json || !event.req.headers.get("accept")?.includes("text/html");
+	const useJSON = opts?.json ?? !event.req.headers.get("accept")?.includes("text/html");
 	// Prepare headers
 	const headers = {
 		"content-type": useJSON ? "application/json" : "text/html",

package/dist/runtime/internal/route-rules.d.mts

@@ -1,8 +1,4 @@
-// Headers route rule
 export declare const headers: unknown;
-// Redirect route rule
 export declare const redirect: unknown;
-// Proxy route rule
 export declare const proxy: unknown;
-// Cache route rule
 export declare const cache: unknown;

package/dist/runtime/internal/routes/dev-tasks.mjs

@@ -1,6 +1,6 @@
 import { H3 } from "h3";
 import { runTask } from "../task.mjs";
-import { scheduledTasks, tasks } from "#nitro-internal-virtual/tasks";
+import { scheduledTasks, tasks } from "#nitro/virtual/tasks";
 export default new H3().get("/_nitro/tasks", async () => {
 	const _tasks = await Promise.all(Object.entries(tasks).map(async ([name, task]) => {
 		const _task = await task.resolve?.();

package/dist/runtime/internal/routes/openapi.d.mts

@@ -1,4 +1,3 @@
 import type { EventHandler } from "h3";
-// Served as /_openapi.json
 declare const _default: EventHandler;
 export default _default;

package/dist/runtime/internal/routes/openapi.mjs

@@ -1,7 +1,7 @@
 import { defineHandler, getRequestURL } from "h3";
 import { joinURL } from "ufo";
 import { defu } from "defu";
-import { handlersMeta } from "#nitro-internal-virtual/routing-meta";
+import { handlersMeta } from "#nitro/virtual/routing-meta";
 import { useRuntimeConfig } from "../runtime-config.mjs";
 // Served as /_openapi.json
 export default defineHandler((event) => {
@@ -12,7 +12,7 @@ export default defineHandler((event) => {
 		title: "Nitro Server Routes",
 		...runtimeConfig.nitro?.openAPI?.meta
 	};
-	const { paths, globals: { components,...globalsRest } } = getHandlersMeta();
+	const { paths, globals: { components, ...globalsRest } } = getHandlersMeta();
 	const extensible = Object.fromEntries(Object.entries(globalsRest).filter(([key]) => key.startsWith("x-")));
 	return {
 		openapi: "3.1.0",
@@ -38,7 +38,7 @@ function getHandlersMeta() {
 		const { route, parameters } = normalizeRoute(h.route || "");
 		const tags = defaultTags(h.route || "");
 		const method = (h.method || "get").toLowerCase();
-		const { $global,...openAPI } = h.meta?.openAPI || {};
+		const { $global, ...openAPI } = h.meta?.openAPI || {};
 		const item = { [method]: {
 			tags,
 			parameters,

package/dist/runtime/internal/routes/renderer-template.dev.mjs

@@ -1,5 +1,5 @@
 import { serverFetch } from "../app.mjs";
-import { rendererTemplate, rendererTemplateFile, isStaticTemplate } from "#nitro-internal-virtual/renderer-template";
+import { rendererTemplate, rendererTemplateFile, isStaticTemplate } from "#nitro/virtual/renderer-template";
 import { HTTPResponse } from "h3";
 import { hasTemplateSyntax, renderToResponse, compileTemplate } from "rendu";
 export default async function renderIndexHTML(event) {

package/dist/runtime/internal/routes/renderer-template.mjs

@@ -1,4 +1,4 @@
-import { rendererTemplate } from "#nitro-internal-virtual/renderer-template";
+import { rendererTemplate } from "#nitro/virtual/renderer-template";
 export default function renderIndexHTML(event) {
 	return rendererTemplate(event.req);
 }

package/dist/runtime/internal/routes/scalar.d.mts

@@ -1,4 +1,3 @@
 import { type EventHandler } from "h3";
-// Served as /_scalar
 declare const _default: EventHandler;
 export default _default;

package/dist/runtime/internal/routes/scalar.mjs

@@ -3,11 +3,11 @@ import { useRuntimeConfig } from "../runtime-config.mjs";
 // Served as /_scalar
 export default defineHandler((event) => {
 	const runtimeConfig = useRuntimeConfig();
-	const title = runtimeConfig.nitro.openAPI?.meta?.title || "API Reference";
-	const description = runtimeConfig.nitro.openAPI?.meta?.description || "";
-	const openAPIEndpoint = runtimeConfig.nitro.openAPI?.route || "./_openapi.json";
+	const title = runtimeConfig.nitro?.openAPI?.meta?.title || "API Reference";
+	const description = runtimeConfig.nitro?.openAPI?.meta?.description || "";
+	const openAPIEndpoint = runtimeConfig.nitro?.openAPI?.route || "./_openapi.json";
 	// https://github.com/scalar/scalar
-	const _config = runtimeConfig.nitro.openAPI?.ui?.scalar;
+	const _config = runtimeConfig.nitro?.openAPI?.ui?.scalar;
 	const scalarConfig = {
 		..._config,
 		url: openAPIEndpoint,

package/dist/runtime/internal/routes/swagger.d.mts

@@ -1,4 +1,3 @@
 import type { EventHandler } from "h3";
-// https://github.com/swagger-api/swagger-ui
 declare const _default: EventHandler;
 export default _default;

package/dist/runtime/internal/routes/swagger.mjs

@@ -3,9 +3,9 @@ import { useRuntimeConfig } from "../runtime-config.mjs";
 // https://github.com/swagger-api/swagger-ui
 export default defineHandler((event) => {
 	const runtimeConfig = useRuntimeConfig();
-	const title = runtimeConfig.nitro.openAPI?.meta?.title || "API Reference";
-	const description = runtimeConfig.nitro.openAPI?.meta?.description || "";
-	const openAPIEndpoint = runtimeConfig.nitro.openAPI?.route || "./_openapi.json";
+	const title = runtimeConfig.nitro?.openAPI?.meta?.title || "API Reference";
+	const description = runtimeConfig.nitro?.openAPI?.meta?.description || "";
+	const openAPIEndpoint = runtimeConfig.nitro?.openAPI?.route || "./_openapi.json";
 	const CDN_BASE = "https://cdn.jsdelivr.net/npm/swagger-ui-dist@^5";
 	event.res.headers.set("Content-Type", "text/html");
 	return `<!doctype html>

package/dist/runtime/internal/runtime-config.mjs

@@ -1,5 +1,5 @@
-import { runtimeConfig } from "#nitro-internal-virtual/runtime-config";
 import { snakeCase } from "scule";
+import { runtimeConfig } from "#nitro/virtual/runtime-config";
 export function useRuntimeConfig() {
 	return useRuntimeConfig._cached ||= getRuntimeConfig();
 }
@@ -12,13 +12,6 @@ function getRuntimeConfig() {
 	});
 	return runtimeConfig;
 }
-function getEnv(key, opts) {
-	const envKey = snakeCase(key).toUpperCase();
-	return process.env[opts.prefix + envKey] ?? process.env[opts.altPrefix + envKey];
-}
-function _isObject(input) {
-	return typeof input === "object" && !Array.isArray(input);
-}
 export function applyEnv(obj, opts, parentKey = "") {
 	for (const key in obj) {
 		const subKey = parentKey ? `${parentKey}_${key}` : key;
@@ -52,3 +45,10 @@ function _expandFromEnv(value) {
 		return process.env[key] || match;
 	});
 }
+function getEnv(key, opts) {
+	const envKey = snakeCase(key).toUpperCase();
+	return process.env[opts.prefix + envKey] ?? process.env[opts.altPrefix + envKey];
+}
+function _isObject(input) {
+	return input !== null && typeof input === "object" && !Array.isArray(input);
+}

package/dist/runtime/internal/static.mjs

@@ -1,6 +1,6 @@
 import { HTTPError, defineHandler } from "h3";
 import { decodePath, joinURL, withLeadingSlash, withoutTrailingSlash } from "ufo";
-import { getAsset, isPublicAssetURL, readAsset } from "#nitro-internal-virtual/public-assets";
+import { getAsset, isPublicAssetURL, readAsset } from "#nitro/virtual/public-assets";
 const METHODS = new Set(["HEAD", "GET"]);
 const EncodingMap = {
 	gzip: ".gz",

package/dist/runtime/internal/storage.mjs

@@ -1,5 +1,5 @@
 import { prefixStorage } from "unstorage";
-import { initStorage } from "#nitro-internal-virtual/storage";
+import { initStorage } from "#nitro/virtual/storage";
 export function useStorage(base = "") {
 	const storage = useStorage._storage ??= initStorage();
 	return base ? prefixStorage(storage, base) : storage;

package/dist/runtime/internal/task.mjs

@@ -1,6 +1,6 @@
 import { Cron } from "croner";
 import { HTTPError } from "h3";
-import { scheduledTasks, tasks } from "#nitro-internal-virtual/tasks";
+import { scheduledTasks, tasks } from "#nitro/virtual/tasks";
 /** @experimental */
 export function defineTask(def) {
 	if (typeof def.run !== "function") {

package/dist/runtime/internal/vite/dev-entry.mjs

@@ -1,15 +1,14 @@
-import "#nitro-internal-pollyfills";
+import "#nitro/virtual/polyfills";
 import wsAdapter from "crossws/adapters/node";
 
 import { useNitroApp } from "nitro/app";
-import { resolveWebsocketHooks } from "nitro/~internal/runtime/app";
-import { hasWebSocket } from "#nitro-internal-virtual/feature-flags";
+import { resolveWebsocketHooks } from "#nitro/runtime/app";
 
 const nitroApp = useNitroApp();
 
 export const fetch = nitroApp.fetch;
 
-const ws = hasWebSocket
+const ws = import.meta._websocket
   ? wsAdapter({ resolve: resolveWebsocketHooks })
   : undefined;