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

package/dist/_build/rolldown.mjs

@@ -1,54 +1,20 @@
-import { O as relative, T as normalize, n as debounce, w as join } from "../_libs/c12.mjs";
-import "../_libs/gen-mapping.mjs";
-import "../_libs/magic-string.mjs";
-import "../_libs/acorn.mjs";
-import "../_libs/confbox.mjs";
-import { f as sanitizeFilePath } from "../_libs/local-pkg.mjs";
-import "../_libs/js-tokens.mjs";
-import "../_libs/strip-literal.mjs";
-import "../_libs/unimport.mjs";
-import "../_libs/picomatch.mjs";
-import "../_libs/fdir.mjs";
-import "../_libs/tinyglobby.mjs";
+import "../_common.mjs";
+import { _ as writeTypes, at as join, d as libChunkName, f as baseBuildConfig, h as writeBuildInfo, l as NODE_MODULES_RE, n as baseBuildPlugins, st as relative, u as getChunkName } from "./common.mjs";
+import { i as debounce } from "../_libs/rc9+c12+dotenv.mjs";
 import { t as formatCompatibilityDate } from "../_libs/compatx.mjs";
-import "../_libs/std-env.mjs";
-import "../_libs/dot-prop.mjs";
-import "../_chunks/C7CbzoI1.mjs";
-import { i as scanHandlers, n as writeTypes } from "../_chunks/ANM1K1bE.mjs";
-import "../_libs/mime.mjs";
-import "../_libs/pathe.mjs";
-import "../_libs/untyped.mjs";
-import "../_libs/knitwork.mjs";
-import { n as writeBuildInfo } from "./common.mjs";
-import { i as watch$1 } from "../_libs/chokidar.mjs";
-import "../_libs/estree-walker.mjs";
-import "../_libs/plugin-commonjs.mjs";
-import { n as baseBuildConfig, t as baseBuildPlugins } from "./common2.mjs";
-import "../_libs/remapping.mjs";
-import "../_libs/unwasm.mjs";
-import "../_libs/plugin-replace.mjs";
-import "../_libs/etag.mjs";
-import "../_libs/duplexer.mjs";
-import "../_libs/gzip-size.mjs";
-import "../_libs/pretty-bytes.mjs";
-import { t as generateFSTree } from "../_chunks/BX9-zVkM.mjs";
+import { n as scanHandlers } from "../_chunks/nitro2.mjs";
+import { n as watch$1 } from "../_libs/readdirp+chokidar.mjs";
+import { t as generateFSTree } from "../_chunks/utils.mjs";
 import { builtinModules } from "node:module";
 import { watch } from "node:fs";
 import { defu } from "defu";
-import { runtimeDir } from "nitro/meta";
 
 //#region src/build/rolldown/config.ts
-const getRolldownConfig = (nitro) => {
+const getRolldownConfig = async (nitro) => {
 	const base = baseBuildConfig(nitro);
-	const chunkNamePrefixes = [
-		[runtimeDir, "nitro"],
-		[base.presetsDir, "nitro"],
-		["\0raw:", "raw"],
-		["\0nitro-wasm:", "wasm"],
-		["\0", "virtual"]
-	];
 	const tsc = nitro.options.typescript.tsConfig?.compilerOptions;
 	let config = {
+		platform: nitro.options.node ? "node" : "neutral",
 		cwd: nitro.options.rootDir,
 		input: nitro.options.entry,
 		external: [
@@ -56,11 +22,10 @@ const getRolldownConfig = (nitro) => {
 			...builtinModules,
 			...builtinModules.map((m) => `node:${m}`)
 		],
-		plugins: [...baseBuildPlugins(nitro, base)],
+		plugins: [...await baseBuildPlugins(nitro, base)],
 		resolve: {
 			alias: base.aliases,
 			extensions: base.extensions,
-			mainFields: ["main"],
 			conditionNames: nitro.options.exportConditions
 		},
 		transform: {
@@ -74,36 +39,35 @@ const getRolldownConfig = (nitro) => {
 			}
 		},
 		onwarn(warning, warn) {
-			if (!["CIRCULAR_DEPENDENCY", "EVAL"].includes(warning.code || "") && !warning.message.includes("Unsupported source map comment")) warn(warning);
+			if (!base.ignoreWarningCodes.has(warning.code || "")) {
+				console.log(warning.code);
+				warn(warning);
+			}
 		},
 		treeshake: { moduleSideEffects(id) {
 			return nitro.options.moduleSideEffects.some((p) => id.startsWith(p));
 		} },
+		optimization: { inlineConst: true },
 		output: {
-			dir: nitro.options.output.serverDir,
+			format: "esm",
 			entryFileNames: "index.mjs",
-			minify: nitro.options.minify,
-			chunkFileNames(chunk) {
-				const id = normalize(chunk.moduleIds.at(-1) || "");
-				for (const [dir, name] of chunkNamePrefixes) if (id.startsWith(dir)) return `chunks/${name}/[name].mjs`;
-				const routeHandler = nitro.options.handlers.find((h) => id.startsWith(h.handler)) || nitro.scannedHandlers.find((h) => id.startsWith(h.handler));
-				if (routeHandler?.route) return `chunks/routes${routeHandler.route.replace(/:([^/]+)/g, "_$1").replace(/\/[^/]+$/g, "").replace(/[^a-zA-Z0-9/_-]/g, "_") || "/"}/[name].mjs`;
-				if (Object.entries(nitro.options.tasks).find(([_, task]) => task.handler === id)) return `chunks/tasks/[name].mjs`;
-				return `chunks/_/[name].mjs`;
-			},
+			chunkFileNames: (chunk) => getChunkName(chunk, nitro),
+			codeSplitting: { groups: [{
+				test: NODE_MODULES_RE,
+				name: (id) => libChunkName(id)
+			}] },
+			dir: nitro.options.output.serverDir,
 			inlineDynamicImports: nitro.options.inlineDynamicImports,
-			format: "esm",
-			exports: "auto",
-			intro: "",
-			outro: "",
-			sanitizeFileName: sanitizeFilePath,
+			minify: nitro.options.minify ? true : "dce-only",
 			sourcemap: nitro.options.sourcemap,
 			sourcemapIgnoreList(relativePath) {
 				return relativePath.includes("node_modules");
 			}
 		}
 	};
-	config = defu(nitro.options.rollupConfig, config);
+	config = defu(nitro.options.rolldownConfig, nitro.options.rollupConfig, config);
+	const outputConfig = config.output;
+	if (outputConfig.inlineDynamicImports || outputConfig.format === "iife") delete outputConfig.codeSplitting;
 	return config;
 };
 
@@ -161,7 +125,9 @@ async function watchDev(nitro, config) {
 					if (nitro$1.options.logging.buildSuccess) nitro$1.logger.success(`Server built`, start ? `in ${Date.now() - start}ms` : "");
 					nitro$1.hooks.callHook("dev:reload");
 					break;
-				case "ERROR": nitro$1.hooks.callHook("dev:error", event.error);
+				case "ERROR":
+					nitro$1.logger.error(event.error);
+					nitro$1.hooks.callHook("dev:error", event.error);
 			}
 		});
 		return watcher$1;
@@ -197,7 +163,7 @@ async function buildProduction(nitro, config) {
 //#region src/build/rolldown/build.ts
 async function rolldownBuild(nitro) {
 	await nitro.hooks.callHook("build:before", nitro);
-	const config = getRolldownConfig(nitro);
+	const config = await getRolldownConfig(nitro);
 	await nitro.hooks.callHook("rollup:before", nitro, config);
 	return nitro.options.dev ? watchDev(nitro, config) : buildProduction(nitro, config);
 }

package/dist/_build/rollup.mjs

@@ -1,97 +1,27 @@
-import { C as isAbsolute, O as relative, T as normalize, n as debounce, w as join } from "../_libs/c12.mjs";
-import "../_libs/gen-mapping.mjs";
-import "../_libs/magic-string.mjs";
-import "../_libs/acorn.mjs";
-import "../_libs/confbox.mjs";
-import { f as sanitizeFilePath } from "../_libs/local-pkg.mjs";
-import "../_libs/js-tokens.mjs";
-import "../_libs/strip-literal.mjs";
-import "../_libs/unimport.mjs";
-import "../_libs/picomatch.mjs";
-import "../_libs/fdir.mjs";
-import "../_libs/tinyglobby.mjs";
+import "../_common.mjs";
+import { _ as writeTypes, at as join, d as libChunkName, f as baseBuildConfig, h as writeBuildInfo, it as isAbsolute, l as NODE_MODULES_RE, n as baseBuildPlugins, st as relative, t as oxc, u as getChunkName } from "./common.mjs";
+import { i as debounce } from "../_libs/rc9+c12+dotenv.mjs";
 import { t as formatCompatibilityDate } from "../_libs/compatx.mjs";
-import "../_libs/std-env.mjs";
-import "../_libs/dot-prop.mjs";
-import "../_chunks/C7CbzoI1.mjs";
-import { i as scanHandlers, n as writeTypes } from "../_chunks/ANM1K1bE.mjs";
-import "../_libs/mime.mjs";
-import "../_libs/pathe.mjs";
-import "../_libs/untyped.mjs";
-import "../_libs/knitwork.mjs";
-import { n as writeBuildInfo } from "./common.mjs";
-import { i as watch$1 } from "../_libs/chokidar.mjs";
+import { n as scanHandlers } from "../_chunks/nitro2.mjs";
+import { n as watch$1 } from "../_libs/readdirp+chokidar.mjs";
 import { t as alias } from "../_libs/plugin-alias.mjs";
-import "../_libs/estree-walker.mjs";
-import { t as commonjs } from "../_libs/plugin-commonjs.mjs";
-import { t as inject } from "../_libs/plugin-inject.mjs";
-import { n as baseBuildConfig, t as baseBuildPlugins } from "./common2.mjs";
-import "../_libs/remapping.mjs";
-import "../_libs/unwasm.mjs";
-import "../_libs/plugin-replace.mjs";
-import "../_libs/etag.mjs";
-import "../_libs/duplexer.mjs";
-import "../_libs/gzip-size.mjs";
-import "../_libs/pretty-bytes.mjs";
-import { t as generateFSTree } from "../_chunks/BX9-zVkM.mjs";
-import "../_libs/commondir.mjs";
-import "../_libs/is-reference.mjs";
+import { n as inject } from "../_libs/plugin-inject.mjs";
+import { t as generateFSTree } from "../_chunks/utils.mjs";
+import { t as commonjs } from "../_libs/commondir+is-reference.mjs";
 import { t as json } from "../_libs/plugin-json.mjs";
-import "../_libs/deepmerge.mjs";
-import "../_libs/is-module.mjs";
-import { t as nodeResolve } from "../_libs/plugin-node-resolve.mjs";
-import "../_libs/path-parse.mjs";
-import "../_libs/function-bind.mjs";
-import "../_libs/hasown.mjs";
-import "../_libs/is-core-module.mjs";
+import { t as nodeResolve } from "../_libs/hasown+resolve+deepmerge.mjs";
 import { watch } from "node:fs";
 import { defu } from "defu";
-import { runtimeDir } from "nitro/meta";
-import { transform } from "oxc-transform";
-import { minify } from "oxc-minify";
 
-//#region src/build/plugins/oxc.ts
-function oxc(options) {
-	const filter = (id) => !/node_modules/.test(id) && /\.[mj]?[jt]sx?$/.test(id);
-	return {
-		name: "nitro:oxc",
-		async transform(code, id) {
-			if (!filter(id)) return null;
-			return transform(id, code, {
-				sourcemap: options.sourcemap,
-				...options.transform
-			});
-		},
-		async renderChunk(code, chunk) {
-			if (options.minify) return minify(chunk.fileName, code, {
-				sourcemap: options.sourcemap,
-				...typeof options.minify === "object" ? options.minify : {}
-			});
-			return null;
-		}
-	};
-}
-
-//#endregion
 //#region src/build/rollup/config.ts
-const getRollupConfig = (nitro) => {
+const getRollupConfig = async (nitro) => {
 	const base = baseBuildConfig(nitro);
-	const chunkNamePrefixes = [
-		[runtimeDir, "nitro"],
-		[base.presetsDir, "nitro"],
-		["\0raw:", "raw"],
-		["\0nitro-wasm:", "wasm"],
-		["\0", "virtual"]
-	];
-	function getChunkGroup(id) {
-		if (id.startsWith(runtimeDir) || id.startsWith(base.presetsDir)) return "nitro";
-	}
 	const tsc = nitro.options.typescript.tsConfig?.compilerOptions;
 	let config = {
 		input: nitro.options.entry,
 		external: [...base.env.external],
 		plugins: [
-			...baseBuildPlugins(nitro, base),
+			...await baseBuildPlugins(nitro, base),
 			oxc({
 				sourcemap: !!nitro.options.sourcemap,
 				minify: nitro.options.minify ? { ...nitro.options.oxc?.minify } : false,
@@ -114,8 +44,6 @@ const getRollupConfig = (nitro) => {
 				extensions: base.extensions,
 				preferBuiltins: !!nitro.options.node,
 				rootDir: nitro.options.rootDir,
-				modulePaths: nitro.options.nodeModulesDirs,
-				mainFields: ["main"],
 				exportConditions: nitro.options.exportConditions
 			}),
 			commonjs({ ...nitro.options.commonJS }),
@@ -123,45 +51,29 @@ const getRollupConfig = (nitro) => {
 			inject(base.env.inject)
 		],
 		onwarn(warning, rollupWarn) {
-			if (![
-				"EVAL",
-				"CIRCULAR_DEPENDENCY",
-				"THIS_IS_UNDEFINED"
-			].includes(warning.code || "") && !warning.message.includes("Unsupported source map comment")) rollupWarn(warning);
+			if (!base.ignoreWarningCodes.has(warning.code || "")) rollupWarn(warning);
 		},
 		treeshake: { moduleSideEffects(id) {
 			return nitro.options.moduleSideEffects.some((p) => id.startsWith(p));
 		} },
 		output: {
-			dir: nitro.options.output.serverDir,
+			format: "esm",
 			entryFileNames: "index.mjs",
-			chunkFileNames(chunk) {
-				const id = normalize(chunk.moduleIds.at(-1) || "");
-				for (const [dir, name] of chunkNamePrefixes) if (id.startsWith(dir)) return `chunks/${name}/[name].mjs`;
-				const routeHandler = nitro.options.handlers.find((h) => id.startsWith(h.handler)) || nitro.scannedHandlers.find((h) => id.startsWith(h.handler));
-				if (routeHandler?.route) return `chunks/routes${routeHandler.route.replace(/:([^/]+)/g, "_$1").replace(/\/[^/]+$/g, "") || "/"}/[name].mjs`;
-				if (Object.entries(nitro.options.tasks).find(([_, task]) => task.handler === id)) return `chunks/tasks/[name].mjs`;
-				return `chunks/_/[name].mjs`;
-			},
-			manualChunks(id) {
-				return getChunkGroup(id);
-			},
+			chunkFileNames: (chunk) => getChunkName(chunk, nitro),
+			dir: nitro.options.output.serverDir,
 			inlineDynamicImports: nitro.options.inlineDynamicImports,
-			format: "esm",
-			exports: "auto",
-			intro: "",
-			outro: "",
 			generatedCode: { constBindings: true },
-			sanitizeFileName: sanitizeFilePath,
 			sourcemap: nitro.options.sourcemap,
 			sourcemapExcludeSources: true,
-			sourcemapIgnoreList(relativePath) {
-				return relativePath.includes("node_modules");
+			sourcemapIgnoreList: (id) => id.includes("node_modules"),
+			manualChunks(id) {
+				if (NODE_MODULES_RE.test(id)) return libChunkName(id);
 			}
 		}
 	};
 	config = defu(nitro.options.rollupConfig, config);
-	if (config.output.inlineDynamicImports) delete config.output.manualChunks;
+	const outputConfig = config.output;
+	if (outputConfig.inlineDynamicImports || outputConfig.format === "iife") delete outputConfig.manualChunks;
 	return config;
 };
 
@@ -211,7 +123,7 @@ async function watchDev(nitro, rollupConfig) {
 		"unlink",
 		"unlinkDir"
 	]);
-	const scanDirsWatcher = watch$1(scanDirs, { ignoreInitial: true }).on("all", (event, path, stat) => {
+	const scanDirsWatcher = watch$1(scanDirs, { ignoreInitial: true }).on("all", (event, path, stat$1) => {
 		if (watchReloadEvents.has(event)) reload();
 	});
 	const rootDirWatcher = watch(nitro.options.rootDir, { persistent: false }, (_event, filename) => {
@@ -280,7 +192,7 @@ async function buildProduction(nitro, rollupConfig) {
 //#region src/build/rollup/build.ts
 async function rollupBuild(nitro) {
 	await nitro.hooks.callHook("build:before", nitro);
-	const config = getRollupConfig(nitro);
+	const config = await getRollupConfig(nitro);
 	await nitro.hooks.callHook("rollup:before", nitro, config);
 	return nitro.options.dev ? watchDev(nitro, config) : buildProduction(nitro, config);
 }

package/dist/_build/vite.build.mjs

@@ -1,50 +1,10 @@
-import "../_libs/c12.mjs";
-import "../_libs/gen-mapping.mjs";
-import "../_libs/magic-string.mjs";
-import "../_libs/acorn.mjs";
-import "../_libs/confbox.mjs";
-import "../_libs/local-pkg.mjs";
-import "../_libs/js-tokens.mjs";
-import "../_libs/strip-literal.mjs";
-import "../_libs/unimport.mjs";
-import "../_libs/picomatch.mjs";
-import "../_libs/fdir.mjs";
-import "../_libs/tinyglobby.mjs";
-import "../_libs/compatx.mjs";
-import "../_libs/klona.mjs";
-import { r as a } from "../_libs/std-env.mjs";
-import "../_chunks/B-D1JOIz.mjs";
-import "../_libs/escape-string-regexp.mjs";
-import "../_libs/tsconfck.mjs";
-import "../_libs/dot-prop.mjs";
-import "../_chunks/C7CbzoI1.mjs";
-import "../_chunks/ANM1K1bE.mjs";
-import "../_libs/rou3.mjs";
-import "../_libs/mime.mjs";
-import "../_libs/pathe.mjs";
-import "../_libs/untyped.mjs";
-import "../_libs/knitwork.mjs";
-import "./common.mjs";
-import "../_libs/httpxy.mjs";
-import "../_dev.mjs";
-import "../_libs/chokidar.mjs";
-import "../_libs/ultrahtml.mjs";
-import "../_libs/plugin-alias.mjs";
-import "../_libs/estree-walker.mjs";
-import "../_libs/plugin-commonjs.mjs";
-import "../_libs/plugin-inject.mjs";
-import "./common2.mjs";
-import "../_libs/remapping.mjs";
-import "../_libs/unwasm.mjs";
-import "../_libs/plugin-replace.mjs";
-import "../_libs/etag.mjs";
-import { t as nitro } from "./vite.plugin.mjs";
-import "../_libs/vite-plugin-fullstack.mjs";
+import { V as a } from "./common.mjs";
+import { nitro } from "nitro/vite";
 
 //#region src/build/vite/build.ts
 async function viteBuild(nitro$1) {
 	if (nitro$1.options.dev) throw new Error("Nitro dev CLI does not supports vite. Please use `vite dev` instead.");
-	const { createBuilder } = nitro$1.options.builder === "rolldown-vite" ? await import("rolldown-vite").catch(() => import("vite")) : await import("vite");
+	const { createBuilder } = await import(nitro$1.options.__vitePkg__ || "vite");
 	await (await createBuilder({
 		base: nitro$1.options.rootDir,
 		plugins: [await nitro({ _nitro: nitro$1 })],

package/dist/{_dev.mjs → _chunks/dev.mjs}

@@ -1,14 +1,12 @@
-import { S as extname$1, k as resolve$1, n as debounce, w as join$1 } from "./_libs/c12.mjs";
-import { n as T, r as a } from "./_libs/std-env.mjs";
-import { t as src_default } from "./_libs/mime.mjs";
-import { r as writeDevBuildInfo } from "./_build/common.mjs";
-import { n as createProxyServer } from "./_libs/httpxy.mjs";
-import { i as watch$1 } from "./_libs/chokidar.mjs";
+import { B as T, V as a, at as join$1, ct as resolve$1, g as writeDevBuildInfo, j as src_default, rt as extname$1 } from "../_build/common.mjs";
+import { i as debounce } from "../_libs/rc9+c12+dotenv.mjs";
+import { t as createProxyServer } from "../_libs/httpxy.mjs";
+import { n as watch$1 } from "../_libs/readdirp+chokidar.mjs";
 import consola$1 from "consola";
-import { dirname, resolve } from "node:path";
 import { createReadStream, existsSync } from "node:fs";
+import { readFile, rm, stat as stat$1 } from "node:fs/promises";
+import { dirname, resolve } from "node:path";
 import { joinURL } from "ufo";
-import { readFile, rm, stat } from "node:fs/promises";
 import { createBrotliCompress, createGzip } from "node:zlib";
 import { Worker } from "node:worker_threads";
 import { H3, HTTPError, defineHandler, fromNodeHandler, getRequestIP, getRequestURL, serveStatic, toEventHandler } from "h3";
@@ -19,7 +17,7 @@ import { Youch } from "youch";
 import { SourceMapConsumer } from "source-map";
 import { FastResponse } from "srvx";
 
-//#region src/dev/proxy.ts
+//#region src/runner/proxy.ts
 function createHTTPProxy(defaults = {}) {
 	const proxy = createProxyServer(defaults);
 	proxy.on("proxyReq", (proxyReq, req) => {
@@ -51,7 +49,7 @@ function createHTTPProxy(defaults = {}) {
 		}
 	};
 }
-function fetchAddress(addr, input, inputInit) {
+async function fetchAddress(addr, input, inputInit) {
 	let url;
 	let init;
 	if (input instanceof Request) {
@@ -71,16 +69,25 @@ function fetchAddress(addr, input, inputInit) {
 		redirect: "manual",
 		...init
 	};
+	let res;
 	if (addr.socketPath) {
 		url.protocol = "http:";
-		return fetch(url, {
+		res = await fetch(url, {
 			...init,
 			...fetchSocketOptions(addr.socketPath)
 		});
+	} else {
+		const origin = `http://${addr.host}${addr.port ? `:${addr.port}` : ""}`;
+		const outURL = new URL(url.pathname + url.search, origin);
+		res = await fetch(outURL, init);
 	}
-	const origin = `http://${addr.host}${addr.port ? `:${addr.port}` : ""}`;
-	const outURL = new URL(url.pathname + url.search, origin);
-	return fetch(outURL, init);
+	const headers = new Headers(res.headers);
+	headers.delete("transfer-encoding");
+	return new Response(res.body, {
+		status: res.status,
+		statusText: res.statusText,
+		headers
+	});
 }
 function fetchSocketOptions(socketPath) {
 	if ("Bun" in globalThis) return { unix: socketPath };
@@ -92,8 +99,8 @@ function fetchSocketOptions(socketPath) {
 }
 
 //#endregion
-//#region src/dev/worker.ts
-var NodeDevWorker = class {
+//#region src/runner/node.ts
+var NodeEnvRunner = class {
 	closed = false;
 	#name;
 	#entry;
@@ -107,7 +114,7 @@ var NodeDevWorker = class {
 		this.#name = opts.name;
 		this.#entry = opts.entry;
 		this.#data = opts.data;
-		this.#hooks = opts.hooks;
+		this.#hooks = opts.hooks || {};
 		this.#proxy = createHTTPProxy();
 		this.#messageListeners = /* @__PURE__ */ new Set();
 		this.#initWorker();
@@ -117,7 +124,7 @@ var NodeDevWorker = class {
 	}
 	async fetch(input, init) {
 		for (let i = 0; i < 5 && !(this.#address && this.#proxy); i++) await new Promise((r) => setTimeout(r, 100 * Math.pow(2, i)));
-		if (!(this.#address && this.#proxy)) return new Response("Dev worker is unavailable", { status: 503 });
+		if (!(this.#address && this.#proxy)) return new Response("Node env runner worker is unavailable", { status: 503 });
 		return fetchAddress(this.#address, input, init);
 	}
 	upgrade(req, socket, head) {
@@ -130,7 +137,7 @@ var NodeDevWorker = class {
 		});
 	}
 	sendMessage(message) {
-		if (!this.#worker) throw new Error("Dev worker should be initialized before sending messages.");
+		if (!this.#worker) throw new Error("Node env worker should be initialized before sending messages.");
 		this.#worker.postMessage(message);
 	}
 	onMessage(listener) {
@@ -151,7 +158,7 @@ var NodeDevWorker = class {
 	}
 	[Symbol.for("nodejs.util.inspect.custom")]() {
 		const status = this.closed ? "closed" : this.ready ? "ready" : "pending";
-		return `NodeDevWorker#${this.#name}(${status})`;
+		return `NodeEnvRunner#${this.#name}(${status})`;
 	}
 	#initWorker() {
 		if (!existsSync(this.#entry)) {
@@ -197,7 +204,8 @@ var NodeDevWorker = class {
 		if (!this.#worker._exitCode && !a && !T) await new Promise((resolve$2) => {
 			const gracefulShutdownTimeoutMs = Number.parseInt(process.env.NITRO_SHUTDOWN_TIMEOUT || "", 10) || 5e3;
 			const timeout = setTimeout(() => {
-				if (process.env.DEBUG) consola$1.warn(`force closing dev worker...`);
+				consola$1.warn(`force closing node env runner worker...`);
+				resolve$2();
 			}, gracefulShutdownTimeoutMs);
 			this.#worker?.on("message", (message) => {
 				if (message.event === "exit") {
@@ -224,22 +232,17 @@ function createVFSHandler(nitro) {
 			statusText: `Forbidden IP: "${ip || "?"}"`,
 			status: 403
 		});
-		const vfsEntries = {
-			...nitro.vfs,
-			...nitro.options.virtual
-		};
 		const url = event.context.params?._ || "";
 		const isJson = url.endsWith(".json") || event.req.headers.get("accept")?.includes("application/json");
 		const id = decodeURIComponent(url.replace(/^(\.json)?\/?/, "") || "");
-		if (id && !(id in vfsEntries)) throw new HTTPError({
+		if (id && !nitro.vfs.has(id)) throw new HTTPError({
 			message: "File not found",
 			status: 404
 		});
-		let content = id ? vfsEntries[id] : void 0;
-		if (typeof content === "function") content = await content();
+		const content = id ? await nitro.vfs.get(id)?.render() : void 0;
 		if (isJson) return {
 			rootDir: nitro.options.rootDir,
-			entries: Object.keys(vfsEntries).map((id$1) => ({
+			entries: [...nitro.vfs.keys()].map((id$1) => ({
 				id: id$1,
 				path: "/_vfs.json/" + encodeURIComponent(id$1)
 			})),
@@ -249,7 +252,7 @@ function createVFSHandler(nitro) {
 			} : null
 		};
 		const directories = { [nitro.options.rootDir]: {} };
-		const fpaths = Object.keys(vfsEntries);
+		const fpaths = [...nitro.vfs.keys()];
 		for (const item of fpaths) {
 			const segments = item.replace(nitro.options.rootDir, "").split("/").filter(Boolean);
 			let currentDir = item.startsWith(nitro.options.rootDir) ? directories[nitro.options.rootDir] : directories;
@@ -386,7 +389,7 @@ async function defaultHandler(error, event, opts) {
 		const ansiError = await (await youch.toANSI(error)).replaceAll(process.cwd(), ".");
 		consola$1.error(`[request error] ${tags} [${event.req.method}] ${url}\n\n`, ansiError);
 	}
-	const useJSON = opts?.json || !event.req.headers.get("accept")?.includes("text/html");
+	const useJSON = opts?.json ?? !event.req.headers.get("accept")?.includes("text/html");
 	const headers = {
 		"content-type": useJSON ? "application/json" : "text/html",
 		"x-content-type-options": "nosniff",
@@ -508,7 +511,7 @@ function serveStaticDir(event, opts) {
 		getMeta: async (id) => {
 			const path$1 = r(id);
 			if (!path$1) return;
-			const s = await stat(path$1).catch(() => null);
+			const s = await stat$1(path$1).catch(() => null);
 			if (!s?.isFile()) return;
 			const ext = extname$1(path$1);
 			return {
@@ -583,9 +586,10 @@ var NitroDevServer = class NitroDevServer extends NitroDevApp {
 			this.#building = false;
 			for (const worker of this.#workers) worker.close();
 		});
-		if (nitro.options.devServer.watch.length > 0) {
+		const devWatch = nitro.options.devServer.watch;
+		if (devWatch && devWatch.length > 0) {
 			const debouncedReload = debounce(() => this.reload());
-			this.#watcher = watch$1(nitro.options.devServer.watch, nitro.options.watchOptions);
+			this.#watcher = watch$1(devWatch, nitro.options.watchOptions);
 			this.#watcher.on("add", debouncedReload).on("change", debouncedReload);
 		}
 	}
@@ -595,6 +599,10 @@ var NitroDevServer = class NitroDevServer extends NitroDevApp {
 			status: 503,
 			statusText: "No worker available."
 		});
+		if (!worker.upgrade) throw new HTTPError({
+			status: 501,
+			statusText: "Worker does not support upgrades."
+		});
 		return worker.upgrade(req, socket, head);
 	}
 	listen(opts) {
@@ -624,16 +632,10 @@ var NitroDevServer = class NitroDevServer extends NitroDevApp {
 	}
 	reload() {
 		for (const worker$1 of this.#workers) worker$1.close();
-		const worker = new NodeDevWorker({
+		const worker = new NodeEnvRunner({
 			name: `Nitro_${this.#workerIdCtr++}`,
 			entry: this.#entry,
-			data: {
-				...this.#workerData,
-				globals: {
-					__NITRO_RUNTIME_CONFIG__: this.nitro.options.runtimeConfig,
-					...this.#workerData.globals
-				}
-			},
+			data: this.#workerData,
 			hooks: {
 				onClose: (worker$1, cause) => {
 					this.#workerError = cause;
@@ -702,4 +704,4 @@ var NitroDevServer = class NitroDevServer extends NitroDevApp {
 };
 
 //#endregion
-export { NodeDevWorker as i, createDevServer as n, NitroDevApp as r, NitroDevServer as t };
+export { NodeEnvRunner as i, createDevServer as n, NitroDevApp as r, NitroDevServer as t };