@nuxt/nitro-server-nightly 4.5.0-29703714.2f094acc → 4.5.0-29705236.f2ca6ea5

package/dist/index.mjs

@@ -21,10 +21,25 @@ import { hasTTY, isCI, isWindows } from "std-env";
 import { ImpoundPlugin } from "impound";
 import { resolveModulePath } from "exsolve";
 import { runtimeDependencies } from "nitropack/runtime/meta";
-var version = "4.5.0-29703714.2f094acc";
+var version = "4.5.0-29705236.f2ca6ea5";
 function toArray(value) {
 	return Array.isArray(value) ? value : [value];
 }
+const NODE_MODULES_RE = /\/node_modules\//g;
+function getLayerNodeModulesExcludePattern(layerRoots) {
+	const excludePaths = [];
+	for (const layerRoot of layerRoots) {
+		const root = layerRoot.replace(/\/$/, "");
+		NODE_MODULES_RE.lastIndex = 0;
+		let match;
+		while (match = NODE_MODULES_RE.exec(root)) {
+			const suffix = root.slice(match.index + match[0].length);
+			if (suffix) excludePaths.push(escapeRE(suffix));
+			NODE_MODULES_RE.lastIndex = match.index + 1;
+		}
+	}
+	return excludePaths.length ? new RegExp(`node_modules\\/(?!${excludePaths.join("|")})`) : /node_modules/;
+}
 let _distDir = dirname(fileURLToPath(import.meta.url));
 if (/(?:chunks|shared)$/.test(_distDir)) _distDir = dirname(_distDir);
 const distDir = _distDir;
@@ -181,18 +196,11 @@ const logLevelMapReverse = {
 	info: 3,
 	verbose: 3
 };
-const NODE_MODULES_RE = /(?<=\/)node_modules\/(.+)$/;
-const PNPM_NODE_MODULES_RE = /\.pnpm\/.+\/node_modules\/(.+)$/;
 async function bundle(nuxt) {
 	const layerDirs = getLayerDirectories(nuxt);
-	const excludePaths = [];
-	for (const dirs of layerDirs) {
-		const paths = [dirs.root.match(NODE_MODULES_RE)?.[1]?.replace(/\/$/, ""), dirs.root.match(PNPM_NODE_MODULES_RE)?.[1]?.replace(/\/$/, "")];
-		for (const dir of paths) if (dir) excludePaths.push(escapeRE(dir));
-	}
+	const excludePattern = [getLayerNodeModulesExcludePattern(layerDirs.map((dirs) => dirs.root))];
 	const layerPublicAssetsDirs = [];
 	for (const dirs of layerDirs) if (existsSync(dirs.public)) layerPublicAssetsDirs.push({ dir: dirs.public });
-	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) {
@@ -560,63 +568,73 @@ async function bundle(nuxt) {
 		nitroConfig.virtual["#build/dist/server/server.mjs"] = "export default () => {}";
 		if (process.platform === "win32") nitroConfig.virtual["#build/dist/server/server.mjs".replace(FORWARD_SLASH_RE, "\\")] = "export default () => {}";
 	}
-	if (nuxt.options.dev) {
+	if (nuxt.options.dev || !nuxt.options.ssr) {
 		nitroConfig.virtual["#build/dist/server/styles.mjs"] = "export default {}";
 		if (process.platform === "win32") nitroConfig.virtual["#build/dist/server/styles.mjs".replace(FORWARD_SLASH_RE, "\\")] = "export default {}";
 	}
-	if (nuxt.options.experimental.decorators) {
-		const nitroDecoratorDeps = [
-			"@rollup/plugin-babel",
-			"@babel/plugin-proposal-decorators",
-			"@babel/plugin-syntax-typescript"
-		];
-		let hasDeps = true;
-		for (const pkg of nitroDecoratorDeps) try {
-			await import(pkg);
-		} catch (_err) {
-			const err = _err;
-			if (err.code !== "ERR_MODULE_NOT_FOUND" && err.code !== "MODULE_NOT_FOUND") throw err;
-			if (!isCI && hasTTY) {
-				logger.info("Decorator support requires additional dependencies.");
-				if (await logger.prompt(`Install \`${nitroDecoratorDeps.join("` and `")}\`?`, {
-					type: "confirm",
-					initial: true
-				})) {
-					logger.start(`Installing ${nitroDecoratorDeps.map((d) => `\`${d}\``).join(" and ")}...`);
-					await addDependency(nitroDecoratorDeps, {
-						dev: true,
-						cwd: nuxt.options.rootDir,
-						silent: true
-					});
-					logger.info("Rerun Nuxt to enable decorator support.");
-					process.exit(1);
+	const nitroDecoratorSetup = /* @__PURE__ */ new WeakMap();
+	const setupNitroDecorators = (nitroConfig) => {
+		const existingSetup = nitroDecoratorSetup.get(nitroConfig);
+		if (existingSetup) return existingSetup;
+		const setup = (async () => {
+			const nitroDecoratorDeps = [
+				"@rollup/plugin-babel",
+				"@babel/plugin-proposal-decorators",
+				"@babel/plugin-syntax-typescript"
+			];
+			let hasDeps = true;
+			for (const pkg of nitroDecoratorDeps) try {
+				await import(pkg);
+			} catch (_err) {
+				const err = _err;
+				if (err.code !== "ERR_MODULE_NOT_FOUND" && err.code !== "MODULE_NOT_FOUND") throw err;
+				if (!isCI && hasTTY) {
+					logger.info("Decorator support requires additional dependencies.");
+					if (await logger.prompt(`Install \`${nitroDecoratorDeps.join("` and `")}\`?`, {
+						type: "confirm",
+						initial: true
+					})) {
+						logger.start(`Installing ${nitroDecoratorDeps.map((d) => `\`${d}\``).join(" and ")}...`);
+						await addDependency(nitroDecoratorDeps, {
+							dev: true,
+							cwd: nuxt.options.rootDir,
+							silent: true
+						});
+						logger.info("Rerun Nuxt to enable decorator support.");
+						process.exit(1);
+					}
 				}
+				logger.warn(`Cannot find \`${pkg}\`. Install \`${nitroDecoratorDeps.join("` and `")}\` to enable decorator support.`);
+				hasDeps = false;
+				break;
 			}
-			logger.warn(`Cannot find \`${pkg}\`. Install \`${nitroDecoratorDeps.join("` and `")}\` to enable decorator support.`);
-			hasDeps = false;
-			break;
-		}
-		if (hasDeps) {
-			const { babel } = await import("@rollup/plugin-babel");
-			nitroConfig.rollupConfig.plugins = toArray(await nitroConfig.rollupConfig.plugins || []);
-			nitroConfig.rollupConfig.plugins.unshift(babel({
-				babelHelpers: "bundled",
-				configFile: false,
-				extensions: [
-					".ts",
-					".js",
-					".mjs",
-					".mts"
-				],
-				plugins: [["@babel/plugin-syntax-typescript", { isTSX: false }], ["@babel/plugin-proposal-decorators", { version: "2023-11" }]]
-			}), babel({
-				babelHelpers: "bundled",
-				configFile: false,
-				extensions: [".tsx", ".jsx"],
-				plugins: [["@babel/plugin-syntax-typescript", { isTSX: true }], ["@babel/plugin-proposal-decorators", { version: "2023-11" }]]
-			}));
-		}
-	}
+			if (hasDeps) {
+				const { babel } = await import("@rollup/plugin-babel");
+				nitroConfig.rollupConfig.plugins = toArray(await nitroConfig.rollupConfig.plugins || []);
+				nitroConfig.rollupConfig.plugins.unshift(babel({
+					babelHelpers: "bundled",
+					configFile: false,
+					extensions: [
+						".ts",
+						".js",
+						".mjs",
+						".mts"
+					],
+					plugins: [["@babel/plugin-syntax-typescript", { isTSX: false }], ["@babel/plugin-proposal-decorators", { version: "2023-11" }]]
+				}), babel({
+					babelHelpers: "bundled",
+					configFile: false,
+					extensions: [".tsx", ".jsx"],
+					plugins: [["@babel/plugin-syntax-typescript", { isTSX: true }], ["@babel/plugin-proposal-decorators", { version: "2023-11" }]]
+				}));
+			}
+		})();
+		nitroDecoratorSetup.set(nitroConfig, setup);
+		setup.catch(() => nitroDecoratorSetup.delete(nitroConfig));
+		return setup;
+	};
+	if (nuxt.options.experimental.decorators) if (nuxt.options.dev) nuxt.hook("nitro:build:before", (nitro) => setupNitroDecorators(nitro.options));
+	else await setupNitroDecorators(nitroConfig);
 	nitroConfig.rollupConfig.plugins = await nitroConfig.rollupConfig.plugins || [];
 	nitroConfig.rollupConfig.plugins = toArray(nitroConfig.rollupConfig.plugins);
 	const sharedDir = withTrailingSlash(resolve(nuxt.options.rootDir, nuxt.options.dir.shared));

package/dist/runtime/handlers/island.mjs

@@ -4,7 +4,7 @@ import { createError, defineEventHandler, getQuery, readBody, setResponseHeader,
 import { VueResolver, walkResolver } from "@unhead/vue/utils";
 import { getRequestDependencies } from "vue-bundle-renderer/runtime";
 import { getQuery as getURLQuery } from "ufo";
-import { computeIslandHash, filterIslandProps } from "#app/island-hash";
+import { computeIslandHash } from "#app/island-hash";
 import { islandCache, islandPropCache } from "../utils/cache.mjs";
 import { createSSRContext } from "../utils/renderer/app.mjs";
 import { getSSRRenderer } from "../utils/renderer/build-files.mjs";
@@ -146,8 +146,7 @@ async function getIslandContext(event) {
 		});
 	}
 	const rawContext = event.method === "GET" ? getQuery(event) : await readBody(event);
-	const rawProps = destr(rawContext?.props) || {};
-	const filteredProps = filterIslandProps(rawProps);
+	const serializedProps = typeof rawContext?.props === "string" ? rawContext.props : "{}";
 	
 	
 	const clientContext = {};
@@ -160,18 +159,19 @@ async function getIslandContext(event) {
 	}
 	
 	
-	const expectedHash = computeIslandHash(componentName, filteredProps, clientContext, undefined);
+	const expectedHash = computeIslandHash(componentName, serializedProps, clientContext, undefined);
 	if (!hashId || hashId !== expectedHash) {
 		throw createError({
 			statusCode: 400,
 			statusMessage: "Invalid island request hash"
 		});
 	}
+	const parsedProps = destr(serializedProps) || {};
 	return {
 		url: typeof rawContext?.url === "string" ? rawContext.url : "/",
 		id: hashId,
 		name: componentName,
-		props: rawProps,
+		props: parsedProps,
 		slots: {},
 		components: {}
 	};

package/dist/runtime/handlers/renderer.mjs

@@ -258,13 +258,9 @@ async function renderRoute(event, ssrError) {
 		
 		
 		
-		if (ssrContext["~lazyHydratedModules"]) {
-			for (const id of ssrContext["~lazyHydratedModules"]) {
-				ssrContext.modules?.delete(id);
-			}
-		}
-		ssrContext.head.push({ link: getPreloadLinks(ssrContext, renderer.rendererContext) });
-		ssrContext.head.push({ link: getPrefetchLinks(ssrContext, renderer.rendererContext) });
+		const dependencyOptions = ssrContext["~lazyHydratedModules"]?.size ? { exclude: ssrContext["~lazyHydratedModules"] } : undefined;
+		ssrContext.head.push({ link: getPreloadLinks(ssrContext, renderer.rendererContext, dependencyOptions) });
+		ssrContext.head.push({ link: getPrefetchLinks(ssrContext, renderer.rendererContext, dependencyOptions) });
 		
 		ssrContext.head.push({ script: _PAYLOAD_INLINE ? NUXT_JSON_PAYLOADS ? renderPayloadJsonScript({
 			ssrContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/nitro-server-nightly",
-  "version": "4.5.0-29703714.2f094acc",
+  "version": "4.5.0-29705236.f2ca6ea5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^2.0.2",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.5.0-29703714.2f094acc",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.5.0-29705236.f2ca6ea5",
     "@unhead/vue": "^3.1.3",
     "@vue/shared": "^3.5.35",
     "consola": "^3.4.2",
@@ -51,14 +51,14 @@
     "unctx": "^2.5.0",
     "unstorage": "^1.17.5",
     "vue": "^3.5.35",
-    "vue-bundle-renderer": "^2.2.0",
+    "vue-bundle-renderer": "^2.3.1",
     "vue-devtools-stub": "^0.1.0"
   },
   "peerDependencies": {
     "@babel/plugin-proposal-decorators": "^7.25.0",
     "@babel/plugin-syntax-typescript": "^7.25.0",
     "@rollup/plugin-babel": "^6.0.0 || ^7.0.0",
-    "nuxt": "npm:nuxt-nightly@4.5.0-29703714.2f094acc"
+    "nuxt": "npm:nuxt-nightly@4.5.0-29705236.f2ca6ea5"
   },
   "peerDependenciesMeta": {
     "@babel/plugin-proposal-decorators": {
@@ -74,9 +74,9 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "7.29.7",
     "@babel/plugin-syntax-typescript": "7.29.7",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.5.0-29703714.2f094acc",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.5.0-29705236.f2ca6ea5",
     "@rollup/plugin-babel": "7.1.0",
-    "nuxt": "npm:nuxt-nightly@4.5.0-29703714.2f094acc",
+    "nuxt": "npm:nuxt-nightly@4.5.0-29705236.f2ca6ea5",
     "obuild": "0.4.36",
     "vitest": "4.1.8"
   },