nitro-nightly 3.0.260522-beta → 3.0.260610-beta

package/dist/_build/common.mjs

@@ -6510,6 +6510,7 @@ var require_picomatch = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var import_picomatch = /* @__PURE__ */ __toESM$1(require_picomatch(), 1);
 const isReadonlyArray = Array.isArray;
 const BACKSLASHES = /\\/g;
+const DRIVE_RELATIVE_PATH = /^[A-Za-z]:$/;
 const isWin = process.platform === "win32";
 const ONLY_PARENT_DIRECTORIES = /^(\/?\.\.)+$/;
 function getPartialMatcher(patterns, options = {}) {
@@ -6575,6 +6576,9 @@ function buildRelative(cwd, root) {
 		return p[p.length - 1] === "/" && result !== "" ? `${result}/` : result || ".";
 	};
 }
+function ensureNonDriveRelativePath(path) {
+	return path.replace(DRIVE_RELATIVE_PATH, (match) => `${match}/`);
+}
 const splitPatternOptions = { parts: true };
 function splitPattern(path) {
 	var _result$parts;
@@ -6619,7 +6623,7 @@ function normalizePattern(pattern, opts, props, isIgnore) {
 		}
 		const potentialRoot = posix.join(cwd, parentDir.slice(i * 3));
 		if (potentialRoot[0] !== "." && props.root.length > potentialRoot.length) {
-			props.root = potentialRoot;
+			props.root = ensureNonDriveRelativePath(potentialRoot);
 			props.depthOffset = -n + i;
 		}
 	}
@@ -6639,7 +6643,7 @@ function normalizePattern(pattern, opts, props, isIgnore) {
 		}
 		props.depthOffset = newCommonPath.length;
 		props.commonPath = newCommonPath;
-		props.root = newCommonPath.length > 0 ? posix.join(cwd, ...newCommonPath) : cwd;
+		props.root = ensureNonDriveRelativePath(newCommonPath.length > 0 ? posix.join(cwd, ...newCommonPath) : cwd);
 	}
 	return result;
 }
@@ -6728,18 +6732,15 @@ function formatPaths(paths, mapper) {
 }
 const defaultOptions$1 = {
 	caseSensitiveMatch: true,
-	cwd: process.cwd(),
 	debug: !!process.env.TINYGLOBBY_DEBUG,
 	expandDirectories: true,
 	followSymbolicLinks: true,
 	onlyFiles: true
 };
 function getOptions$1(options) {
-	const opts = {
-		...defaultOptions$1,
-		...options
-	};
-	opts.cwd = (opts.cwd instanceof URL ? fileURLToPath$1(opts.cwd) : resolve$1(opts.cwd)).replace(BACKSLASHES, "/");
+	const opts = Object.assign({}, options);
+	for (const key in defaultOptions$1) if (opts[key] === void 0) Object.assign(opts, { [key]: defaultOptions$1[key] });
+	opts.cwd = (opts.cwd instanceof URL ? fileURLToPath$1(opts.cwd) : resolve$1(opts.cwd || process.cwd())).replace(BACKSLASHES, "/");
 	opts.ignore = ensureStringArray(opts.ignore);
 	opts.fs && (opts.fs = {
 		readdir: opts.fs.readdir || readdir$1,
@@ -17499,7 +17500,7 @@ function getBtoa() {
 		throw new Error("Unsupported environment: `window.btoa` or `Buffer` should be supported.");
 	};
 }
-const btoa = /* @__PURE__ */ getBtoa();
+const btoa = /*#__PURE__*/ getBtoa();
 var SourceMap = class {
 	constructor(properties) {
 		this.version = 3;
@@ -20810,7 +20811,10 @@ async function writeTypes(nitro) {
 				if (resolvedPath) {
 					const { dir, name } = parseNodeModulePath(resolvedPath);
 					if (!dir || !name) path = resolvedPath;
-					else path = join$2(dir, name, await lookupNodeModuleSubpath(resolvedPath) || "");
+					else {
+						const subpath = await lookupNodeModuleSubpath(resolvedPath);
+						path = subpath && subpath !== "./" ? join$2(dir, name, subpath) : resolvedPath;
+					}
 				}
 			}
 			if (existsSync(path) && !await isDirectory(path)) path = path.replace(/\.[a-z]+$/, "");
@@ -20913,7 +20917,7 @@ async function writeTypes(nitro) {
 		for (const alias in tsConfig.compilerOptions.paths) {
 			const paths = await Promise.all(tsConfig.compilerOptions.paths[alias].map(async (path) => {
 				if (!isAbsolute$2(path)) return path;
-				return relativeWithDot(tsconfigDir, (await promises.stat(path).catch(() => null))?.isFile() ? path.replace(/(?<=\w)\.\w+$/g, "") : path);
+				return relativeWithDot(tsconfigDir, (await promises.stat(path).catch(() => null))?.isFile() ? stripPathsExt(path) : path);
 			}));
 			tsConfig.compilerOptions.paths[alias] = [...new Set(paths)];
 		}
@@ -20935,6 +20939,10 @@ function relativeWithDot(from, to) {
 	const rel = relative$2(from, to);
 	return RELATIVE_RE.test(rel) ? rel : "./" + rel;
 }
+const PATHS_STRIPPABLE_EXT_RE = /\.(?:tsx?|jsx?|[cm]js)$/;
+function stripPathsExt(path) {
+	return path.replace(PATHS_STRIPPABLE_EXT_RE, "");
+}
 const presetsWithConfig = [
 	"awsAmplify",
 	"awsLambda",
@@ -21071,7 +21079,7 @@ function getNoExternals(nitro) {
 		/\.[mc]?tsx?$/,
 		/^(?:[\0#~.]|virtual:)/,
 		new RegExp("^" + pathRegExp(pkgDir) + "(?!.*node_modules)"),
-		...[nitro.options.rootDir, ...nitro.options.scanDirs.filter((dir) => dir.includes("node_modules") || !dir.startsWith(nitro.options.rootDir))].map((dir) => new RegExp("^" + pathRegExp(dir) + "(?!.*node_modules)"))
+		...[nitro.options.rootDir, ...[nitro.options.buildDir, ...nitro.options.scanDirs].filter((dir) => dir.includes("node_modules") || !dir.startsWith(nitro.options.rootDir))].map((dir) => new RegExp("^" + pathRegExp(dir) + "(?!.*node_modules)"))
 	];
 	if (nitro.options.wasm !== false) noExternal.push(/\.wasm$/);
 	if (Array.isArray(nitro.options.noExternals)) noExternal.push(...nitro.options.noExternals.filter(Boolean).map((item) => toPathRegExp(item)));
@@ -21464,12 +21472,17 @@ function rendererTemplate(nitro) {
               import { HTTPResponse } from "h3";
               export const rendererTemplate = () => new HTTPResponse(${JSON.stringify(html)}, { headers: { "content-type": "text/html; charset=utf-8" } });
             `;
-				else return `
+				else {
+					const template = compileTemplateToString(html, { contextKeys: [...RENDER_CONTEXT_KEYS] });
+					return `
             import { renderToResponse } from 'rendu'
-            import { serverFetch } from 'nitro/app'
-            const template = ${compileTemplateToString(html, { contextKeys: [...RENDER_CONTEXT_KEYS] })};
-            export const rendererTemplate = (request) => renderToResponse(template, { request, context: { serverFetch } })
+            import { fetch, serverFetch } from 'nitro/app'
+            ${nitro.options.builder === "vite" ? `import { fetchViteEnv } from "nitro/vite/runtime"` : ""}
+            const context = { fetch, serverFetch${nitro.options.builder === "vite" ? ", fetchViteEnv" : ""} }
+            const template = ${template};
+            export const rendererTemplate = (request) => renderToResponse(template, { request, context })
             `;
+				}
 			}
 		}
 	};
@@ -22035,6 +22048,7 @@ function isWellFormedString(input) {
 	if (hasStringIsWellFormed) return input.isWellFormed();
 	return !/\p{Surrogate}/u.test(input);
 }
+const identifierNameRE = /^[$_\p{ID_Start}][$\u200c\u200d\p{ID_Continue}]*$/u;
 const dataToEsm = function dataToEsm(data, options = {}) {
 	var _a, _b;
 	const t = options.compact ? "" : "indent" in options ? options.indent : "	";
@@ -22060,10 +22074,13 @@ const dataToEsm = function dataToEsm(data, options = {}) {
 		namedExportCode += `export ${declarationType} ${key}${_}=${_}${serialize(value, options.compact ? null : t, "")};${n}`;
 	} else {
 		defaultExportRows.push(`${stringify(key)}:${_}${serialize(value, options.compact ? null : t, "")}`);
-		if (options.includeArbitraryNames && isWellFormedString(key)) {
-			const variableName = `${arbitraryNamePrefix}${arbitraryNameExportRows.length}`;
-			namedExportCode += `${declarationType} ${variableName}${_}=${_}${serialize(value, options.compact ? null : t, "")};${n}`;
-			arbitraryNameExportRows.push(`${variableName} as ${JSON.stringify(key)}`);
+		if (key !== "default") {
+			const isIdentifierName = identifierNameRE.test(key);
+			if (isIdentifierName || options.includeArbitraryNames && isWellFormedString(key)) {
+				const variableName = `${arbitraryNamePrefix}${arbitraryNameExportRows.length}`;
+				namedExportCode += `${declarationType} ${variableName}${_}=${_}${serialize(value, options.compact ? null : t, "")};${n}`;
+				arbitraryNameExportRows.push(`${variableName} as ${isIdentifierName ? key : JSON.stringify(key)}`);
+			}
 		}
 	}
 	const arbitraryExportCode = arbitraryNameExportRows.length > 0 ? `export${_}{${n}${t}${arbitraryNameExportRows.join(`,${n}${t}`)}${n}};${n}` : "";
@@ -28155,7 +28172,7 @@ function virtual(input) {
 			filter: { id: include },
 			handler: async (id) => {
 				const mod = modules.get(id);
-				if (!mod) throw new Error(`Virtual module ${id} not found.`);
+				if (!mod) return null;
 				return {
 					code: await mod.render(),
 					map: null

package/dist/_build/rolldown.mjs

@@ -150,8 +150,12 @@ async function buildProduction(nitro, config) {
 	const rewriteRelativePaths = (input) => {
 		return input.replace(/([\s:])\.\/(\S*)/g, `$1${rOutput}/$2`);
 	};
-	nitro.logger.success("You can preview this build using `npx nitro preview`");
-	if (buildInfo.commands.deploy) nitro.logger.success(rewriteRelativePaths("You can deploy this build using `npx nitro deploy --prebuilt`"));
+	const previewCommand = nitro.options.framework.previewCommand || "npx nitro preview";
+	nitro.logger.success(`You can preview this build using \`${previewCommand}\``);
+	if (buildInfo.commands.deploy) {
+		const deployCommand = nitro.options.framework.deployCommand || "npx nitro deploy --prebuilt";
+		nitro.logger.success(rewriteRelativePaths(`You can deploy this build using \`${deployCommand}\``));
+	}
 }
 async function rolldownBuild(nitro) {
 	await nitro.hooks.callHook("build:before", nitro);

package/dist/_build/vite.env.mjs

@@ -17,7 +17,7 @@ function createNitroEnvironment(ctx) {
 		},
 		resolve: {
 			noExternal: ctx.nitro.options.dev ? isWorkerdRunner ? true : [
-				/^nitro$/,
+				/^nitro(\/|$)/,
 				new RegExp(`^(${runtimeDependencies.join("|")})$`),
 				...ctx.bundlerConfig.base.noExternal
 			] : true,
@@ -40,13 +40,14 @@ function createNitroEnvironment(ctx) {
 	};
 }
 function createServiceEnvironment(ctx, name, serviceConfig) {
+	const isDev = ctx.nitro.options.dev;
 	const isWorkerdRunner = _isWorkerdRunner(ctx);
 	return {
 		consumer: "server",
 		build: {
 			rollupOptions: {
 				input: { index: serviceConfig.entry },
-				external: [/^nitro(\/|$)/]
+				...isDev ? {} : { external: [/^nitro(\/|$)/] }
 			},
 			minify: ctx.nitro.options.minify,
 			sourcemap: ctx.nitro.options.sourcemap,
@@ -55,7 +56,7 @@ function createServiceEnvironment(ctx, name, serviceConfig) {
 			copyPublicDir: false
 		},
 		resolve: {
-			...isWorkerdRunner ? { noExternal: true } : {},
+			...isDev ? { noExternal: isWorkerdRunner ? true : [/^nitro(\/|$)/] } : {},
 			conditions: isWorkerdRunner ? [
 				"workerd",
 				"worker",
@@ -122,39 +123,6 @@ async function _loadRunner(ctx, manager) {
 	});
 	await manager.reload(runner);
 }
-const NITRO_PROXY_PREFIX = "\0nitro-env-proxy:";
-function nitroServiceProxy() {
-	return {
-		name: "nitro:service-proxy",
-		enforce: "pre",
-		applyToEnvironment: (env) => env.name !== "nitro" && env.config.consumer === "server",
-		apply: (_config, configEnv) => configEnv.command === "serve",
-		resolveId: {
-			filter: { id: /^nitro(\/|$)/ },
-			handler(id) {
-				if (id === "nitro" || id.startsWith("nitro/")) return {
-					id: NITRO_PROXY_PREFIX + id,
-					moduleSideEffects: false
-				};
-			}
-		},
-		load: {
-			filter: { id: /^\0nitro-env-proxy:/ },
-			handler(id) {
-				if (!id.startsWith(NITRO_PROXY_PREFIX)) return;
-				const originalId = id.slice(17);
-				return {
-					code: [
-						`const _mod = await globalThis.__VITE_ENVIRONMENT_RUNNER_IMPORT__("nitro", ${JSON.stringify(originalId)});`,
-						`__vite_ssr_exportAll__(_mod);`,
-						`export default _mod.default;`
-					].join("\n"),
-					map: null
-				};
-			}
-		}
-	};
-}
 function _isWorkerdRunner(ctx) {
 	return (ctx.nitro.options.devServer.runner || process.env.NITRO_DEV_RUNNER || "node-worker") === "miniflare";
 }
@@ -174,4 +142,4 @@ function tryResolve(id) {
 		try: true
 	}) || id;
 }
-export { createNitroEnvironment, createServiceEnvironment, createServiceEnvironments, getEnvRunner, initEnvRunner, nitroServiceProxy };
+export { createNitroEnvironment, createServiceEnvironment, createServiceEnvironments, getEnvRunner, initEnvRunner };

package/dist/_chunks/nitro.mjs

@@ -12,11 +12,12 @@ import { Hookable, createDebugger } from "hookable";
 import { runtimeDir, version } from "nitro/meta";
 import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
-import { pathToFileURL } from "node:url";
+import "node:url";
 import { defu } from "defu";
 import { joinURL, parseURL, withBase, withLeadingSlash, withQuery, withTrailingSlash, withoutBase, withoutTrailingSlash } from "ufo";
 import { colors } from "consola/utils";
 import { hash } from "ohash";
+import { EnvServer } from "env-runner";
 import { toRequest } from "h3";
 import http from "node:http";
 const NitroDefaults = {
@@ -267,7 +268,7 @@ async function resolvePathOptions(options) {
 		else {
 			const detected = resolveModulePath("./server", {
 				try: true,
-				from: options.rootDir,
+				from: options.serverDir && options.serverDir !== options.rootDir ? [options.serverDir, options.rootDir] : options.rootDir,
 				extensions: RESOLVE_EXTENSIONS.flatMap((ext) => [ext, `.node${ext}`])
 			});
 			if (detected) {
@@ -530,6 +531,7 @@ async function _loadUserConfig(configOverrides = {}, opts = {}) {
 	let compatibilityDate = configOverrides.compatibilityDate || opts.compatibilityDate || process.env.NITRO_COMPATIBILITY_DATE || process.env.SERVER_COMPATIBILITY_DATE || process.env.COMPATIBILITY_DATE;
 	const { resolvePreset } = await import("../_presets.mjs");
 	let preset = configOverrides.preset || process.env.NITRO_PRESET || process.env.SERVER_PRESET;
+	let inlineDefaultPreset;
 	const _dotenv = opts.dotenv ?? (configOverrides.dev && { fileName: [".env", ".env.local"] });
 	const envName = opts.c12?.envName ?? (configOverrides.dev ? "development" : "production");
 	const loadedConfig = await (opts.watch ? watchConfig : loadConfig)({
@@ -550,11 +552,17 @@ async function _loadUserConfig(configOverrides = {}, opts = {}) {
 				dev: true,
 				compatibilityDate: compatibilityDate || "latest"
 			}).then((p) => p?._meta?.name || "nitro-dev").catch(() => "nitro-dev") : "nitro-dev";
-			else if (!preset) preset = await resolvePreset("", {
-				static: getConf("static"),
-				dev: false,
-				compatibilityDate: compatibilityDate || "latest"
-			}).then((p) => p?._meta?.name);
+			else if (!preset) {
+				const defaultPreset = getConf("defaultPreset");
+				const resolved = await resolvePreset("", {
+					static: getConf("static"),
+					dev: false,
+					compatibilityDate: compatibilityDate || "latest",
+					defaultPreset
+				});
+				preset = resolved?._meta?.name;
+				if (resolved && defaultPreset && typeof defaultPreset !== "string") inlineDefaultPreset = resolved;
+			}
 			return {
 				...configOverrides,
 				preset,
@@ -566,6 +574,7 @@ async function _loadUserConfig(configOverrides = {}, opts = {}) {
 			};
 		},
 		async resolve(id) {
+			if (inlineDefaultPreset && id === inlineDefaultPreset._meta?.name) return { config: klona(inlineDefaultPreset) };
 			const preset = await resolvePreset(id, {
 				static: configOverrides.static,
 				compatibilityDate: compatibilityDate || "latest",
@@ -991,6 +1000,8 @@ async function prerender(nitro) {
 		...nitro.options._config,
 		static: false,
 		rootDir: nitro.options.rootDir,
+		renderer: nitro.options.renderer,
+		virtual: { ...nitro.options.virtual },
 		logLevel: 0,
 		preset: "nitro-prerender",
 		builder: nitro.options.builder === "vite" ? "rolldown" : nitro.options.builder
@@ -999,13 +1010,17 @@ async function prerender(nitro) {
 	const nitroRenderer = await createNitro(prerendererConfig);
 	const prerenderStartTime = Date.now();
 	await nitro.hooks.callHook("prerender:init", nitroRenderer);
+	await nitroRenderer.routing.sync();
 	let path = relative(nitro.options.output.dir, nitro.options.output.publicDir);
 	if (!path.startsWith(".")) path = `./${path}`;
 	nitroRenderer.options.commands.preview = `npx serve ${path}`;
 	nitroRenderer.options.output.dir = nitro.options.output.dir;
 	await build(nitroRenderer);
 	const serverFilename = typeof nitroRenderer.options.rollupConfig?.output?.entryFileNames === "string" ? nitroRenderer.options.rollupConfig.output.entryFileNames : "index.mjs";
-	const prerenderer = await import(pathToFileURL(resolve(nitroRenderer.options.output.serverDir, serverFilename)).href).then((m) => m.default);
+	const prerenderer = await new EnvServer({
+		runner: "node-worker",
+		entry: resolve(nitroRenderer.options.output.serverDir, serverFilename)
+	}).start();
 	const routeRules = createRouter();
 	for (const [route, rules] of Object.entries(nitro.options.routeRules)) addRoute(routeRules, void 0, route, rules);
 	const _getRouteRules = (path) => defu({}, ...findAllRoutes(routeRules, void 0, path).map((r) => r.data).reverse());

package/dist/_libs/commondir+is-reference.mjs

@@ -37,7 +37,7 @@ function isReference(node, parent) {
 	}
 	return false;
 }
-var version = "29.0.1";
+var version = "29.0.2";
 var peerDependencies = { rollup: "^2.68.0||^3.0.0||^4.0.0" };
 function tryParse(parse, code, id) {
 	try {
@@ -307,7 +307,7 @@ export function getAugmentedNamespace(n) {
 			var isInstance = false;
       try {
         isInstance = this instanceof a;
-      } catch {}
+      } catch (e) {}
 			if (isInstance) {
         return Reflect.construct(f, arguments, this.constructor);
 			}

package/dist/_libs/httpxy.d.mts

@@ -1,5 +1,6 @@
 import { EventEmitter } from "node:events";
 import * as stream from "node:stream";
+import { Duplex } from "node:stream";
 import http, { IncomingMessage } from "node:http";
 import http2 from "node:http2";
 import { Socket } from "node:net";