@timber-js/app 0.2.0-alpha.194 → 0.2.0-alpha.195

package/dist/index.js

@@ -7,7 +7,7 @@ import { t as MDX_EXTENSIONS } from "./_chunks/mdx-file-CXyHGUpS.js";
 import { h as swallow } from "./_chunks/logger-pumCm3Il.js";
 import { c as writeRouteCodegen, i as getPrerenderExport, l as buildDirToRouteMap, n as formatConventionWarnings, r as lintConventions, s as flushCodegenWrites, t as checkAppDirExists } from "./_chunks/convention-lint-DO10_pVl.js";
 import { c as resolveClientJavascript, i as mergeFileConfig, l as createNoopTimer, o as resolveAppDir, r as loadTimberConfigFile, s as resolveBuildDir, t as createPluginContext } from "./_chunks/plugin-context-8idfR3UZ.js";
-import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-uCu3WW6_.js";
+import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-BU6z9xRV.js";
 import { i as poisonPillSource, r as markerFor, t as EXPLICIT_MARKERS } from "./_chunks/poison-rules-DoEhbqaY.js";
 import { i as withBasePath, n as normalizeBasePath, t as isRelativeBase } from "./_chunks/base-path-DaQrzbez.js";
 import { t as rscPayloadPath } from "./_chunks/rsc-payload-path-B_LBodc2.js";
@@ -18,7 +18,7 @@ import { t as formatSize } from "./_chunks/format-BKclgVbk.js";
 import { createLogger, normalizePath, parseAst } from "vite";
 import { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve, win32 } from "node:path";
 import { builtinModules, createRequire } from "node:module";
-import react, { reactCompilerPreset } from "@vitejs/plugin-react";
+import react from "@vitejs/plugin-react";
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
 import nodeHTTP from "node:http";
 import { Readable, pipeline } from "node:stream";
@@ -117,7 +117,7 @@ function timberContent(ctx) {
 	};
 }
 //#endregion
-//#region ../../node_modules/.pnpm/srvx@0.12.5/node_modules/srvx/dist/adapters/node.mjs
+//#region ../../node_modules/.pnpm/srvx@0.12.7/node_modules/srvx/dist/adapters/node.mjs
 function sendNodeResponse(nodeRes, webRes) {
 	try {
 		return _sendNodeResponse(nodeRes, webRes, false) || Promise.resolve();
@@ -148,8 +148,14 @@ function _sendNodeResponse(nodeRes, webRes, detached) {
 	return webRes.body ? streamBody(webRes.body, nodeRes) : endNodeResponse(nodeRes, detached);
 }
 function writeHead(nodeRes, status, statusText, rawHeaders) {
-	if (!nodeRes.headersSent) if (nodeRes.req?.httpVersion === "2.0") nodeRes.writeHead(status, rawHeaders);
-	else nodeRes.writeHead(status, statusText, rawHeaders);
+	if (!nodeRes.headersSent) {
+		if (nodeRes.req?.httpVersion === "2.0") nodeRes.writeHead(status, rawHeaders);
+		else nodeRes.writeHead(status, safeStatusText(statusText), rawHeaders);
+	}
+}
+var INVALID_REASON_PHRASE_RE = /[^\t\u0020-\u007E\u0080-\u00FF]/g;
+function safeStatusText(statusText) {
+	return typeof statusText === "string" && statusText ? statusText.replace(INVALID_REASON_PHRASE_RE, "") : statusText;
 }
 function endNodeResponse(nodeRes, detached) {
 	if (detached) {
@@ -163,6 +169,12 @@ function pipeBody(stream, nodeRes, status, statusText, headers) {
 		stream.destroy?.();
 		return;
 	}
+	if (nodeRes.req?.method === "HEAD") {
+		if (typeof stream.destroy === "function") stream.destroy();
+		else stream.abort?.();
+		writeHead(nodeRes, status, statusText, headers);
+		return endNodeResponse(nodeRes);
+	}
 	if (typeof stream.on !== "function" || typeof stream.destroy !== "function") {
 		writeHead(nodeRes, status, statusText, headers);
 		stream.pipe(nodeRes);
@@ -173,14 +185,19 @@ function pipeBody(stream, nodeRes, status, statusText, headers) {
 		return endNodeResponse(nodeRes);
 	}
 	return new Promise((resolve) => {
-		function onEarlyError() {
+		function cleanup() {
+			stream.off("error", onEarlyError);
 			stream.off("readable", onReadable);
+			nodeRes.off("close", onResClose);
+		}
+		function onEarlyError() {
+			cleanup();
 			stream.destroy();
 			writeHead(nodeRes, 500, "Internal Server Error", []);
 			endNodeResponse(nodeRes).then(resolve);
 		}
 		function onReadable() {
-			stream.off("error", onEarlyError);
+			cleanup();
 			if (nodeRes.destroyed) {
 				stream.destroy();
 				return resolve();
@@ -188,8 +205,14 @@ function pipeBody(stream, nodeRes, status, statusText, headers) {
 			writeHead(nodeRes, status, statusText, headers);
 			pipeline$1(stream, nodeRes).catch(() => {}).then(() => resolve());
 		}
+		function onResClose() {
+			cleanup();
+			stream.destroy();
+			resolve();
+		}
 		stream.once("error", onEarlyError);
 		stream.once("readable", onReadable);
+		nodeRes.once("close", onResClose);
 	});
 }
 function streamBody(stream, nodeRes) {
@@ -4852,7 +4875,7 @@ function encode(decoded) {
 	return writer.flush();
 }
 //#endregion
-//#region ../../node_modules/.pnpm/magic-string@1.2.0/node_modules/magic-string/dist/index.mjs
+//#region ../../node_modules/.pnpm/magic-string@1.2.2/node_modules/magic-string/dist/index.mjs
 var BitSet = class BitSet {
 	constructor(arg) {
 		this.bits = arg instanceof BitSet ? arg.bits.slice() : [];
@@ -5257,6 +5280,10 @@ var MagicString = class MagicString {
 			offset: {
 				writable: true,
 				value: options.offset || 0
+			},
+			hasMovedChunks: {
+				writable: true,
+				value: false
 			}
 		});
 	}
@@ -5308,6 +5335,7 @@ var MagicString = class MagicString {
 	clone() {
 		const cloned = new MagicString(this.original, {
 			filename: this.filename,
+			ignoreList: this.ignoreList,
 			offset: this.offset
 		});
 		let originalChunk = this.firstChunk;
@@ -5327,8 +5355,10 @@ var MagicString = class MagicString {
 		cloned.lastChunk = clonedChunk;
 		if (this.indentExclusionRanges) cloned.indentExclusionRanges = this.indentExclusionRanges.slice();
 		cloned.sourcemapLocations = new BitSet(this.sourcemapLocations);
+		cloned.storedNames = { ...this.storedNames };
 		cloned.intro = this.intro;
 		cloned.outro = this.outro;
+		cloned.hasMovedChunks = this.hasMovedChunks;
 		return cloned;
 	}
 	/**
@@ -5489,6 +5519,13 @@ var MagicString = class MagicString {
 		this._split(index);
 		const first = this.byStart.get(start);
 		const last = this.byEnd.get(end);
+		if (this.hasMovedChunks) {
+			let cursor = first;
+			while (cursor !== last) {
+				cursor = cursor.next;
+				if (!cursor || cursor.start < start || cursor.end > end) throw new MagicStringError(`cannot move ${start} to ${end} because an earlier move split that range`);
+			}
+		}
 		const oldLeft = first.previous;
 		const oldRight = last.next;
 		const newRight = this.byStart.get(index);
@@ -5507,6 +5544,7 @@ var MagicString = class MagicString {
 		last.next = newRight || null;
 		if (!newLeft) this.firstChunk = first;
 		if (!newRight) this.lastChunk = last;
+		this.hasMovedChunks = true;
 		return this;
 	}
 	/**
@@ -5870,7 +5908,19 @@ var MagicString = class MagicString {
 	* Indicates if the string has been changed.
 	*/
 	hasChanged() {
-		return this.original !== this.toString();
+		if (this.intro || this.outro) return true;
+		let outputIndex = 0;
+		let chunk = this.firstChunk;
+		while (chunk) {
+			if (chunk.intro || chunk.outro) return true;
+			if (!chunk.edited && chunk.start === outputIndex) outputIndex = chunk.end;
+			else {
+				if (!this.original.startsWith(chunk.content, outputIndex)) return true;
+				outputIndex += chunk.content.length;
+			}
+			chunk = chunk.next;
+		}
+		return outputIndex !== this.original.length;
 	}
 	/** @internal */
 	_replaceRegexp(searchValue, replacement) {
@@ -11032,27 +11082,6 @@ function defineConfig(config) {
 	return config;
 }
 /**
-* Resolve the React Compiler plugin via @rolldown/plugin-babel.
-*
-* Uses the `reactCompilerPreset` from @vitejs/plugin-react, which:
-* - Uses Babel ONLY for the compiler pass (OXC handles JSX)
-* - Automatically scopes to client environment via applyToEnvironmentHook
-* - Uses react/compiler-runtime built into React 19
-*
-* @rolldown/plugin-babel and babel-plugin-react-compiler are optional peer deps.
-* If either is missing, require() fails with a clear error message.
-*/
-function resolveReactCompilerPlugin(config, req) {
-	let babel;
-	try {
-		babel = req("@rolldown/plugin-babel");
-	} catch {
-		throw new Error("[timber] reactCompiler requires @rolldown/plugin-babel. Install it: pnpm add -D @rolldown/plugin-babel babel-plugin-react-compiler");
-	}
-	const options = typeof config === "object" ? config : {};
-	return (babel.default ?? babel)({ presets: [reactCompilerPreset(options)] });
-}
-/**
 * Build the options object for @vitejs/plugin-rsc.
 *
 * Uses a getter for `enableActionEncryption` so the RSC plugin reads
@@ -11095,6 +11124,24 @@ function createRscOptions(ctx, encryptionKeyExpr) {
 * causing file-based config for reactCompiler, actionEncryption, and
 * output mode to be silently ignored. See TIM-451.
 */
+/**
+* Wrap plugin-react's `vite:react-compiler` configResolved so it always
+* sees `isProduction: true` during builds. The compiler plugin uses
+* `!config.isProduction` to decide whether to emit jsxDEV calls, but
+* Vite derives isProduction from process.env.NODE_ENV — which may be
+* "development" in the shell. Rather than mutating the env, we pass a
+* prototype-based view with the single property overridden.
+*/
+function patchReactCompilerForProdJsx(plugins) {
+	for (const p of plugins) if (p && typeof p === "object" && "name" in p && p.name === "vite:react-compiler") {
+		const orig = p.configResolved;
+		if (typeof orig === "function") p.configResolved = function(config) {
+			const view = config.command === "build" && !config.isProduction ? Object.create(config, { isProduction: { value: true } }) : config;
+			return orig.call(this, view);
+		};
+	}
+	return plugins;
+}
 function timber(config) {
 	const ctx = createPluginContext(config);
 	const consumerRequire = createRequire(join(process.cwd(), "package.json"));
@@ -11216,15 +11263,12 @@ function timber(config) {
 			if (peerWarning) process.stderr.write(`${peerWarning}\n\n`);
 		}
 	};
-	const reactCompilerPlugins = [];
-	const effectiveReactCompiler = config?.reactCompiler ?? earlyFileConfig?.reactCompiler;
-	if (effectiveReactCompiler) reactCompilerPlugins.push(resolveReactCompilerPlugin(effectiveReactCompiler, consumerRequire));
+	const effectiveReactCompiler = config?.reactCompiler ?? earlyFileConfig?.reactCompiler ?? true;
 	// @vitejs/plugin-rsc handles:
 	return [
 		rootSync,
 		timberReactProd(),
-		react(),
-		...reactCompilerPlugins,
+		...patchReactCompilerForProdJsx(react({ compiler: effectiveReactCompiler || false })),
 		vitePluginRsc(createRscOptions(ctx, encryptionKeyExpr)),
 		timberShims(ctx),
 		timberRouting(ctx),