@timber-js/app 0.2.0-alpha.71 → 0.2.0-alpha.72

package/dist/index.js

@@ -1,16 +1,18 @@
 import { r as __toESM, t as __commonJSMin } from "./_chunks/chunk-DYhsFzuS.js";
-import { r as setViteServer, t as formatSize } from "./_chunks/format-Rn922VH2.js";
-import { i as scanRoutes, n as generateRouteMap, t as collectInterceptionRewrites } from "./_chunks/interception-CEdHHviP.js";
-import { existsSync, readFileSync } from "node:fs";
+import { n as setViteServer } from "./_chunks/dev-warnings-DpGRGoDi.js";
+import { i as scanRoutes, n as generateRouteMap, t as collectInterceptionRewrites } from "./_chunks/interception-Dpn_UfAD.js";
+import { t as formatSize } from "./_chunks/format-CYBGxKtc.js";
 import { dirname, extname, join, normalize, resolve } from "node:path";
 import { createRequire } from "node:module";
 import react, { reactCompilerPreset } from "@vitejs/plugin-react";
+import { existsSync, readFileSync } from "node:fs";
 import { constants, createGzip, gzipSync } from "node:zlib";
 import { Readable } from "node:stream";
 import { fileURLToPath } from "node:url";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
 import { performance as performance$1 } from "node:perf_hooks";
+import http from "node:http";
 //#region src/plugins/content.ts
 var CONFIG_FILE_NAMES$1 = [
 	"content-collections.ts",
@@ -428,6 +430,15 @@ function timberDevServer(ctx) {
 			setViteServer(server);
 			listenForClientErrors(server, ctx.root);
 			server.middlewares.use(createTimberMiddleware(server, ctx.root));
+			if (ctx.holdingServer) {
+				const originalListen = server.listen.bind(server);
+				const holdingRef = ctx.holdingServer;
+				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();
 			if (summary) console.log(summary);
@@ -650,7 +661,7 @@ var VIRTUAL_IDS = {
 var ENTRY_FILE_MAP = {
 	[VIRTUAL_IDS.rscEntry]: resolve(SRC_DIR, "server", "rsc-entry", "index.ts"),
 	[VIRTUAL_IDS.ssrEntry]: resolve(SRC_DIR, "server", "ssr-entry.ts"),
-	[VIRTUAL_IDS.browserEntry]: resolve(SRC_DIR, "client", "browser-entry.ts")
+	[VIRTUAL_IDS.browserEntry]: resolve(SRC_DIR, "client", "browser-entry", "index.ts")
 };
 /** The \0-prefixed resolved ID for virtual:timber-config */
 var RESOLVED_CONFIG_ID = `\0${VIRTUAL_IDS.config}`;
@@ -12197,11 +12208,8 @@ var CLIENT_ONLY_VIRTUAL = "\0timber:client-only";
 */
 var SUBPATH_SRC_MAP = {
 	"cache": "cache/index.ts",
-	"content": "content/index.ts",
 	"cookies": "cookies/index.ts",
-	"segment-params": "segment-params/index.ts",
 	"search-params": "search-params/index.ts",
-	"routing": "routing/index.ts",
 	"adapters/cloudflare": "adapters/cloudflare.ts",
 	"adapters/cloudflare/dev": "adapters/cloudflare-dev.ts",
 	"adapters/nitro": "adapters/nitro.ts"
@@ -12248,6 +12256,17 @@ function timberShims(_ctx) {
 				if (this.environment?.name === "client" && cleanId === "next/navigation") return resolve(SHIMS_DIR, "navigation-client.ts");
 				return SHIM_MAP[cleanId];
 			}
+			if (cleanId === "#server-internal") {
+				if (this.environment?.name === "client") return "\0timber:server-empty";
+				return resolve(PKG_ROOT, "src", "server", "internal.ts");
+			}
+			if (cleanId === "#client-internal") return resolve(PKG_ROOT, "src", "client", "internal.ts");
+			if (cleanId === "#routing") return resolve(PKG_ROOT, "src", "routing", "index.ts");
+			if (cleanId === "@timber-js/app/server/internal") {
+				if (this.environment?.name === "client") return "\0timber:server-empty";
+				return resolve(PKG_ROOT, "src", "server", "internal.ts");
+			}
+			if (cleanId === "@timber-js/app/client/internal") return resolve(PKG_ROOT, "src", "client", "internal.ts");
 			if (cleanId === "@timber-js/app/server") {
 				if (this.environment?.name === "client") return "\0timber:server-empty";
 				return resolve(PKG_ROOT, "src", "server", "index.ts");
@@ -12287,6 +12306,12 @@ const msg = "[timber] @timber-js/app/server was imported from client code. " +
 function stub() { throw new Error(msg); }
 export const headers = stub;
 export const cookies = stub;
+export const getHeaders = stub;
+export const getHeader = stub;
+export const getCookies = stub;
+export const getCookie = stub;
+export const getSearchParams = stub;
+export const getSegmentParams = stub;
 export const searchParams = stub;
 export const deny = stub;
 export const notFound = stub;
@@ -12294,7 +12319,7 @@ export const redirect = stub;
 export const permanentRedirect = stub;
 export const redirectExternal = stub;
 export const waitUntil = stub;
-export const RenderError = stub;
+export const DenyOptions = {};
 export const RedirectType = {};
 export const DenySignal = stub;
 export const RedirectSignal = stub;
@@ -13449,8 +13474,7 @@ function timberFonts(ctx) {
 						googleFontFacesMap.set(font.id, faces);
 					} catch (e) {
 						const msg = e instanceof Error ? e.message : String(e);
-						console.warn(`[timber-fonts] Failed to resolve Google font "${font.family}": ${msg}`);
-						googleFontFacesMap.set(font.id, []);
+						console.warn(`[timber-fonts] Failed to resolve Google font "${font.family}": ${msg}. Will retry on next request.`);
 					}
 				}
 				const css = generateAllFontCss(registry, googleFontFacesMap);
@@ -13639,15 +13663,26 @@ function timberFonts(ctx) {
 *
 * We detect both import-level and call-level usage.
 */
-var DYNAMIC_API_PATTERNS = [{
-	pattern: /\bcookies\s*\(/,
-	name: "cookies()"
-}, {
-	pattern: /\bheaders\s*\(/,
-	name: "headers()"
-}];
+var DYNAMIC_API_PATTERNS = [
+	{
+		pattern: /\bgetCookies\s*\(/,
+		name: "getCookies()"
+	},
+	{
+		pattern: /\bgetHeaders\s*\(/,
+		name: "getHeaders()"
+	},
+	{
+		pattern: /\bcookies\s*\(/,
+		name: "cookies()"
+	},
+	{
+		pattern: /\bheaders\s*\(/,
+		name: "headers()"
+	}
+];
 /**
-* Detect usage of dynamic per-request APIs (cookies(), headers())
+* Detect usage of dynamic per-request APIs (getCookies(), getHeaders())
 * that cannot work at build time in static mode.
 *
 * Returns an array of validation errors.
@@ -13701,7 +13736,7 @@ function detectDirectives(code, fileId, options) {
 * Run all static mode validations on a source file.
 *
 * Combines:
-* - Dynamic API detection (cookies, headers) — always in static mode
+* - Dynamic API detection (getCookies, getHeaders) — always in static mode
 * - Directive detection ('use client', 'use server') — only when client JS is disabled
 */
 function validateStaticMode(code, fileId, options) {
@@ -14960,7 +14995,173 @@ function validateKeyFormat(key) {
 	}
 }
 //#endregion
-//#region src/index.ts
+//#region src/server/dev-holding-server.ts
+/**
+* Dev holding server — serves a loading page while Vite initializes.
+*
+* When `timber dev` (or `vite dev`) starts, Vite takes several seconds
+* to initialize all plugins, scan routes, and boot the RSC environment.
+* During this window, the port is unbound and browsers get
+* ERR_CONNECTION_REFUSED.
+*
+* This module creates a lightweight HTTP server that binds the port
+* immediately and serves a branded holding page with auto-refresh.
+* Once Vite is ready, the holding server is closed and Vite's server
+* takes over the port.
+*
+* 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()).
+*
+* Browser requests (Accept: text/html) get the HTML holding page.
+* API requests (Accept: application/json) get a 503 JSON response.
+* All responses include Retry-After: 1.
+*
+* See design/21-dev-server.md, TIM-665.
+*/
+/**
+* Minimal self-contained HTML holding page.
+*
+* Matches the timber.js docs site theme:
+* - Light mode: warm stone/grain background, timber/bark text
+* - Dark mode: stone-900 background, stone-200 text
+* - 🪵 timber.js branding
+*
+* Uses meta-refresh (1s) for auto-reload — works without JavaScript.
+* Inline CSS only, no external dependencies.
+*/
+var HOLDING_PAGE_HTML = [
+	"<!DOCTYPE html>",
+	"<html lang=\"en\">",
+	"<head>",
+	"  <meta charset=\"utf-8\">",
+	"  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">",
+	"  <meta http-equiv=\"refresh\" content=\"2\">",
+	"  <title>timber — starting...</title>",
+	"  <style>",
+	"    *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }",
+	"    body {",
+	"      font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", Roboto, sans-serif;",
+	"      background: #fafaf9;",
+	"      color: #44403c;",
+	"      display: flex;",
+	"      align-items: center;",
+	"      justify-content: center;",
+	"      min-height: 100vh;",
+	"      -webkit-font-smoothing: antialiased;",
+	"    }",
+	"    @media (prefers-color-scheme: dark) {",
+	"      body { background: #1c1917; color: #e7e5e4; }",
+	"      .message { color: #a8a29e; }",
+	"      .spinner { border-color: #57534e; border-top-color: #a1887f; }",
+	"      .logo { color: #e7e5e4; }",
+	"    }",
+	"    .container { text-align: center; padding: 2rem; }",
+	"    .logo {",
+	"      font-size: 1.5rem;",
+	"      font-weight: 700;",
+	"      letter-spacing: -0.02em;",
+	"      color: #5c3d2e;",
+	"      margin-bottom: 1.5rem;",
+	"    }",
+	"    .message {",
+	"      font-size: 0.95rem;",
+	"      color: #78716c;",
+	"      margin-bottom: 2rem;",
+	"    }",
+	"    .spinner {",
+	"      width: 24px;",
+	"      height: 24px;",
+	"      border: 2.5px solid #d7ccc8;",
+	"      border-top-color: #6d4c41;",
+	"      border-radius: 50%;",
+	"      animation: spin 0.8s linear infinite;",
+	"      margin: 0 auto;",
+	"    }",
+	"    @keyframes spin { to { transform: rotate(360deg); } }",
+	"  </style>",
+	"</head>",
+	"<body>",
+	"  <div class=\"container\">",
+	"    <div class=\"logo\">🪵 timber.js</div>",
+	"    <p class=\"message\">Dev server starting&hellip;</p>",
+	"    <div class=\"spinner\"></div>",
+	"  </div>",
+	"</body>",
+	"</html>"
+].join("\n");
+/**
+* Create a holding HTTP server that serves a loading page during startup.
+*
+* Usage (inside Vite plugin):
+* ```ts
+* // In config() hook — earliest point where port is known
+* const holding = createHoldingServer();
+* holding.listen(config.server?.port ?? 5173);
+*
+* // 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);
+* };
+* ```
+*/
+function createHoldingServer() {
+	const server = http.createServer((req, res) => {
+		const accept = req.headers.accept ?? "";
+		if (accept.includes("application/json") && !accept.includes("text/html")) {
+			res.writeHead(503, {
+				"Content-Type": "application/json; charset=utf-8",
+				"Retry-After": "1",
+				"Cache-Control": "no-store"
+			});
+			res.end(JSON.stringify({
+				error: "Service Unavailable",
+				message: "timber dev server is starting — please retry shortly"
+			}));
+			return;
+		}
+		res.writeHead(503, {
+			"Content-Type": "text/html; charset=utf-8",
+			"Retry-After": "1",
+			"Cache-Control": "no-store"
+		});
+		res.end(HOLDING_PAGE_HTML);
+	});
+	return {
+		listen(port) {
+			return new Promise((resolve, reject) => {
+				server.once("error", reject);
+				server.listen(port, () => {
+					server.removeListener("error", reject);
+					const addr = server.address();
+					resolve(typeof addr === "object" && addr ? addr.port : port);
+				});
+			});
+		},
+		close() {
+			return new Promise((resolve, reject) => {
+				server.close((err) => {
+					if (err) reject(err);
+					else resolve();
+				});
+			});
+		}
+	};
+}
+//#endregion
+//#region src/plugin-context.ts
+/**
+* Plugin context — internal types and helpers for timber sub-plugins.
+*
+* These are NOT part of the user-facing API. They are consumed by
+* sub-plugins (routing, entries, shims, etc.) via relative imports.
+* The root entry point (index.ts) does not re-export them.
+*
+* Design doc: 18-build-system.md §"Shared Plugin Context"
+*/
 /**
 * Resolve `clientJavascript` into a fully resolved config.
 */
@@ -15012,7 +15213,8 @@ function createPluginContext(config, root) {
 		dev: false,
 		buildManifest: null,
 		deploymentId: null,
-		timer: createStartupTimer()
+		timer: createStartupTimer(),
+		holdingServer: null
 	};
 }
 /**
@@ -15075,6 +15277,29 @@ function mergeFileConfig(ctx, fileConfig) {
 		} } : {}
 	};
 }
+//#endregion
+//#region src/index.ts
+/**
+* Type-safe helper for timber.config.ts files.
+*
+* A pass-through identity function that provides autocomplete and
+* type checking for timber configuration. No runtime validation —
+* purely a DX convenience (same pattern as Vite's defineConfig).
+*
+* @example
+* ```ts
+* // timber.config.ts
+* import { defineConfig } from '@timber-js/app';
+*
+* export default defineConfig({
+*   output: 'server',
+*   pageExtensions: ['tsx', 'ts', 'mdx'],
+* });
+* ```
+*/
+function defineConfig(config) {
+	return config;
+}
 /**
 * Resolve the React Compiler plugin via @rolldown/plugin-babel.
 *
@@ -15165,6 +15390,20 @@ function timber(config) {
 				const hadCompilerInEarly = !config?.reactCompiler && earlyFileConfig?.reactCompiler;
 				if (hasCompilerInReloaded && !hadCompilerInEarly) console.warn("[timber] reactCompiler is set in timber.config.ts but could not be registered because the config file is in a non-cwd root directory. Move reactCompiler to the inline timber() config in vite.config.ts, or run vite from the project root directory.");
 			}
+			if (command === "serve") {
+				const port = userConfig.server?.port ?? 5173;
+				try {
+					ctx.holdingServer = createHoldingServer();
+					ctx.holdingServer.listen(port).then((boundPort) => {
+						const url = `http://localhost:${boundPort}`;
+						console.log(`\n  \x1b[2m🪵 timber.js dev server starting at\x1b[0m \x1b[36m${url}\x1b[0m\n`);
+					}, () => {
+						ctx.holdingServer = null;
+					});
+				} catch {
+					ctx.holdingServer = null;
+				}
+			}
 			if (command === "build") return { oxc: { jsx: { development: false } } };
 		},
 		configResolved(resolved) {
@@ -15203,28 +15442,7 @@ function timber(config) {
 		timberDevServer(ctx)
 	];
 }
-/**
-* Type-safe helper for timber.config.ts files.
-*
-* A pass-through identity function that provides autocomplete and
-* type checking for timber configuration. No runtime validation —
-* purely a DX convenience (same pattern as Vite's defineConfig).
-*
-* @example
-* ```ts
-* // timber.config.ts
-* import { defineConfig } from '@timber-js/app';
-*
-* export default defineConfig({
-*   output: 'server',
-*   pageExtensions: ['tsx', 'ts', 'mdx'],
-* });
-* ```
-*/
-function defineConfig(config) {
-	return config;
-}
 //#endregion
-export { timber as default, timber, defineConfig, loadTimberConfigFile, resolveAppDir, resolveClientJavascript, warnConfigConflicts };
+export { timber as default, timber, defineConfig };
 
 //# sourceMappingURL=index.js.map