nitro 3.0.260311-beta → 3.0.260415-beta

package/dist/_build/rolldown.mjs

@@ -6,7 +6,6 @@ import { t as debounce } from "../_libs/perfect-debounce.mjs";
 import { n as generateFSTree } from "../_chunks/utils.mjs";
 import { builtinModules } from "node:module";
 import { defu } from "defu";
-//#region src/build/rolldown/config.ts
 const getRolldownConfig = async (nitro) => {
 	const base = baseBuildConfig(nitro);
 	const tsc = nitro.options.typescript.tsConfig?.compilerOptions;
@@ -41,9 +40,6 @@ const getRolldownConfig = async (nitro) => {
 				warn(warning);
 			}
 		},
-		treeshake: { moduleSideEffects(id) {
-			return nitro.options.moduleSideEffects.some((p) => id.startsWith(p));
-		} },
 		optimization: { inlineConst: true },
 		output: {
 			format: "esm",
@@ -70,8 +66,6 @@ const getRolldownConfig = async (nitro) => {
 	}
 	return config;
 };
-//#endregion
-//#region src/build/rolldown/dev.ts
 async function watchDev(nitro, config) {
 	const rolldown = await import("rolldown");
 	let watcher;
@@ -136,8 +130,6 @@ async function watchDev(nitro, config) {
 		return watcher;
 	}
 }
-//#endregion
-//#region src/build/rolldown/prod.ts
 async function buildProduction(nitro, config) {
 	const rolldown = await import("rolldown");
 	const buildStartTime = Date.now();
@@ -161,13 +153,10 @@ async function buildProduction(nitro, config) {
 	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`"));
 }
-//#endregion
-//#region src/build/rolldown/build.ts
 async function rolldownBuild(nitro) {
 	await nitro.hooks.callHook("build:before", nitro);
 	const config = await getRolldownConfig(nitro);
 	await nitro.hooks.callHook("rollup:before", nitro, config);
 	return nitro.options.dev ? watchDev(nitro, config) : buildProduction(nitro, config);
 }
-//#endregion
 export { rolldownBuild };

package/dist/_build/rollup.mjs

@@ -10,7 +10,6 @@ import { t as commonjs } from "../_libs/commondir+is-reference.mjs";
 import { t as json } from "../_libs/plugin-json.mjs";
 import { t as nodeResolve } from "../_libs/hasown+resolve+deepmerge.mjs";
 import { defu } from "defu";
-//#region src/build/rollup/config.ts
 const getRollupConfig = async (nitro) => {
 	const base = baseBuildConfig(nitro);
 	const tsc = nitro.options.typescript.tsConfig?.compilerOptions;
@@ -50,9 +49,6 @@ const getRollupConfig = async (nitro) => {
 		onwarn(warning, rollupWarn) {
 			if (!base.ignoreWarningCodes.has(warning.code || "")) rollupWarn(warning);
 		},
-		treeshake: { moduleSideEffects(id) {
-			return nitro.options.moduleSideEffects.some((p) => id.startsWith(p));
-		} },
 		output: {
 			format: "esm",
 			entryFileNames: "index.mjs",
@@ -73,8 +69,6 @@ const getRollupConfig = async (nitro) => {
 	if (outputConfig.inlineDynamicImports || outputConfig.format === "iife") delete outputConfig.manualChunks;
 	return config;
 };
-//#endregion
-//#region src/build/rollup/error.ts
 function formatRollupError(_error) {
 	try {
 		const logs = [_error.toString()];
@@ -92,8 +86,6 @@ function formatRollupError(_error) {
 		return _error?.toString();
 	}
 }
-//#endregion
-//#region src/build/rollup/dev.ts
 async function watchDev(nitro, rollupConfig) {
 	const rollup = await import("rollup");
 	let rollupWatcher;
@@ -158,8 +150,6 @@ async function watchDev(nitro, rollupConfig) {
 		return watcher;
 	}
 }
-//#endregion
-//#region src/build/rollup/prod.ts
 async function buildProduction(nitro, rollupConfig) {
 	const rollup = await import("rollup");
 	const buildStartTime = Date.now();
@@ -182,13 +172,10 @@ async function buildProduction(nitro, rollupConfig) {
 	nitro.logger.success("You can preview this build using `npx nitro preview`");
 	if (buildInfo.commands.deploy) nitro.logger.success("You can deploy this build using `npx nitro deploy --prebuilt`");
 }
-//#endregion
-//#region src/build/rollup/build.ts
 async function rollupBuild(nitro) {
 	await nitro.hooks.callHook("build:before", nitro);
 	const config = await getRollupConfig(nitro);
 	await nitro.hooks.callHook("rollup:before", nitro, config);
 	return nitro.options.dev ? watchDev(nitro, config) : buildProduction(nitro, config);
 }
-//#endregion
 export { rollupBuild };

package/dist/_build/vite.build.mjs

@@ -1,6 +1,5 @@
 import { H as v } 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 } = await import(nitro$1.options.__vitePkg__ || "vite");
@@ -14,5 +13,4 @@ async function viteBuild(nitro$1) {
 	delete globalThis.__nitro_build__;
 	await builder.buildApp();
 }
-//#endregion
 export { viteBuild };

package/dist/_chunks/nitro.mjs

@@ -5,22 +5,22 @@ import { t as klona } from "../_libs/klona.mjs";
 import { t as escapeStringRegexp } from "../_libs/escape-string-regexp.mjs";
 import { n as parse, t as TSConfckCache } from "../_libs/tsconfck.mjs";
 import { n as scanHandlers, t as scanAndSyncOptions } from "./nitro2.mjs";
-import { a as findRoute, i as findAllRoutes, n as addRoute, r as createRouter, t as compileRouterToString } from "../_libs/rou3.mjs";
+import { i as findAllRoutes, n as addRoute, r as createRouter } from "../_libs/rou3.mjs";
+import { n as initNitroRouting } from "./nitro3.mjs";
+import "../_dev.mjs";
 import { n as z, t as P } from "../_libs/ultrahtml.mjs";
 import { createRequire } from "node:module";
 import consola, { consola as consola$1 } from "consola";
 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 { defu } from "defu";
-import { runtimeDir, version } from "nitro/meta";
 import { joinURL, parseURL, withBase, withLeadingSlash, withQuery, withTrailingSlash, withoutBase, withoutTrailingSlash } from "ufo";
 import { colors } from "consola/utils";
-import { hash } from "ohash";
 import { toRequest } from "h3";
 import http from "node:http";
-//#region src/config/defaults.ts
 const NitroDefaults = {
 	compatibilityDate: "latest",
 	debug: _,
@@ -78,7 +78,6 @@ const NitroDefaults = {
 		routes: []
 	},
 	builder: void 0,
-	moduleSideEffects: ["unenv/polyfill/"],
 	replace: {},
 	node: true,
 	sourcemap: false,
@@ -97,8 +96,6 @@ const NitroDefaults = {
 		version
 	}
 };
-//#endregion
-//#region src/config/resolvers/assets.ts
 async function resolveAssetsOptions(options) {
 	for (const publicAsset of options.publicAssets) {
 		publicAsset.dir = resolve(options.rootDir, publicAsset.dir);
@@ -124,13 +121,9 @@ async function resolveAssetsOptions(options) {
 		if (asset.maxAge && !asset.fallthrough) options.routeRules[asset.baseURL + "/**"] = defu(routeRule, { headers: { "cache-control": `public, max-age=${asset.maxAge}, immutable` } });
 	}
 }
-//#endregion
-//#region src/config/resolvers/compatibility.ts
 async function resolveCompatibilityOptions(options) {
 	options.compatibilityDate = resolveCompatibilityDatesFromEnv(options.compatibilityDate);
 }
-//#endregion
-//#region src/config/resolvers/database.ts
 async function resolveDatabaseOptions(options) {
 	if (options.experimental.database && options.imports) {
 		options.imports.presets ??= [];
@@ -148,8 +141,6 @@ async function resolveDatabaseOptions(options) {
 		} };
 	}
 }
-//#endregion
-//#region src/config/resolvers/export-conditions.ts
 async function resolveExportConditionsOptions(options) {
 	options.exportConditions = _resolveExportConditions(options.exportConditions || [], {
 		dev: options.dev,
@@ -165,8 +156,6 @@ function _resolveExportConditions(userConditions, opts) {
 	const negated = new Set(userConditions.filter((c) => c.startsWith("!")).map((c) => c.slice(1)));
 	return [...new Set(conditions)].filter((c) => !negated.has(c));
 }
-//#endregion
-//#region src/config/resolvers/imports.ts
 async function resolveImportsOptions(options) {
 	if (options.imports === false) return;
 	options.imports.presets ??= [];
@@ -179,8 +168,6 @@ async function resolveImportsOptions(options) {
 		options.imports.exclude.push(scanDirsInNodeModules.length > 0 ? new RegExp(`node_modules\\/(?!${scanDirsInNodeModules.map((dir) => escapeStringRegexp(dir)).join("|")})`) : /[/\\]node_modules[/\\]/);
 	}
 }
-//#endregion
-//#region src/config/resolvers/open-api.ts
 async function resolveOpenAPIOptions(options) {
 	if (!options.experimental.openAPI) return;
 	if (!options.dev && !options.openAPI?.production) return;
@@ -218,15 +205,9 @@ async function resolveOpenAPIOptions(options) {
 		options.prerender.routes.push(...prerenderRoutes);
 	}
 }
-//#endregion
-//#region src/config/resolvers/tsconfig.ts
 async function resolveTsconfig(options) {
 	const root = resolve(options.rootDir || ".") + "/";
 	if (!options.typescript.tsConfig) options.typescript.tsConfig = await loadTsconfig(root);
-	if (options.experimental.tsconfigPaths && options.typescript.tsConfig.compilerOptions?.paths) options.alias = {
-		...tsConfigToAliasObj(options.typescript.tsConfig, root),
-		...options.alias
-	};
 }
 async function loadTsconfig(root) {
 	const opts = {
@@ -241,30 +222,6 @@ async function loadTsconfig(root) {
 	if (!tsconfig.compilerOptions.baseUrl) tsconfig.compilerOptions.baseUrl = resolve(tsconfigFile, "..");
 	return tsconfig;
 }
-function tsConfigToAliasObj(tsconfig, root) {
-	const compilerOptions = tsconfig?.compilerOptions;
-	if (!compilerOptions?.paths) return {};
-	const paths = compilerOptions.paths;
-	const alias = {};
-	for (const [key, targets] of Object.entries(paths)) {
-		let source = key;
-		let target = targets?.[0];
-		if (!target) continue;
-		if (source.includes("*") || target.includes("*")) {
-			source = source.replace(/\/\*$/, "");
-			target = target.replace(/\/\*$/, "");
-			if (source.includes("*") || target.includes("*")) continue;
-		}
-		if (target.startsWith(".")) {
-			if (!compilerOptions.baseUrl) continue;
-			target = resolve(root, compilerOptions.baseUrl, target) + (key.endsWith("*") ? "/" : "");
-		}
-		alias[source] = target;
-	}
-	return alias;
-}
-//#endregion
-//#region src/config/resolvers/paths.ts
 const RESOLVE_EXTENSIONS = [
 	".ts",
 	".js",
@@ -354,8 +311,6 @@ async function resolvePathOptions(options) {
 		}
 	}
 }
-//#endregion
-//#region src/config/resolvers/route-rules.ts
 async function resolveRouteRulesOptions(options) {
 	options.routeRules = normalizeRouteRules(options);
 }
@@ -388,7 +343,7 @@ function normalizeRouteRules(config) {
 			"access-control-max-age": "0",
 			...routeRules.headers
 		};
-		if (routeConfig.swr) {
+		if (routeConfig.swr !== void 0 && routeConfig.swr !== false) {
 			routeRules.cache = routeRules.cache || {};
 			routeRules.cache.swr = true;
 			if (typeof routeConfig.swr === "number") routeRules.cache.maxAge = routeConfig.swr;
@@ -398,8 +353,6 @@ function normalizeRouteRules(config) {
 	}
 	return normalizedRules;
 }
-//#endregion
-//#region src/config/resolvers/runtime-config.ts
 async function resolveRuntimeConfigOptions(options) {
 	options.runtimeConfig = normalizeRuntimeConfig(options);
 }
@@ -434,24 +387,16 @@ function checkSerializableRuntimeConfig(obj, path = []) {
 function isPrimitiveValue(value) {
 	return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
 }
-//#endregion
-//#region src/config/resolvers/storage.ts
 async function resolveStorageOptions(options) {}
-//#endregion
-//#region src/config/resolvers/url.ts
 async function resolveURLOptions(options) {
 	options.baseURL = withLeadingSlash(withTrailingSlash(options.baseURL));
 }
-//#endregion
-//#region src/config/resolvers/error.ts
 async function resolveErrorOptions(options) {
 	if (!options.errorHandler) options.errorHandler = [];
 	else if (!Array.isArray(options.errorHandler)) options.errorHandler = [options.errorHandler];
 	options.errorHandler = options.errorHandler.map((h) => resolveNitroPath(h, options));
 	options.errorHandler.push(join(runtimeDir, `internal/error/${options.dev ? "dev" : "prod"}`));
 }
-//#endregion
-//#region src/config/resolvers/unenv.ts
 const common = {
 	meta: {
 		name: "nitro-common",
@@ -494,8 +439,6 @@ async function resolveUnenv(options) {
 	if (!options.node) options.unenv.unshift(nodeless);
 	options.unenv.unshift(common);
 }
-//#endregion
-//#region src/config/resolvers/builder.ts
 const VALID_BUILDERS = [
 	"rolldown",
 	"rollup",
@@ -549,8 +492,16 @@ function hasNitroViteConfig(options) {
 	}
 	return false;
 }
-//#endregion
-//#region src/config/loader.ts
+async function resolveTracingOptions(options) {
+	if (!options.tracingChannel) return;
+	options.tracingChannel = {
+		srvx: true,
+		h3: true,
+		...typeof options.tracingChannel === "object" ? options.tracingChannel : {}
+	};
+	options.plugins = options.plugins || [];
+	options.plugins.push("#nitro/virtual/tracing");
+}
 const configResolvers = [
 	resolveCompatibilityOptions,
 	resolveTsconfig,
@@ -566,7 +517,8 @@ const configResolvers = [
 	resolveStorageOptions,
 	resolveErrorOptions,
 	resolveUnenv,
-	resolveBuilder
+	resolveBuilder,
+	resolveTracingOptions
 ];
 async function loadOptions(configOverrides = {}, opts = {}) {
 	const options = await _loadUserConfig(configOverrides, opts);
@@ -632,16 +584,12 @@ async function _loadUserConfig(configOverrides = {}, opts = {}) {
 	if (options.dev && options.preset !== "nitro-dev") consola.info(`Using \`${options.preset}\` emulation in development mode.`);
 	return options;
 }
-//#endregion
-//#region src/config/update.ts
 async function updateNitroConfig(nitro, config) {
 	nitro.options.routeRules = normalizeRouteRules(config.routeRules ? config : nitro.options);
 	nitro.options.runtimeConfig = normalizeRuntimeConfig(config.runtimeConfig ? config : nitro.options);
 	await nitro.hooks.callHook("rollup:reload");
 	consola.success("Nitro config hot reloaded!");
 }
-//#endregion
-//#region src/module.ts
 async function installModules(nitro) {
 	const _modules = [...nitro.options.modules || []];
 	const modules = await Promise.all(_modules.map((mod) => _resolveNitroModule(mod, nitro.options)));
@@ -678,141 +626,6 @@ async function _resolveNitroModule(mod, nitroOptions) {
 		...mod
 	};
 }
-//#endregion
-//#region src/routing.ts
-const isGlobalMiddleware = (h) => !h.method && (!h.route || h.route === "/**");
-function initNitroRouting(nitro) {
-	const envConditions = new Set([
-		nitro.options.dev ? "dev" : "prod",
-		nitro.options.preset,
-		nitro.options.preset === "nitro-prerender" ? "prerender" : void 0
-	].filter(Boolean));
-	const matchesEnv = (h) => {
-		const envs = (Array.isArray(h.env) ? h.env : [h.env]).filter(Boolean);
-		return envs.length === 0 || envs.some((env) => envConditions.has(env));
-	};
-	const routes = new Router(nitro.options.baseURL);
-	const routeRules = new Router(nitro.options.baseURL);
-	const globalMiddleware = [];
-	const routedMiddleware = new Router(nitro.options.baseURL);
-	const sync = () => {
-		routeRules._update(Object.entries(nitro.options.routeRules).map(([route, data]) => ({
-			route,
-			method: "",
-			data: {
-				...data,
-				_route: route
-			}
-		})));
-		const _routes = [
-			...Object.entries(nitro.options.routes).flatMap(([route, handler]) => {
-				if (typeof handler === "string") handler = { handler };
-				return {
-					...handler,
-					route,
-					middleware: false
-				};
-			}),
-			...nitro.options.handlers,
-			...nitro.scannedHandlers
-		].filter((h) => h && !h.middleware && matchesEnv(h));
-		if (nitro.options.serverEntry && nitro.options.serverEntry.handler) _routes.push({
-			route: "/**",
-			lazy: false,
-			format: nitro.options.serverEntry.format,
-			handler: nitro.options.serverEntry.handler
-		});
-		if (nitro.options.renderer?.handler) _routes.push({
-			route: "/**",
-			lazy: true,
-			handler: nitro.options.renderer?.handler
-		});
-		routes._update(_routes.map((h) => ({
-			...h,
-			method: h.method || "",
-			data: handlerWithImportHash(h)
-		})), { merge: true });
-		const _middleware = [...nitro.scannedHandlers, ...nitro.options.handlers].filter((h) => h && h.middleware && matchesEnv(h));
-		if (nitro.options.serveStatic) _middleware.unshift({
-			route: "/**",
-			middleware: true,
-			handler: join(runtimeDir, "internal/static")
-		});
-		globalMiddleware.splice(0, globalMiddleware.length, ..._middleware.filter((h) => isGlobalMiddleware(h)).map((m) => handlerWithImportHash(m)));
-		routedMiddleware._update(_middleware.filter((h) => !isGlobalMiddleware(h)).map((h) => ({
-			...h,
-			method: h.method || "",
-			data: handlerWithImportHash(h)
-		})));
-	};
-	nitro.routing = Object.freeze({
-		sync,
-		routes,
-		routeRules,
-		globalMiddleware,
-		routedMiddleware
-	});
-}
-function handlerWithImportHash(h) {
-	const id = (h.lazy ? "_lazy_" : "_") + hash(h.handler).replace(/-/g, "").slice(0, 6);
-	return {
-		...h,
-		_importHash: id
-	};
-}
-var Router = class {
-	_routes;
-	_router;
-	_compiled;
-	_baseURL;
-	constructor(baseURL) {
-		this._update([]);
-		this._baseURL = baseURL || "";
-		if (this._baseURL.endsWith("/")) this._baseURL = this._baseURL.slice(0, -1);
-	}
-	get routes() {
-		return this._routes;
-	}
-	_update(routes, opts) {
-		this._routes = routes;
-		this._router = createRouter();
-		this._compiled = void 0;
-		for (const route of routes) addRoute(this._router, route.method, this._baseURL + route.route, route.data);
-		if (opts?.merge) mergeCatchAll(this._router);
-	}
-	hasRoutes() {
-		return this._routes.length > 0;
-	}
-	compileToString(opts) {
-		const key = opts ? hash(opts) : "";
-		this._compiled ||= {};
-		if (this._compiled[key]) return this._compiled[key];
-		this._compiled[key] = compileRouterToString(this._router, void 0, opts);
-		if (this.routes.length === 1 && this.routes[0].route === "/**" && this.routes[0].method === "") {
-			const data = (opts?.serialize || JSON.stringify)(this.routes[0].data);
-			let retCode = `{data,params:{"_":p.slice(1)}}`;
-			if (opts?.matchAll) retCode = `[${retCode}]`;
-			this._compiled[key] = `/* @__PURE__ */ (() => {const data=${data};return ((_m, p)=>{return ${retCode};})})()`;
-		}
-		return this._compiled[key];
-	}
-	match(method, path) {
-		return findRoute(this._router, method, path)?.data;
-	}
-	matchAll(method, path) {
-		return findAllRoutes(this._router, method, path).map((route) => route.data);
-	}
-};
-function mergeCatchAll(router) {
-	const handlers = router.root?.wildcard?.methods?.[""];
-	if (!handlers || handlers.length < 2) return;
-	handlers.splice(0, handlers.length, {
-		...handlers[0],
-		data: handlers.map((h) => h.data)
-	});
-}
-//#endregion
-//#region src/global.ts
 const nitroInstances = globalThis.__nitro_instances__ ||= [];
 const globalKey = "__nitro_builder__";
 function registerNitroInstance(nitro) {
@@ -833,11 +646,14 @@ function globalInit() {
 		return nitro.fetch(req);
 	} };
 }
-//#endregion
-//#region src/nitro.ts
 async function createNitro(config = {}, opts = {}) {
+	const options = await loadOptions(config, opts);
 	const nitro = {
-		options: await loadOptions(config, opts),
+		meta: {
+			version,
+			majorVersion: 3
+		},
+		options,
 		hooks: new Hookable(),
 		vfs: /* @__PURE__ */ new Map(),
 		routing: {},
@@ -869,8 +685,6 @@ async function createNitro(config = {}, opts = {}) {
 	nitro.routing.sync();
 	return nitro;
 }
-//#endregion
-//#region src/prerender/utils.ts
 const allowedExtensions = new Set(["", ".json"]);
 const linkParents = /* @__PURE__ */ new Map();
 const HTML_ENTITIES = {
@@ -931,8 +745,6 @@ function matchesIgnorePattern(path, pattern) {
 	if (pattern instanceof RegExp) return pattern.test(path);
 	return false;
 }
-//#endregion
-//#region src/prerender/prerender.ts
 const JsonSigRx = /^\s*["[{]|^\s*-?\d{1,16}(\.\d{1,17})?([Ee][+-]?\d+)?\s*$/;
 async function prerender(nitro) {
 	if (nitro.options.noPublicDir) {
@@ -1096,16 +908,12 @@ async function prerender(nitro) {
 	nitro.logger.info(`Prerendered ${nitro._prerenderedRoutes.length} routes in ${prerenderTimeInMs / 1e3} seconds`);
 	if (nitro.options.compressPublicAssets) await compressPublicAssets(nitro);
 }
-//#endregion
-//#region src/task.ts
-/** @experimental */
 async function runTask(taskEvent, opts) {
 	return await (await _getTasksContext(opts)).devFetch(`/_nitro/tasks/${taskEvent.name}`, {
 		method: "POST",
 		body: taskEvent
 	});
 }
-/** @experimental */
 async function listTasks(opts) {
 	return (await (await _getTasksContext(opts)).devFetch("/_nitro/tasks")).tasks;
 }
@@ -1155,5 +963,4 @@ function _pidIsRunning(pid) {
 		return false;
 	}
 }
-//#endregion
 export { loadOptions as a, createNitro as i, runTask as n, prerender as r, listTasks as t };

package/dist/_chunks/nitro2.mjs

@@ -1,6 +1,5 @@
 import { M as glob, ct as join, ut as relative } from "../_build/common.mjs";
 import { withBase, withLeadingSlash, withoutTrailingSlash } from "ufo";
-//#region src/scan.ts
 const GLOB_SCAN_PATTERN = "**/*.{js,mjs,cjs,ts,mts,cts,tsx,jsx}";
 const suffixRegex = /(\.(?<method>connect|delete|get|head|options|patch|post|put|trace))?(\.(?<env>dev|prod|prerender))?$/;
 async function scanAndSyncOptions(nitro) {
@@ -98,5 +97,4 @@ async function scanDir(nitro, dir, name) {
 		};
 	}).sort((a, b) => a.path.localeCompare(b.path));
 }
-//#endregion
 export { scanHandlers as n, scanAndSyncOptions as t };