@nuxt/nitro-server 3.21.0 → 3.21.1

package/dist/index.mjs

@@ -19,34 +19,23 @@ import { isWindows } from "std-env";
 import { ImpoundPlugin } from "impound";
 import { resolveModulePath } from "exsolve";
 import { runtimeDependencies } from "nitropack/runtime/meta";
-
-//#region package.json
-var version = "3.21.0";
-
-//#endregion
-//#region src/utils.ts
+var version = "3.21.1";
 function toArray(value) {
 	return Array.isArray(value) ? value : [value];
 }
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (/(?:chunks|shared)$/.test(_distDir)) _distDir = dirname(_distDir);
 const distDir = _distDir;
-
-//#endregion
-//#region ../ui-templates/dist/templates/spa-loading-icon.ts
 const template = () => {
 	return "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"80\" fill=\"none\" class=\"nuxt-spa-loading\" viewBox=\"0 0 37 25\"><path d=\"M24.236 22.006h10.742L25.563 5.822l-8.979 14.31a4 4 0 0 1-3.388 1.874H2.978l11.631-20 5.897 10.567\"/></svg><style>.nuxt-spa-loading{left:50%;position:fixed;top:50%;transform:translate(-50%,-50%)}.nuxt-spa-loading>path{animation:nuxt-spa-loading-move 3s linear infinite;fill:none;stroke:#00dc82;stroke-dasharray:128;stroke-dashoffset:128;stroke-linecap:round;stroke-linejoin:round;stroke-width:4px}@keyframes nuxt-spa-loading-move{to{stroke-dashoffset:-128}}</style>";
 };
-
-//#endregion
-//#region ../nuxt/src/core/plugins/import-protection.ts
 function createImportProtectionPatterns(nuxt, options) {
 	const patterns = [];
 	const context = contextFlags[options.context];
 	patterns.push([/^(nuxt|nuxt3|nuxt-nightly)$/, `\`nuxt\`, or \`nuxt-nightly\` cannot be imported directly in ${context}.` + (options.context === "nuxt-app" ? " Instead, import runtime Nuxt composables from `#app` or `#imports`." : "")]);
 	patterns.push([/^((~|~~|@|@@)?\/)?nuxt\.config(\.|$)/, "Importing directly from a `nuxt.config` file is not allowed. Instead, use runtime config or a module."]);
 	patterns.push([/(^|node_modules\/)@vue\/composition-api/]);
-	for (const mod of nuxt.options._installedModules) if (mod.entryPath) patterns.push([/* @__PURE__ */ new RegExp(`^${escapeRE(mod.entryPath)}$`), "Importing directly from module entry-points is not allowed."]);
+	for (const mod of nuxt.options._installedModules) if (mod.entryPath) patterns.push([new RegExp(`^${escapeRE(mod.entryPath)}$`), "Importing directly from module entry-points is not allowed."]);
 	for (const i of [
 		/(^|node_modules\/)@nuxt\/(cli|kit|test-utils)/,
 		/(^|node_modules\/)nuxi/,
@@ -55,7 +44,7 @@ function createImportProtectionPatterns(nuxt, options) {
 	]) patterns.push([i, `This module cannot be imported in ${context}.`]);
 	if (options.context === "nitro-app" || options.context === "shared") for (const i of ["#app", /^#build(\/|$)/]) patterns.push([i, `Vue app aliases are not allowed in ${context}.`]);
 	if (options.context === "nuxt-app" || options.context === "shared") {
-		patterns.push([/* @__PURE__ */ new RegExp(escapeRE(relative(nuxt.options.srcDir, resolve(nuxt.options.srcDir, nuxt.options.serverDir || "server"))) + "\\/(api|routes|middleware|plugins)\\/"), `Importing from server is not allowed in ${context}.`]);
+		patterns.push([new RegExp(escapeRE(relative(nuxt.options.srcDir, resolve(nuxt.options.srcDir, nuxt.options.serverDir || "server"))) + "\\/(api|routes|middleware|plugins)\\/"), `Importing from server is not allowed in ${context}.`]);
 		patterns.push([/^#server(\/|$)/, `Server aliases are not allowed in ${context}.`]);
 	}
 	return patterns;
@@ -65,9 +54,6 @@ const contextFlags = {
 	"nuxt-app": "the Vue part of your app",
 	"shared": "the #shared directory"
 };
-
-//#endregion
-//#region src/templates.ts
 const nitroSchemaTemplate = {
 	filename: "types/nitro-nuxt.d.ts",
 	async getContents({ nuxt }) {
@@ -77,12 +63,9 @@ const nitroSchemaTemplate = {
 			references,
 			declarations
 		});
-		const sourceDir = join(nuxt.options.buildDir, "types");
+		const typesDir = join(nuxt.options.buildDir, "types");
 		return `
-${[...references.map((ref) => {
-			if ("path" in ref && isAbsolute(ref.path)) ref.path = relative(sourceDir, ref.path);
-			return `/// <reference ${renderAttrs(ref)} />`;
-		}), ...declarations].join("\n")}
+${[...references.map((ref) => renderReference(ref, typesDir)), ...declarations].join("\n")}
 /// <reference path="./schema.d.ts" />
 
 import type { RuntimeConfig } from 'nuxt/schema'
@@ -119,17 +102,9 @@ declare module 'nitropack' {
 `;
 	}
 };
-function renderAttr(key, value) {
-	return value ? `${key}="${value}"` : "";
-}
-function renderAttrs(obj) {
-	const attrs = [];
-	for (const key in obj) attrs.push(renderAttr(key, obj[key]));
-	return attrs.join(" ");
+function renderReference(ref, baseDir) {
+	return `/// <reference ${"path" in ref ? `path="${isAbsolute(ref.path) ? relative(baseDir, ref.path) : ref.path}"` : `types="${ref.types}"`} />`;
 }
-
-//#endregion
-//#region src/index.ts
 const logLevelMapReverse = {
 	silent: 0,
 	info: 3,
@@ -146,7 +121,7 @@ async function bundle(nuxt) {
 	}
 	const layerPublicAssetsDirs = [];
 	for (const dirs of layerDirs) if (existsSync(dirs.public)) layerPublicAssetsDirs.push({ dir: dirs.public });
-	const excludePattern = excludePaths.length ? [/* @__PURE__ */ new RegExp(`node_modules\\/(?!${excludePaths.join("|")})`)] : [/node_modules/];
+	const excludePattern = excludePaths.length ? [new RegExp(`node_modules\\/(?!${excludePaths.join("|")})`)] : [/node_modules/];
 	const rootDirWithSlash = withTrailingSlash(nuxt.options.rootDir);
 	const moduleEntryPaths = [];
 	for (const m of nuxt.options._installedModules) {
@@ -425,18 +400,18 @@ async function bundle(nuxt) {
 		}
 	});
 	if (nuxt.options.experimental.payloadExtraction) {
-		if (nuxt.options.dev) nuxt.hook("nitro:config", (nitroConfig$1) => {
-			nitroConfig$1.prerender ||= {};
-			nitroConfig$1.prerender.routes ||= [];
-			nitroConfig$1.routeRules ||= {};
-			for (const route of nitroConfig$1.prerender.routes) {
+		if (nuxt.options.dev) nuxt.hook("nitro:config", (nitroConfig) => {
+			nitroConfig.prerender ||= {};
+			nitroConfig.prerender.routes ||= [];
+			nitroConfig.routeRules ||= {};
+			for (const route of nitroConfig.prerender.routes) {
 				if (!route) continue;
-				nitroConfig$1.routeRules[route] = defu(nitroConfig$1.routeRules[route], { prerender: true });
+				nitroConfig.routeRules[route] = defu(nitroConfig.routeRules[route], { prerender: true });
 			}
 		});
-		nuxt.hook("nitro:init", (nitro$1) => {
-			nitro$1.hooks.hook("build:before", (nitro$2) => {
-				for (const [route, value] of Object.entries(nitro$2.options.routeRules)) if (!route.endsWith("*") && !route.endsWith("/_payload.json")) {
+		nuxt.hook("nitro:init", (nitro) => {
+			nitro.hooks.hook("build:before", (nitro) => {
+				for (const [route, value] of Object.entries(nitro.options.routeRules)) if (!route.endsWith("*") && !route.endsWith("/_payload.json")) {
 					if (value.isr || value.cache || value.prerender && nuxt.options.dev) {
 						const payloadKey = route + "/_payload.json";
 						const defaults = {};
@@ -445,7 +420,7 @@ async function bundle(nuxt) {
 							"cache",
 							...nuxt.options.dev ? ["prerender"] : []
 						]) if (key in value) defaults[key] = value[key];
-						nitro$2.options.routeRules[payloadKey] = defu(nitro$2.options.routeRules[payloadKey], defaults);
+						nitro.options.routeRules[payloadKey] = defu(nitro.options.routeRules[payloadKey], defaults);
 					}
 				}
 			});
@@ -483,13 +458,13 @@ async function bundle(nuxt) {
 			config.alias ||= {};
 			config.alias["#app-manifest"] = join(tempDir, `meta/${buildId}.json`);
 		});
-		nuxt.hook("nitro:init", (nitro$1) => {
-			nitro$1.hooks.hook("rollup:before", async (nitro$2) => {
+		nuxt.hook("nitro:init", (nitro) => {
+			nitro.hooks.hook("rollup:before", async (nitro) => {
 				const prerenderedRoutes = /* @__PURE__ */ new Set();
 				const routeRulesMatcher = getRouteRulesRouter();
-				if (nitro$2._prerenderedRoutes?.length) {
+				if (nitro._prerenderedRoutes?.length) {
 					const payloadSuffix = nuxt.options.experimental.renderJsonPayloads ? "/_payload.json" : "/_payload.js";
-					for (const route of nitro$2._prerenderedRoutes) if (!route.error && route.route.endsWith(payloadSuffix)) {
+					for (const route of nitro._prerenderedRoutes) if (!route.error && route.route.endsWith(payloadSuffix)) {
 						const url = route.route.slice(0, -payloadSuffix.length) || "/";
 						if (!defu({}, ...findAllRoutes(routeRulesMatcher, void 0, url).reverse()).prerender) prerenderedRoutes.add(url);
 					}
@@ -531,8 +506,8 @@ async function bundle(nuxt) {
 	const relativeSharedDir = withTrailingSlash(relative(nuxt.options.rootDir, resolve(nuxt.options.rootDir, nuxt.options.dir.shared)));
 	const sharedPatterns = [
 		/^#shared\//,
-		/* @__PURE__ */ new RegExp("^" + escapeRE(sharedDir)),
-		/* @__PURE__ */ new RegExp("^" + escapeRE(relativeSharedDir))
+		new RegExp("^" + escapeRE(sharedDir)),
+		new RegExp("^" + escapeRE(relativeSharedDir))
 	];
 	nitroConfig.rollupConfig.plugins.push(ImpoundPlugin.rollup({
 		cwd: nuxt.options.rootDir,
@@ -656,12 +631,12 @@ async function bundle(nuxt) {
 		handler: resolve(distDir, "runtime/handlers/renderer")
 	});
 	if (nuxt.options.experimental.chromeDevtoolsProjectSettings) {
-		const cacheDir$1 = resolve(nuxt.options.rootDir, "node_modules/.cache/nuxt");
-		let projectConfiguration = await readFile(join(cacheDir$1, "chrome-workspace.json"), "utf-8").then((r) => JSON.parse(r)).catch(() => null);
+		const cacheDir = resolve(nuxt.options.rootDir, "node_modules/.cache/nuxt");
+		let projectConfiguration = await readFile(join(cacheDir, "chrome-workspace.json"), "utf-8").then((r) => JSON.parse(r)).catch(() => null);
 		if (!projectConfiguration) {
 			projectConfiguration = { uuid: randomUUID() };
-			await mkdir(cacheDir$1, { recursive: true });
-			await writeFile(join(cacheDir$1, "chrome-workspace.json"), JSON.stringify(projectConfiguration), "utf-8");
+			await mkdir(cacheDir, { recursive: true });
+			await writeFile(join(cacheDir, "chrome-workspace.json"), JSON.stringify(projectConfiguration), "utf-8");
 		}
 		nitro.options.devHandlers.push({
 			route: "/.well-known/appspecific/com.chrome.devtools.json",
@@ -671,12 +646,12 @@ async function bundle(nuxt) {
 			} }))
 		});
 	}
-	if (!nuxt.options.dev && nuxt.options.experimental.noVueServer) nitro.hooks.hook("rollup:before", (nitro$1) => {
-		if (nitro$1.options.preset === "nitro-prerender") return;
-		const nuxtErrorHandler = nitro$1.options.handlers.findIndex((h) => h.route === "/__nuxt_error");
-		if (nuxtErrorHandler >= 0) nitro$1.options.handlers.splice(nuxtErrorHandler, 1);
-		nitro$1.options.renderer = void 0;
-		nitro$1.options.errorHandler = "nitropack/runtime/error";
+	if (!nuxt.options.dev && nuxt.options.experimental.noVueServer) nitro.hooks.hook("rollup:before", (nitro) => {
+		if (nitro.options.preset === "nitro-prerender") return;
+		const nuxtErrorHandler = nitro.options.handlers.findIndex((h) => h.route === "/__nuxt_error");
+		if (nuxtErrorHandler >= 0) nitro.options.handlers.splice(nuxtErrorHandler, 1);
+		nitro.options.renderer = void 0;
+		nitro.options.errorHandler = "nitropack/runtime/error";
 	});
 	nuxt.hook("prepare:types", async (opts) => {
 		if (!nuxt.options.dev) {
@@ -691,14 +666,14 @@ async function bundle(nuxt) {
 		for (const route of ["/200.html", "/404.html"]) routes.add(route);
 		if (!nuxt.options.ssr) routes.add("/index.html");
 	});
-	if (!nuxt.options.dev) nitro.hooks.hook("rollup:before", async (nitro$1) => {
-		await copyPublicAssets(nitro$1);
-		await nuxt.callHook("nitro:build:public-assets", nitro$1);
+	if (!nuxt.options.dev) nitro.hooks.hook("rollup:before", async (nitro) => {
+		await copyPublicAssets(nitro);
+		await nuxt.callHook("nitro:build:public-assets", nitro);
 	});
 	async function symlinkDist() {
 		if (nitro.options.static) {
-			const distDir$1 = resolve(nuxt.options.rootDir, "dist");
-			if (!existsSync(distDir$1)) await promises.symlink(nitro.options.output.publicDir, distDir$1, "junction").catch(() => {});
+			const distDir = resolve(nuxt.options.rootDir, "dist");
+			if (!existsSync(distDir)) await promises.symlink(nitro.options.output.publicDir, distDir, "junction").catch(() => {});
 		}
 	}
 	nuxt.hook("build:done", async () => {
@@ -736,7 +711,7 @@ async function bundle(nuxt) {
 			}));
 		});
 		nuxt.server = createDevServer(nitro);
-		const waitUntilCompile = new Promise((resolve$1) => nitro.hooks.hook("compiled", () => resolve$1()));
+		const waitUntilCompile = new Promise((resolve) => nitro.hooks.hook("compiled", () => resolve()));
 		nuxt.hook("build:done", () => waitUntilCompile);
 	}
 }
@@ -750,14 +725,12 @@ async function spaLoadingTemplatePath(nuxt) {
 }
 async function spaLoadingTemplate(nuxt) {
 	if (nuxt.options.spaLoadingTemplate === false) return "";
-	const spaLoadingTemplate$1 = await spaLoadingTemplatePath(nuxt);
+	const spaLoadingTemplate = await spaLoadingTemplatePath(nuxt);
 	try {
-		if (existsSync(spaLoadingTemplate$1)) return readFileSync(spaLoadingTemplate$1, "utf-8").trim();
+		if (existsSync(spaLoadingTemplate)) return readFileSync(spaLoadingTemplate, "utf-8").trim();
 	} catch {}
 	if (nuxt.options.spaLoadingTemplate === true) return template();
 	if (nuxt.options.spaLoadingTemplate) logger.warn(`Could not load custom \`spaLoadingTemplate\` path as it does not exist: \`${nuxt.options.spaLoadingTemplate}\`.`);
 	return "";
 }
-
-//#endregion
-export { bundle };
+export { bundle };

package/dist/runtime/handlers/error.mjs

@@ -26,8 +26,8 @@ export default (async function errorhandler(error, event, { defaultHandler }) {
 	// remove proto/hostname/port from URL
 	const url = new URL(errorObject.url);
 	errorObject.url = withoutBase(url.pathname, useRuntimeConfig(event).app.baseURL) + url.search + url.hash;
-	// add default server message
-	errorObject.message ||= "Server Error";
+	// add default server message (keep sanitized for unhandled errors)
+	errorObject.message = error.unhandled ? errorObject.message || "Server Error" : error.message || errorObject.message || "Server Error";
 	// we will be rendering this error internally so we can pass along the error.data safely
 	errorObject.data ||= error.data;
 	errorObject.statusText ||= error.statusText || error.statusMessage;

package/dist/runtime/utils/renderer/app.mjs

@@ -1,4 +1,3 @@
-import { decodePath } from "ufo";
 import { useRuntimeConfig } from "nitropack/runtime";
 import { createHead } from "@unhead/vue/server";
 import { sharedPrerenderCache } from "../cache.mjs";
@@ -13,7 +12,7 @@ const PRERENDER_NO_SSR_ROUTES = new Set([
 ]);
 export function createSSRContext(event) {
 	const ssrContext = {
-		url: decodePath(event.path),
+		url: event.path,
 		event,
 		runtimeConfig: useRuntimeConfig(event),
 		noSSR: !!NUXT_NO_SSR || event.context.nuxt?.noSSR || (import.meta.prerender ? PRERENDER_NO_SSR_ROUTES.has(event.path) : false),

package/dist/runtime/utils/renderer/build-files.d.mts

@@ -10,9 +10,7 @@ interface Renderer {
 		renderScripts: () => string;
 	}>;
 }
-// -- SSR Renderer --
 export declare const getSSRRenderer: unknown;
 export declare function getRenderer(ssrContext: NuxtSSRContext): Promise<Renderer>;
-// @ts-expect-error file will be produced after app build
 export declare const getSSRStyles: unknown;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/nitro-server",
-  "version": "3.21.0",
+  "version": "3.21.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^2.0.2",
-    "@unhead/vue": "^2.1.2",
+    "@unhead/vue": "^2.1.3",
     "@vue/shared": "^3.5.27",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
@@ -44,16 +44,16 @@
     "vue": "^3.5.27",
     "vue-bundle-renderer": "^2.2.0",
     "vue-devtools-stub": "^0.1.0",
-    "@nuxt/kit": "3.21.0"
+    "@nuxt/kit": "3.21.1"
   },
   "peerDependencies": {
-    "nuxt": "^3.21.0"
+    "nuxt": "^3.21.1"
   },
   "devDependencies": {
-    "obuild": "0.4.14",
-    "vitest": "3.2.4",
-    "nuxt": "3.21.0",
-    "@nuxt/schema": "3.21.0"
+    "obuild": "0.4.27",
+    "vitest": "4.0.18",
+    "nuxt": "3.21.1",
+    "@nuxt/schema": "3.21.1"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"