@timber-js/app 0.2.0-alpha.207 → 0.2.0-alpha.208

package/dist/client/segment-cache.d.ts

@@ -63,9 +63,36 @@ export interface SegmentNode {
  */
 export declare class SegmentCache {
     private root;
+    /**
+     * Monotonic counter. Bumped by `invalidateReuse()` (TIM-1466).
+     * `serializeStateTree` suppresses `segments` and `slots` when
+     * `reuseInvalidatedAt > reuseRestoredAt`. Only `restoreReuse()`
+     * advances `reuseRestoredAt` — `set()` does not, because a
+     * pre-invalidation navigation's commit thunk would lift suppression
+     * before a post-invalidation request has been sent (codex on #1167).
+     */
+    private reuseInvalidatedAt;
+    private reuseRestoredAt;
     get(segment: string): SegmentNode | undefined;
     set(segment: string, node: SegmentNode): void;
     clear(): void;
+    /**
+     * Suppress segment and slot reuse without destroying the tree
+     * structure (TIM-1466). `serializeStateTree` sends empty
+     * `segments`/`slots` (forcing a full render) while `treePaths`
+     * still reflects the mounted tree for interception scoping.
+     * Call `restoreReuse()` once post-invalidation data has been
+     * fetched and committed.
+     */
+    invalidateReuse(): void;
+    /**
+     * Lift reuse suppression. Called after the segment cache has been
+     * rebuilt from a response that was fetched with suppression active
+     * (i.e. the server sent a full render). Safe to call idempotently.
+     */
+    restoreReuse(): void;
+    /** Whether segment/slot reuse is currently suppressed (TIM-1466). */
+    isReuseSuppressed(): boolean;
     /**
      * Serialize the mounted segment tree for the X-Timber-State-Tree header.
      * Only includes sync segments — async segments are excluded because the
@@ -140,12 +167,16 @@ export interface PrefetchKey {
  */
 export declare function prefetchScopeOf(stateTree: StateTree | undefined): string;
 /** Outcome of a prefetch flight — discriminated so NonRscResponse is a
- *  success (stores a negative entry) rather than a rejection. */
+ *  success (stores a negative entry) rather than a rejection.
+ *  `startGen` is the eviction generation at flight start — joiners that
+ *  started after a gen bump must reject pre-invalidation results (TIM-1464). */
 export type FlightOutcome = {
     kind: 'ready';
     result: PrefetchResult;
+    startGen: number;
 } | {
     kind: 'non-route';
+    startGen: number;
 };
 /**
  * Short-lived cache for hover-triggered prefetches. Entries expire after
@@ -206,9 +237,18 @@ export declare class PrefetchCache {
     /** Check if the entry is a negative cache entry (URL is not a route). */
     isNegative(key: PrefetchKey): boolean;
     /**
-     * Invalidate all entries whose destination URL matches (TIM-1454).
-     * Used by `revalidatePath` on a non-current route so the next navigation
-     * fetches fresh data instead of replaying a stale prefetch.
+     * Invalidate entries whose destination URL matches (TIM-1454).
+     *
+     * When `url` has no search string, evicts all entries sharing that
+     * pathname — `/products` evicts `/products?page=1` too, because
+     * `revalidatePath('/products')` invalidates the route regardless of
+     * query (TIM-1465).
+     *
+     * When `url` has a search string, only the exact URL is evicted.
+     *
+     * Also bumps the eviction generation so in-flight singleflight
+     * flights for the invalidated URL(s) discard their results on
+     * completion (TIM-1464).
      */
     invalidateUrl(url: string): void;
     /**

package/dist/client/segment-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"segment-cache.d.ts","sourceRoot":"","sources":["../../src/client/segment-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"segment-cache.d.ts","sourceRoot":"","sources":["../../src/client/segment-cache.ts"],"names":[],"mappings":"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"}

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,CAiXhE;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;AA0CjD,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,CAkXhE;eAEc,MAAM"}

package/dist/index.js

@@ -5989,6 +5989,106 @@ function timberReactProd() {
 	};
 }
 //#endregion
+//#region src/plugins/react-resolve.ts
+/**
+* timber-react-resolve — Deduplicate React across timber and user project.
+*
+* Without this plugin, pnpm's strict isolation can install two physical
+* copies of React when the user's pinned version differs from timber's
+* peer dep. Timber's 47 bare `from 'react'` imports resolve to one copy
+* while react-dom uses the other — causing "Invalid hook call" hydration
+* crashes with no indication of the real cause.
+*
+* The fix: inject `resolve.dedupe` entries so Vite always resolves React
+* packages from the project root. Unlike `resolve.alias`, `dedupe`
+* preserves Vite's per-environment export conditions — the RSC
+* environment still gets the `react-server` build, SSR gets the SSR
+* build, and the browser gets the browser build. The deduplication
+* happens at the package level, not the file level.
+*
+* A `configResolved` check detects version mismatches between timber's
+* resolved React and the project's React, and logs an actionable error.
+*
+* Design doc: 18-build-system.md §"Module Resolution"
+* Task: TIM-1520
+*/
+/**
+* React packages to deduplicate. Vite's `resolve.dedupe` extracts the
+* base package name (via `deepImportRE`) before checking, so subpath
+* specifiers like `react/jsx-runtime` are covered by the base `react`
+* entry — listing them separately has no effect.
+*/
+var REACT_DEDUPE_PACKAGES = ["react", "react-dom"];
+var RED = "\x1B[31m";
+var BOLD = "\x1B[1m";
+var DIM = "\x1B[2m";
+var RESET = "\x1B[0m";
+/**
+* Read the version from a package's package.json given a resolve root.
+*/
+function readPackageVersion(packageName, resolveRoot) {
+	try {
+		const req = createRequire(`${resolveRoot}/package.json`);
+		return req(req.resolve(`${packageName}/package.json`)).version ?? null;
+	} catch {
+		return null;
+	}
+}
+/**
+* Check whether timber's React and the user project's React resolve to
+* the same version. Returns mismatches if any.
+*/
+function detectReactMismatch(projectRoot) {
+	const mismatches = [];
+	const timberRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+	for (const pkg of ["react", "react-dom"]) {
+		const timberVersion = readPackageVersion(pkg, timberRoot);
+		const projectVersion = readPackageVersion(pkg, projectRoot);
+		if (timberVersion && projectVersion && timberVersion !== projectVersion) mismatches.push({
+			specifier: pkg,
+			timberVersion,
+			projectVersion
+		});
+	}
+	return mismatches;
+}
+/**
+* Format React version mismatches as an actionable warning.
+*/
+function formatReactMismatch(mismatches) {
+	if (mismatches.length === 0) return "";
+	const lines = [];
+	lines.push(`${RED}${BOLD}[timber]${RESET} ${RED}React version mismatch detected — this causes silent hydration crashes${RESET}`);
+	lines.push("");
+	for (const m of mismatches) lines.push(`  ${RED}✗${RESET} ${m.specifier}: timber has ${BOLD}${m.timberVersion}${RESET}, project has ${BOLD}${m.projectVersion}${RESET}`);
+	lines.push("");
+	lines.push(`  ${DIM}This typically causes "Invalid hook call" errors because two copies of${RESET}`);
+	lines.push(`  ${DIM}React are loaded. timber's resolve.dedupe should handle this, but${RESET}`);
+	lines.push(`  ${DIM}if you see hook errors, ensure your React version satisfies timber's peer dep.${RESET}`);
+	lines.push("");
+	lines.push(`  ${DIM}Fix: update React in your project to match —${RESET}`);
+	lines.push(`  ${BOLD}pnpm add react@${mismatches[0].timberVersion} react-dom@${mismatches[0].timberVersion}${RESET}`);
+	return lines.join("\n");
+}
+/**
+* Create the timber-react-resolve Vite plugin.
+*/
+function timberReactResolve() {
+	return {
+		name: "timber-react-resolve",
+		enforce: "pre",
+		config(userConfig) {
+			const merged = [...userConfig.resolve?.dedupe ?? []];
+			for (const pkg of REACT_DEDUPE_PACKAGES) if (!merged.includes(pkg)) merged.push(pkg);
+			return { resolve: { dedupe: merged } };
+		},
+		configResolved(resolved) {
+			const mismatches = detectReactMismatch(resolved.root);
+			if (mismatches.length > 0) process.stderr.write(`${formatReactMismatch(mismatches)}\n\n`);
+		}
+	};
+}
+//#endregion
 //#region src/plugins/chunks.ts
 /**
 * Build a map from absolute module IDs in non-facade RSC chunks to the
@@ -9387,6 +9487,7 @@ function timber(config) {
 	// @vitejs/plugin-rsc handles:
 	return [
 		rootSync,
+		timberReactResolve(),
 		timberReactProd(),
 		...patchReactCompilerForProdJsx(react({ compiler: effectiveReactCompiler || false })),
 		vitePluginRsc(createRscOptions(ctx, encryptionKeyExpr)),