@timber-js/app 0.2.0-alpha.196 → 0.2.0-alpha.198

package/dist/dev-tools/holding-server.d.ts

@@ -13,8 +13,10 @@
  *
  * The holding server is started in rootSync's config() hook (the
  * earliest Vite plugin lifecycle point where we know the port) and
- * closed in timber-dev-server's configureServer() hook (the last
- * plugin, right before Vite calls server.listen()).
+ * closed directly in timber-dev-server's configureServer() hook
+ * (the last plugin, fire-and-forget). configureServer runs during
+ * createServer(), well before Vite's port probe and bind, so the
+ * port is free by the time httpServerStart() runs. (TIM-1419)
  *
  * Browser requests (Accept: text/html) get the HTML holding page.
  * API requests (Accept: application/json) get a 503 JSON response.
@@ -24,10 +26,12 @@
  */
 export interface HoldingServer {
     /**
-     * Start listening on the given port.
+     * Start listening on the given port and host.
+     * The host must match Vite's resolved `server.host` so the probe
+     * faithfully detects conflicts on the same address Vite will bind.
      * Returns the actual bound port (useful when port is 0 for OS assignment).
      */
-    listen(port: number): Promise<number>;
+    listen(port: number, host?: string): Promise<number>;
     /** Gracefully close the server and stop accepting connections. */
     close(): Promise<void>;
 }
@@ -42,12 +46,13 @@ export interface HoldingServer {
  * const holding = createHoldingServer();
  * await bindWithBump((p) => holding.listen(p), { startPort: 3000, autoBump: true });
  *
- * // In last plugin's configureServer() — wrap listen for seamless handoff
- * const originalListen = server.listen.bind(server);
- * server.listen = async (...args) => {
- *   await holding.close();
- *   return originalListen(...args);
- * };
+ * // In last plugin's configureServer() — close directly so Vite 8's
+ * // isPortAvailable() probe and httpServer.listen() both see a free
+ * // port. SO_REUSEADDR allows immediate rebind. (TIM-1419)
+ * if (ctx.holdingServer) {
+ *   ctx.holdingServer.close().catch(() => {});
+ *   ctx.holdingServer = null;
+ * }
  * ```
  */
 export declare function createHoldingServer(): HoldingServer;

package/dist/dev-tools/holding-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"holding-server.d.ts","sourceRoot":"","sources":["../../src/dev-tools/holding-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEtC,kEAAkE;IAClE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AA8ED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,mBAAmB,IAAI,aAAa,CAmDnD"}
+{"version":3,"file":"holding-server.d.ts","sourceRoot":"","sources":["../../src/dev-tools/holding-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAMH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAErD,kEAAkE;IAClE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AA8ED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,IAAI,aAAa,CAyDnD"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AAyCjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAa1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAQ1D,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAElG;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,MAAM;CAAG;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAEvE;AAyGD,wBAAgB,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,YAAY,EAAE,CAsXhE;eAEc,MAAM"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AAyCjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAa1D,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAQ1D,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAElG;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,MAAM;CAAG;AAE1B;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAEvE;AAyGD,wBAAgB,MAAM,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,YAAY,EAAE,CAqYhE;eAEc,MAAM"}

package/dist/index.js

@@ -2,17 +2,17 @@ import { l as registerDevDiscovery } from "./_chunks/graph-cache-CP4GEmf9.js";
 import { n as isScannableSourceFile, t as buildSourceExtensions } from "./_chunks/scan-BoP17W3w.js";
 import { t as RSC_CONTENT_TYPE } from "./_chunks/rsc-media-type-DDc7duTD.js";
 import { a as canonicalize, d as isMetadataRouteServePath, u as isDynamicMetadataExtension } from "./_chunks/segment-keys-BhqoHiLc.js";
-import { i as matchUrlParts, n as scanRoutes, r as collectInterceptionRewrites } from "./_chunks/scanner-BRIOmHE2.js";
+import { i as matchUrlParts, n as scanRoutes, r as collectInterceptionRewrites } from "./_chunks/scanner-tdFPvDYi.js";
 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 { h as swallow } from "./_chunks/logger-DDirEsn7.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-Ph6luW4c.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-BU6z9xRV.js";
+import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-DNX05dC0.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 EMPTY_BUILD_MANIFEST } from "./_chunks/build-manifest-DTmSGLRz.js";
 import { t as rscPayloadPath } from "./_chunks/rsc-payload-path-B_LBodc2.js";
 import { a as REDIRECTS_FILE, n as detectFsIdentity, o as RESERVED_OUTPUT_PATHS, r as fsKey, t as EXACT_FS_IDENTITY } from "./_chunks/fs-identity-D7vb6GdI.js";
-import { t as EMPTY_BUILD_MANIFEST } from "./_chunks/build-manifest-DWppEdLB.js";
 import { t as fnv1aHash } from "./_chunks/fast-hash-C-tVYrLb.js";
 import { t as formatSize } from "./_chunks/format-BKclgVbk.js";
 import { createLogger, normalizePath, parseAst } from "vite";
@@ -1193,6 +1193,7 @@ var knownKeys = new Set(Object.keys({
 	reactCompiler: true,
 	sitemap: true,
 	buildDir: true,
+	cache: true,
 	clientSegmentCache: true,
 	topLoader: true,
 	budget: true
@@ -1296,6 +1297,14 @@ function validateConfig(config) {
 			suggestion: "Example: budget: { firstLoadJs: 150_000 } for a ~150 kB limit."
 		});
 	}
+	if (config.cache != null && typeof config.cache === "object") {
+		if (config.cache.strictKeyDiscipline !== void 0 && typeof config.cache.strictKeyDiscipline !== "boolean") errors.push({
+			field: "cache.strictKeyDiscipline",
+			message: `cache.strictKeyDiscipline must be a boolean (got ${JSON.stringify(config.cache.strictKeyDiscipline)}).`,
+			value: config.cache.strictKeyDiscipline,
+			suggestion: "Use cache: { strictKeyDiscipline: true } to promote key-discipline warnings to errors."
+		});
+	}
 	const MOVED_TO_CACHE_FILE = /* @__PURE__ */ new Set(["cacheHandler", "cdnPurge"]);
 	for (const key of Object.keys(config)) if (!knownKeys.has(key)) errors.push({
 		field: key,
@@ -1515,7 +1524,7 @@ function createGraphEndpointMiddleware(server, ctx) {
 		}
 		reflectCors(res, origin);
 		try {
-			const { classifyLiveFile, classifyLiveProject } = await import("./_chunks/live-graph-Bx4HodF1.js");
+			const { classifyLiveFile, classifyLiveProject } = await import("./_chunks/live-graph-BXDsdzBv.js");
 			const preserveSymlinks = server.config.resolve.preserveSymlinks;
 			const root = normalizePath(preserveSymlinks ? ctx.root : await realpath(ctx.root));
 			const appDir = normalizePath(preserveSymlinks ? ctx.appDir : await realpath(ctx.appDir).catch(() => join(root, relative(ctx.root, ctx.appDir))));
@@ -1894,7 +1903,7 @@ function timberDevServer(ctx) {
 		* rewritten /index.html. Vite-internal and asset requests are
 		* filtered out explicitly and passed through to Vite.
 		*/
-		configureServer(server) {
+		async configureServer(server) {
 			const configPaths = CONFIG_FILE_NAMES.map((name) => join(ctx.root, name));
 			server.watcher.add(configPaths);
 			listenForClientErrors(server, ctx.root);
@@ -1923,13 +1932,8 @@ function timberDevServer(ctx) {
 			server.middlewares.use(createTimberMiddleware(server, ctx));
 			registerDevDiscovery(server.httpServer, ctx.root, server.config);
 			if (ctx.holdingServer) {
-				const originalListen = server.listen.bind(server);
-				const holdingRef = ctx.holdingServer;
+				await ctx.holdingServer.close().catch(() => {});
 				ctx.holdingServer = null;
-				server.listen = async (port, isRestart) => {
-					await holdingRef.close().catch(() => {});
-					return originalListen(port, isRestart);
-				};
 			}
 			ctx.timer.end("dev-server-setup");
 			const summary = ctx.timer.formatSummary();
@@ -2302,6 +2306,7 @@ function generateConfigModule(ctx) {
 		forms: serializeFormsConfig(ctx.config.forms),
 		deploymentId: ctx.deploymentId ?? null,
 		clientSegmentCache: ctx.config.clientSegmentCache ?? false,
+		cache: { strictKeyDiscipline: ctx.config.cache?.strictKeyDiscipline ?? false },
 		devBrowserLogs: ctx.config.devBrowserLogs
 	};
 	return [
@@ -3158,7 +3163,11 @@ function timberShims(_ctx) {
 			for (const marker of EXPLICIT_MARKERS) if (id === marker.specifier) return marker.virtualId;
 			const cleanId = stripJsExtension(id);
 			if (cleanId in SHIM_MAP) {
-				if (envName(this) === "client" && cleanId === "next/navigation") return resolve(SHIMS_DIR, "navigation-client.ts");
+				if (cleanId === "next/navigation") {
+					const env = envName(this);
+					if (env === "client") return resolve(SHIMS_DIR, "navigation-client.ts");
+					if (env === "rsc") return resolve(SHIMS_DIR, "navigation-rsc.ts");
+				}
 				return SHIM_MAP[cleanId];
 			}
 			if (cleanId === "#server-only-guard") {
@@ -6695,19 +6704,6 @@ async function stripJsFromRscAssetsManifests(buildDir) {
 //#endregion
 //#region src/server/flight-scripts.ts
 /**
-* Shared Flight data script generation.
-*
-* Both html-injectors.ts (Web Streams / dev) and node-stream-transforms.ts
-* (Node streams / production) use this module to generate inline `<script>`
-* tags for RSC Flight data injection.
-*
-* The init script goes in `<head>` as part of the HTML shell (guaranteed
-* to execute before any streaming chunk scripts). Push scripts are emitted
-* as RSC chunks arrive during streaming.
-*
-* See design/02-rendering-pipeline.md, LOCAL-415
-*/
-/**
 * Escape a JSON string for safe embedding inside an HTML `<script>` tag.
 *
 * Prevents XSS via `<\/script>` injection and handles Unicode line/paragraph
@@ -6843,7 +6839,6 @@ function staticOutputPath(entry) {
 * @internal Exported for testing.
 */
 var StaticOutputPaths = class {
-	identity;
 	claimed = /* @__PURE__ */ new Map();
 	/** Every ancestor directory of a claimed path, mapped to its claimant. */
 	directories = /* @__PURE__ */ new Map();
@@ -6855,6 +6850,7 @@ var StaticOutputPaths = class {
 	*   asked, not assumed. Folding unconditionally would reject `/Foo` beside
 	*   `/foo` on Linux, where both are perfectly servable files.
 	*/
+	identity;
 	constructor(identity = EXACT_FS_IDENTITY) {
 		this.identity = identity;
 	}
@@ -6905,10 +6901,10 @@ function ancestors(relPath) {
 * @internal Exported for testing.
 */
 var StaticSiteWriter = class {
-	staticDir;
 	/** Content-Type per URL path for extensionless API routes (TIM-1241). */
 	contentTypes = {};
 	paths;
+	staticDir;
 	constructor(staticDir, identity = EXACT_FS_IDENTITY) {
 		this.staticDir = staticDir;
 		this.paths = new StaticOutputPaths(identity);
@@ -10800,8 +10796,10 @@ function validateKeyFormat(key) {
 *
 * The holding server is started in rootSync's config() hook (the
 * earliest Vite plugin lifecycle point where we know the port) and
-* closed in timber-dev-server's configureServer() hook (the last
-* plugin, right before Vite calls server.listen()).
+* closed directly in timber-dev-server's configureServer() hook
+* (the last plugin, fire-and-forget). configureServer runs during
+* createServer(), well before Vite's port probe and bind, so the
+* port is free by the time httpServerStart() runs. (TIM-1419)
 *
 * Browser requests (Accept: text/html) get the HTML holding page.
 * API requests (Accept: application/json) get a 503 JSON response.
@@ -10891,12 +10889,13 @@ var HOLDING_PAGE_HTML = [
 * const holding = createHoldingServer();
 * await bindWithBump((p) => holding.listen(p), { startPort: 3000, autoBump: true });
 *
-* // In last plugin's configureServer() — wrap listen for seamless handoff
-* const originalListen = server.listen.bind(server);
-* server.listen = async (...args) => {
-*   await holding.close();
-*   return originalListen(...args);
-* };
+* // In last plugin's configureServer() — close directly so Vite 8's
+* // isPortAvailable() probe and httpServer.listen() both see a free
+* // port. SO_REUSEADDR allows immediate rebind. (TIM-1419)
+* if (ctx.holdingServer) {
+*   ctx.holdingServer.close().catch(() => {});
+*   ctx.holdingServer = null;
+* }
 * ```
 */
 function createHoldingServer() {
@@ -10922,10 +10921,10 @@ function createHoldingServer() {
 		res.end(HOLDING_PAGE_HTML);
 	});
 	return {
-		listen(port) {
+		listen(port, host) {
 			return new Promise((resolve, reject) => {
 				server.once("error", reject);
-				server.listen(port, () => {
+				server.listen(port, host, () => {
 					server.removeListener("error", reject);
 					const addr = server.address();
 					resolve(typeof addr === "object" && addr ? addr.port : port);
@@ -10933,6 +10932,7 @@ function createHoldingServer() {
 			});
 		},
 		close() {
+			server.closeAllConnections();
 			return new Promise((resolve, reject) => {
 				server.close((err) => {
 					if (err) reject(err);
@@ -11176,19 +11176,20 @@ function timber(config) {
 			let resolvedDevPort = null;
 			let resolvedDevPortExplicit = false;
 			const isMiddlewareMode = Boolean(userConfig.server?.middlewareMode);
+			const resolvedHost = typeof userConfig.server?.host === "string" ? userConfig.server.host : userConfig.server?.host === true ? void 0 : "localhost";
 			if (command === "serve" && !isPreview && !isMiddlewareMode) {
 				ctx.holdingServer = createHoldingServer();
 				const holdingRef = ctx.holdingServer;
 				const result = await startDevServerPort({
 					configPort: typeof userConfig.server?.port === "number" ? userConfig.server.port : void 0,
 					envPort: process.env.PORT,
-					listen: (p) => holdingRef.listen(p)
+					listen: (p) => holdingRef.listen(p, resolvedHost)
 				});
 				if (!result.bound) ctx.holdingServer = null;
-				if (result.bound || result.explicit) {
+				if (result.bound) {
 					resolvedDevPort = result.port;
 					resolvedDevPortExplicit = result.explicit;
-				}
+				} else if (result.explicit) resolvedDevPort = result.port;
 			} else if (command === "serve" && isPreview) {
 				const start = resolveStartPort({
 					configPort: typeof userConfig.preview?.port === "number" ? userConfig.preview.port : typeof userConfig.server?.port === "number" ? userConfig.server.port : void 0,
@@ -11225,7 +11226,7 @@ function timber(config) {
 			if (resolvedDevPort != null) {
 				if (!isPreview) {
 					serverConfig.port = resolvedDevPort;
-					serverConfig.strictPort = true;
+					serverConfig.strictPort = resolvedDevPortExplicit;
 				}
 				previewConfig.port = resolvedDevPort;
 				previewConfig.strictPort = resolvedDevPortExplicit;