@timber-js/app 0.2.0-alpha.163 → 0.2.0-alpha.164

package/dist/index.js

@@ -2,23 +2,26 @@ import { a as __esmMin, o as __exportAll, s as __toCommonJS } from "./_chunks/di
 import { c as isDynamicMetadataExtension, l as isMetadataRouteServePath, r as canonicalize } from "./_chunks/canonicalize-P41GR6tY.js";
 import { t as matchUrlParts } from "./_chunks/tree-match-D2l830j2.js";
 import { h as swallow } from "./_chunks/logger-B_O6-mdJ.js";
-import { i as scanRoutes } from "./_chunks/cli-schema-sync-NfLbLnDw.js";
-import { a as generateRouteMap, c as fileHasDirective, d as getPrerenderExport, i as validateSchemaAgainstRoutes, l as fileHasExport, n as collectInterceptionRewrites, o as fileHasAnyExport, s as fileHasDefaultExport, t as collectLeafRoutes, u as fileHasStarExport } from "./_chunks/walkers-9mz9T7mb.js";
-import { a as resolveAppDir, c as createNoopTimer, n as loadTimberConfigFile, o as resolveBuildDir, r as mergeFileConfig, s as resolveClientJavascript, t as createPluginContext } from "./_chunks/plugin-context-DeAxFRMq.js";
+import { i as scanRoutes } from "./_chunks/cli-schema-sync-mGfRbjh2.js";
+import { a as generateRouteMap, c as fileHasDirective, d as getPrerenderExport, i as validateSchemaAgainstRoutes, l as fileHasExport, n as collectInterceptionRewrites, o as fileHasAnyExport, s as fileHasDefaultExport, t as collectLeafRoutes, u as fileHasStarExport } from "./_chunks/walkers-BL3MCMgO.js";
+import { a as resolveAppDir, c as createNoopTimer, n as loadTimberConfigFile, o as resolveBuildDir, r as mergeFileConfig, s as resolveClientJavascript, t as createPluginContext } from "./_chunks/plugin-context-BnaiU_cF.js";
 import { t as fnv1aHash } from "./_chunks/fast-hash-D6hIVt1Y.js";
 import { t as formatSize } from "./_chunks/format-CfwjgPz9.js";
 import { basename, dirname, extname, join, normalize, relative, resolve, win32 } from "node:path";
 import { builtinModules, createRequire } from "node:module";
 import react, { reactCompilerPreset } from "@vitejs/plugin-react";
 import { existsSync, readFileSync, statSync } from "node:fs";
+import nodeHTTP from "node:http";
+import { Readable, pipeline } from "node:stream";
+import { pipeline as pipeline$1 } from "node:stream/promises";
+import "node:https";
+import "node:http2";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { styleText } from "node:util";
 import { constants, createGzip, gzipSync } from "node:zlib";
-import { Readable, pipeline } from "node:stream";
 import { copyFile, mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { parseAst } from "vite";
-import http from "node:http";
 //#region src/plugins/content.ts
 var CONFIG_FILE_NAMES$1 = [
 	"content-collections.ts",
@@ -104,6 +107,98 @@ function timberContent(ctx) {
 	};
 }
 //#endregion
+//#region ../../node_modules/.pnpm/srvx@0.11.17/node_modules/srvx/dist/adapters/node.mjs
+async function sendNodeResponse(nodeRes, webRes) {
+	if (!webRes) {
+		nodeRes.statusCode = 500;
+		return endNodeResponse(nodeRes);
+	}
+	if (webRes._toNodeResponse) {
+		const res = webRes._toNodeResponse();
+		if (res.body) {
+			if (res.body instanceof ReadableStream) {
+				writeHead(nodeRes, res.status, res.statusText, res.headers);
+				return streamBody(res.body, nodeRes);
+			} else if (typeof res.body?.pipe === "function") return pipeBody(res.body, nodeRes, res.status, res.statusText, res.headers);
+			writeHead(nodeRes, res.status, res.statusText, res.headers);
+			nodeRes.write(res.body);
+		} else writeHead(nodeRes, res.status, res.statusText, res.headers);
+		return endNodeResponse(nodeRes);
+	}
+	const rawHeaders = [...webRes.headers];
+	writeHead(nodeRes, webRes.status, webRes.statusText, rawHeaders);
+	return webRes.body ? streamBody(webRes.body, nodeRes) : endNodeResponse(nodeRes);
+}
+function writeHead(nodeRes, status, statusText, rawHeaders) {
+	const writeHeaders = rawHeaders.flat();
+	if (!nodeRes.headersSent) if (nodeRes.req?.httpVersion === "2.0") nodeRes.writeHead(status, writeHeaders);
+	else nodeRes.writeHead(status, statusText, writeHeaders);
+}
+function endNodeResponse(nodeRes) {
+	return new Promise((resolve) => nodeRes.end(resolve));
+}
+function pipeBody(stream, nodeRes, status, statusText, headers) {
+	if (nodeRes.destroyed) {
+		stream.destroy?.();
+		return;
+	}
+	if (typeof stream.on !== "function" || typeof stream.destroy !== "function") {
+		writeHead(nodeRes, status, statusText, headers);
+		stream.pipe(nodeRes);
+		return new Promise((resolve) => nodeRes.on("close", resolve));
+	}
+	if (stream.destroyed) {
+		writeHead(nodeRes, 500, "Internal Server Error", []);
+		return endNodeResponse(nodeRes);
+	}
+	return new Promise((resolve) => {
+		function onEarlyError() {
+			stream.off("readable", onReadable);
+			stream.destroy();
+			writeHead(nodeRes, 500, "Internal Server Error", []);
+			endNodeResponse(nodeRes).then(resolve);
+		}
+		function onReadable() {
+			stream.off("error", onEarlyError);
+			if (nodeRes.destroyed) {
+				stream.destroy();
+				return resolve();
+			}
+			writeHead(nodeRes, status, statusText, headers);
+			pipeline$1(stream, nodeRes).catch(() => {}).then(() => resolve());
+		}
+		stream.once("error", onEarlyError);
+		stream.once("readable", onReadable);
+	});
+}
+function streamBody(stream, nodeRes) {
+	if (nodeRes.destroyed) {
+		stream.cancel();
+		return;
+	}
+	const reader = stream.getReader();
+	function streamCancel(error) {
+		reader.cancel(error).catch(() => {});
+		if (error) nodeRes.destroy(error);
+	}
+	function streamHandle({ done, value }) {
+		try {
+			if (done) nodeRes.end();
+			else if (nodeRes.write(value)) reader.read().then(streamHandle, streamCancel);
+			else nodeRes.once("drain", () => reader.read().then(streamHandle, streamCancel));
+		} catch (error) {
+			streamCancel(error instanceof Error ? error : void 0);
+		}
+	}
+	nodeRes.on("close", streamCancel);
+	nodeRes.on("error", streamCancel);
+	reader.read().then(streamHandle, streamCancel);
+	return reader.closed.catch(streamCancel).finally(() => {
+		nodeRes.off("close", streamCancel);
+		nodeRes.off("error", streamCancel);
+	});
+}
+//#endregion
 //#region src/dev-tools/stack-classifier.ts
 /** Parse file/line/col from a stack frame line. */
 function parseFrame(frameLine) {
@@ -1500,7 +1595,10 @@ function createTimberMiddleware(server, ctx) {
 		try {
 			const webRequest = toWebRequest(req);
 			const wrapper = server[Symbol.for("timber:dev-request-wrapper")];
-			await sendWebResponse(res, compressResponse(webRequest, wrapper ? await wrapper(() => handler(webRequest)) : await handler(webRequest)));
+			const finalResponse = compressResponse(webRequest, wrapper ? await wrapper(() => handler(webRequest)) : await handler(webRequest));
+			res.writeHead(finalResponse.status, [...finalResponse.headers].flat());
+			res.flushHeaders();
+			await sendNodeResponse(res, finalResponse);
 		} catch (error) {
 			if (error instanceof Error) {
 				const displayError = error.name === "SsrStreamError" && error.cause instanceof Error ? error.cause : error;
@@ -1596,44 +1694,6 @@ function nodeReadableToWebStream(nodeStream) {
 	} });
 }
 /**
-* Write a Web Response to a Node ServerResponse.
-*
-* Copies status code, headers, and streams the body.
-*/
-async function sendWebResponse(nodeRes, webResponse) {
-	nodeRes.statusCode = webResponse.status;
-	webResponse.headers.forEach((value, key) => {
-		if (key.toLowerCase() !== "set-cookie") nodeRes.setHeader(key, value);
-	});
-	const setCookies = webResponse.headers.getSetCookie();
-	if (setCookies.length > 0) nodeRes.setHeader("Set-Cookie", setCookies);
-	if (!webResponse.body) {
-		nodeRes.end();
-		return;
-	}
-	nodeRes.flushHeaders();
-	const reader = webResponse.body.getReader();
-	let clientDisconnected = false;
-	const onClose = () => {
-		clientDisconnected = true;
-		reader.cancel("Client disconnected").catch(() => {});
-	};
-	nodeRes.on("close", onClose);
-	try {
-		while (true) {
-			const { done, value } = await reader.read();
-			if (done) break;
-			nodeRes.write(value);
-		}
-	} catch (err) {
-		if (!clientDisconnected) throw err;
-	} finally {
-		nodeRes.off("close", onClose);
-		reader.releaseLock();
-		if (!nodeRes.writableEnded) nodeRes.end();
-	}
-}
-/**
 * Check if a URL is a Vite-internal request that should be passed through.
 */
 function isViteInternal(url) {
@@ -6521,6 +6581,7 @@ function patchConsole(server, projectRoot) {
 		console[level] = (...args) => {
 			originals.get(level)(...args);
 			if (isFrameworkInternalCaller()) return;
+			if (typeof args[0] === "string" && args[0].includes("[console.")) return;
 			try {
 				const payload = {
 					level,
@@ -6748,13 +6809,39 @@ function findAppBoundary(path, appPrefix) {
 	};
 }
 /**
+* Check if a string is a bare import specifier (package name, not a path).
+* Bare specifiers don't start with `.`, `/`, or contain `:/`.
+*/
+function isBareSpecifier(id) {
+	return !id.startsWith(".") && !id.startsWith("/") && !id.includes(":/");
+}
+/**
+* Look up facade ancestors for a module ID, handling bare package specifiers.
+*
+* The facade ancestry map is keyed by absolute resolved paths (from Rollup's
+* moduleIds), but the RSC plugin passes bare package names (e.g. 'streamdown')
+* as meta.id for npm package client references (TIM-1108). When a direct
+* lookup misses and the id is a bare specifier, scan map keys for a matching
+* node_modules path.
+*/
+function lookupFacades(id, sharedModuleFacades) {
+	const direct = sharedModuleFacades.get(id);
+	if (direct) return direct;
+	if (!isBareSpecifier(id)) return void 0;
+	const needle = `/node_modules/${id}/`;
+	let merged;
+	for (const [key, facades] of sharedModuleFacades) if (key.includes(needle)) if (!merged) merged = [...facades];
+	else merged.push(...facades);
+	return merged;
+}
+/**
 * For a `shared:` client reference, check the facade ancestry map to
 * see if all consuming facades belong to the same route boundary.
 * Returns the boundary segment name, or null if the module is
 * genuinely shared across multiple boundaries.
 */
 function reclassifySharedModule(meta, appPrefix, root, sharedModuleFacades) {
-	const facades = sharedModuleFacades.get(meta.id);
+	const facades = lookupFacades(meta.id, sharedModuleFacades);
 	if (!facades || facades.length === 0) return null;
 	const boundaries = /* @__PURE__ */ new Set();
 	for (const facade of facades) {
@@ -7316,7 +7403,7 @@ function timberCacheTransform(ctx) {
 			if (id.includes("node_modules")) return;
 			let program;
 			try {
-				program = parseAst(code, { lang: "tsx" });
+				program = ctx.parseCached.parse(code);
 			} catch {
 				return;
 			}
@@ -7510,6 +7597,122 @@ function recordCallSiteProps(ctx, componentId, props) {
 	}
 }
 //#endregion
+//#region src/plugins/prebuilt-options-analysis.ts
+var EXPRESSION_WRAPPER_TYPES = /* @__PURE__ */ new Set([
+	"TSAsExpression",
+	"TSSatisfiesExpression",
+	"TSNonNullExpression",
+	"ParenthesizedExpression"
+]);
+/** Unwrap TS expression wrappers (`as`, `satisfies`, `!`, parens). */
+function unwrapExpression(node) {
+	let current = node;
+	while (EXPRESSION_WRAPPER_TYPES.has(current.type) && current.expression) current = current.expression;
+	return current;
+}
+/**
+* Statically classify a `slots` value node against resolveSlotNames'
+* runtime rules (server/prebuilt/slots.ts):
+*
+* - `yes` — certainly an ACTIVE shape: dense, non-empty array literal of
+*   non-empty string literals.
+* - `no` — certainly NOT active (absent/empty/malformed): registration
+*   falls back to non-slot semantics with `prerender` preserved.
+* - `unknown` — identifiers, spreads, holes, non-literal elements.
+*/
+function classifySlotsValue(node) {
+	const value = unwrapExpression(node);
+	if (value.type === "ArrayExpression") {
+		const elements = value.elements ?? [];
+		if (elements.length === 0) return "no";
+		let allValidStrings = true;
+		for (const el of elements) {
+			if (el === null) return "no";
+			if (el.type === "SpreadElement") return "unknown";
+			const entry = unwrapExpression(el);
+			if (entry.type !== "Literal") {
+				allValidStrings = false;
+				continue;
+			}
+			if (typeof entry.value !== "string" || entry.value.length === 0) return "no";
+		}
+		return allValidStrings ? "yes" : "unknown";
+	}
+	if (value.type === "Literal") return "no";
+	if (value.type === "Identifier" && value.name === "undefined") return "no";
+	return "unknown";
+}
+/** Statically classify whether a `ttl` value gives a runtime lifetime (`ttl !== undefined`). */
+function classifyTtlValue(node) {
+	const value = unwrapExpression(node);
+	if (value.type === "Literal") return "yes";
+	if (value.type === "Identifier" && value.name === "undefined") return "no";
+	return "unknown";
+}
+/** Statically classify whether a `tags` value gives a runtime lifetime (`tags != null`). */
+function classifyTagsValue(node) {
+	const value = unwrapExpression(node);
+	if (value.type === "ArrayExpression") return "yes";
+	if (value.type === "ArrowFunctionExpression" || value.type === "FunctionExpression") return "yes";
+	if (value.type === "Literal") return value.value === null ? "no" : "yes";
+	if (value.type === "Identifier" && value.name === "undefined") return "no";
+	return "unknown";
+}
+/**
+* Can this call site's options put the component in the prerender tier?
+* The answer is static only when the options argument is an object
+* literal:
+*
+*   - literal with `prerender: true`            → yes
+*   - literal with `prerender: false`/absent    → no  (spread-free)
+*   - literal with statically ACTIVE `slots` + certain runtime lifetime
+*     → no — registration strips `prerender` for active slot components
+*       (TIM-1173), so attributing the callsite would make the post-build
+*       hook import the RSC entry and enumerate route params for entries
+*       the capture pass then skips (codex P2 on PR #890)
+*   - anything else (identifier, spread, non-literal values)
+*     → conservatively yes — the capture pass re-checks at runtime
+*
+* Properties walk in source order with last-write-wins, mirroring
+* object-literal evaluation: `{ prerender: false, ...opts }` may end up
+* prerenderable (the spread can override), while `{ ...opts,
+* prerender: false }` is statically false (codex P2 on PR #836).
+* Computed keys are treated like spreads — they may evaluate to any of
+* the tracked names.
+*/
+function mayPrerender(call) {
+	if (call.arguments.length < 2) return false;
+	const options = unwrapExpression(call.arguments[1]);
+	if (options.type !== "ObjectExpression") return true;
+	const properties = options.properties ?? [];
+	let verdict = "absent";
+	let slotsActive = "no";
+	let ttl = "no";
+	let tags = "no";
+	for (const prop of properties) {
+		if (prop.type === "SpreadElement" || prop.computed) {
+			verdict = "unknown";
+			slotsActive = "unknown";
+			ttl = "unknown";
+			tags = "unknown";
+			continue;
+		}
+		if (prop.type !== "Property") continue;
+		const property = prop;
+		const keyName = property.key.type === "Identifier" ? property.key.name : property.key.type === "Literal" ? String(property.key.value) : void 0;
+		if (keyName === "prerender") {
+			const value = unwrapExpression(property.value);
+			if (value.type === "Literal") verdict = value.value === true ? "true" : "false";
+			else verdict = "unknown";
+		} else if (keyName === "slots") slotsActive = classifySlotsValue(property.value);
+		else if (keyName === "ttl") ttl = classifyTtlValue(property.value);
+		else if (keyName === "tags") tags = classifyTagsValue(property.value);
+	}
+	if (verdict !== "true" && verdict !== "unknown") return false;
+	if (slotsActive === "yes" && (ttl === "yes" || tags === "yes")) return false;
+	return true;
+}
+//#endregion
 //#region src/plugins/prebuilt-capture.ts
 /**
 * Post-build prebuilt capture — Node-side orchestration (TIM-1119).
@@ -7735,59 +7938,6 @@ function importInsertionOffset(program) {
 	for (const stmt of program.body) if (!(stmt.type === "ExpressionStatement" && typeof stmt.directive === "string")) return stmt.start;
 	return program.body.length > 0 ? program.body[program.body.length - 1].end : 0;
 }
-/** TS/paren wrappers that may sit between a declarator and the call. */
-var EXPRESSION_WRAPPER_TYPES = /* @__PURE__ */ new Set([
-	"TSAsExpression",
-	"TSSatisfiesExpression",
-	"TSNonNullExpression",
-	"ParenthesizedExpression"
-]);
-function unwrapExpression(node) {
-	let current = node;
-	while (EXPRESSION_WRAPPER_TYPES.has(current.type) && current.expression) current = current.expression;
-	return current;
-}
-/**
-* Can this call site's options put the component in the prerender tier?
-*
-* Runtime-tier call sites (`ttl`/`tags` without `prerender`) must do NO
-* build work — recording them would make the post-build hook import the
-* built RSC entry (running production startup) and load route modules for
-* routes that have nothing to prerender (codex P2 on PR #836). The answer
-* is static only when the options argument is an object literal:
-*
-*   - literal with `prerender: true`            → yes
-*   - literal with `prerender: false`/absent    → no  (spread-free)
-*   - anything else (identifier, spread, non-literal `prerender` value)
-*     → conservatively yes — the capture pass re-checks the real options
-*       at runtime and skips non-prerender registrations; over-inclusion
-*       costs a wasted entry load, under-inclusion would silently skip
-*       prerendering.
-*/
-function mayPrerender(call) {
-	if (call.arguments.length < 2) return false;
-	const options = unwrapExpression(call.arguments[1]);
-	if (options.type !== "ObjectExpression") return true;
-	const properties = options.properties ?? [];
-	let verdict = "absent";
-	for (const prop of properties) {
-		if (prop.type === "SpreadElement") {
-			verdict = "unknown";
-			continue;
-		}
-		if (prop.type !== "Property") continue;
-		const property = prop;
-		if (property.computed) {
-			verdict = "unknown";
-			continue;
-		}
-		if ((property.key.type === "Identifier" ? property.key.name : property.key.type === "Literal" ? String(property.key.value) : void 0) !== "prerender") continue;
-		const value = unwrapExpression(property.value);
-		if (value.type === "Literal") verdict = value.value === true ? "true" : "false";
-		else verdict = "unknown";
-	}
-	return verdict === "true" || verdict === "unknown";
-}
 /**
 * Collect matching call sites from the allowlisted module-scope positions:
 * top-level (possibly exported) variable declarator initializers and
@@ -7874,13 +8024,8 @@ function collectPageAndLayoutFiles(root) {
 	walk(root);
 	return files;
 }
-/**
-* For a route file (page/layout), check if it imports from any prebuilt-
-* declaring module and extract JSX call-site props for those bindings.
-* Uses `getModuleInfo` to get the RESOLVED import targets and the module's
-* transformed code (available on Rollup's ModuleInfo at generateBundle).
-*/
-function collectCrossModuleProps(ctx, moduleId, getInfo) {
+var DEFAULT_SENTINEL = "\0default";
+async function collectCrossModuleProps(ctx, moduleId, getInfo, resolve) {
 	const bindingNames = ctx.prebuiltBindingNames;
 	const info = getInfo(moduleId);
 	if (!info) return;
@@ -7891,6 +8036,7 @@ function collectCrossModuleProps(ctx, moduleId, getInfo) {
 	for (const declId of declaringImports) {
 		const map = bindingNames.get(declId);
 		for (const [name, compId] of map) {
+			if (name === DEFAULT_SENTINEL) continue;
 			if (exportNameToId.has(name)) collisions.add(name);
 			exportNameToId.set(name, compId);
 		}
@@ -7907,24 +8053,32 @@ function collectCrossModuleProps(ctx, moduleId, getInfo) {
 	if (!source) return;
 	let program;
 	try {
-		program = parseAst(source, { lang: "tsx" });
+		program = ctx.parseCached.parse(source);
 	} catch {
 		return;
 	}
+	const declaringSet = new Set(declaringImports);
 	const localToComponentId = /* @__PURE__ */ new Map();
 	for (const stmt of program.body) {
 		if (stmt.type !== "ImportDeclaration") continue;
 		const importDecl = stmt;
 		for (const spec of importDecl.specifiers) if (spec.type === "ImportSpecifier") {
 			const exportedName = spec.imported?.name ?? spec.local.name;
-			const compId = exportNameToId.get(exportedName);
-			if (compId) localToComponentId.set(spec.local.name, compId);
+			if (exportedName === "default") {
+				const resolvedId = await resolve(importDecl.source.value, moduleId);
+				if (resolvedId && declaringSet.has(resolvedId)) {
+					const compId = bindingNames.get(resolvedId).get(DEFAULT_SENTINEL);
+					if (compId) localToComponentId.set(spec.local.name, compId);
+				}
+			} else {
+				const compId = exportNameToId.get(exportedName);
+				if (compId) localToComponentId.set(spec.local.name, compId);
+			}
 		} else if (spec.type === "ImportDefaultSpecifier") {
-			const compId = exportNameToId.get("Component") ?? exportNameToId.get("default");
-			if (compId) localToComponentId.set(spec.local.name, compId);
-			else if (exportNameToId.size === 1) {
-				const [, soleId] = [...exportNameToId.entries()][0];
-				localToComponentId.set(spec.local.name, soleId);
+			const resolvedId = await resolve(importDecl.source.value, moduleId);
+			if (resolvedId && declaringSet.has(resolvedId)) {
+				const compId = bindingNames.get(resolvedId).get(DEFAULT_SENTINEL);
+				if (compId) localToComponentId.set(spec.local.name, compId);
 			}
 		}
 	}
@@ -7949,7 +8103,7 @@ function timberPrebuilt(ctx) {
 			if (this?.environment?.name === "client") return;
 			let program;
 			try {
-				program = parseAst(code, { lang: "tsx" });
+				program = ctx.parseCached.parse(code);
 			} catch {
 				return;
 			}
@@ -7978,16 +8132,28 @@ function timberPrebuilt(ctx) {
 				ctx.prebuiltModuleComponents.set(id, componentIds);
 				const bindingMap = /* @__PURE__ */ new Map();
 				let componentIdIdx = 0;
-				for (const { call, displayName } of callSites) if (!ctx.dev && mayPrerender(call)) bindingMap.set(displayName, componentIds[componentIdIdx++]);
-				for (const stmt of program.body) if (stmt.type === "ExportDefaultDeclaration" && stmt.declaration && stmt.declaration.type === "Identifier") {
-					const name = stmt.declaration.name;
-					if (bindingMap.has(name) && !bindingMap.has("default")) bindingMap.set("default", bindingMap.get(name));
+				for (const { call, stmt, displayName } of callSites) if (!ctx.dev && mayPrerender(call)) {
+					const compId = componentIds[componentIdIdx++];
+					if (stmt.type === "ExportDefaultDeclaration") bindingMap.set(DEFAULT_SENTINEL, compId);
+					else bindingMap.set(displayName, compId);
+				}
+				for (const stmt of program.body) {
+					if (stmt.type === "ExportDefaultDeclaration" && stmt.declaration && stmt.declaration.type === "Identifier") {
+						const name = stmt.declaration.name;
+						if (bindingMap.has(name) && !bindingMap.has(DEFAULT_SENTINEL)) bindingMap.set(DEFAULT_SENTINEL, bindingMap.get(name));
+					}
+					if (stmt.type === "ExportNamedDeclaration" && Array.isArray(stmt.specifiers)) {
+						for (const spec of stmt.specifiers) if (spec.exported.name === "default") {
+							const compId = bindingMap.get(spec.local.name);
+							if (compId && !bindingMap.has(DEFAULT_SENTINEL)) bindingMap.set(DEFAULT_SENTINEL, compId);
+						}
+					}
 				}
 				if (bindingMap.size > 0) {
 					ctx.prebuiltBindingNames ??= /* @__PURE__ */ new Map();
 					ctx.prebuiltBindingNames.set(id, bindingMap);
 				}
-				const declaredBindings = new Set(bindingMap.keys());
+				const declaredBindings = new Set([...bindingMap.keys()].filter((k) => k !== DEFAULT_SENTINEL));
 				if (declaredBindings.size > 0) {
 					const usages = collectJsxUsages(program, declaredBindings);
 					for (const [bindingName, propsList] of usages) {
@@ -8013,7 +8179,7 @@ function timberPrebuilt(ctx) {
 		* SHARED components work — a component imported by several routes is
 		* captured under every importing route's param combos.
 		*/
-		generateBundle(_options, bundle) {
+		async generateBundle(_options, bundle) {
 			if (ctx.dev) return;
 			if (this?.environment?.name !== "rsc") return;
 			ctx.routePrebuiltComponents = void 0;
@@ -8021,6 +8187,9 @@ function timberPrebuilt(ctx) {
 			if (!moduleComponents || moduleComponents.size === 0 || !ctx.routeTree) return;
 			const self = this;
 			const getInfo = (id) => self.getModuleInfo?.(id) ?? null;
+			const resolveFn = async (source, importer) => {
+				return (await self.resolve?.(source, importer))?.id ?? null;
+			};
 			const routeComponents = /* @__PURE__ */ new Map();
 			for (const filePath of collectPageAndLayoutFiles(ctx.routeTree.root)) {
 				const ids = collectReachablePrebuiltComponents(filePath, moduleComponents, getInfo);
@@ -8054,7 +8223,7 @@ function timberPrebuilt(ctx) {
 							visited.add(modId);
 							if (!scannedModules.has(modId)) {
 								scannedModules.add(modId);
-								collectCrossModuleProps(ctx, modId, getInfo);
+								await collectCrossModuleProps(ctx, modId, getInfo, resolveFn);
 							}
 							const modInfo = getInfo(modId);
 							if (!modInfo) continue;
@@ -8225,7 +8394,7 @@ function timberPrerenderSugar(ctx) {
 			if (!value) return;
 			let program;
 			try {
-				program = parseAst(code, { lang: "tsx" });
+				program = ctx.parseCached.parse(code);
 			} catch {
 				return;
 			}
@@ -9043,7 +9212,7 @@ var HOLDING_PAGE_HTML = [
 * ```
 */
 function createHoldingServer() {
-	const server = http.createServer((req, res) => {
+	const server = nodeHTTP.createServer((req, res) => {
 		const accept = req.headers.accept ?? "";
 		if (accept.includes("application/json") && !accept.includes("text/html")) {
 			res.writeHead(503, {