@timber-js/app 0.2.0-alpha.68 → 0.2.0-alpha.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/index.js +216 -144
- package/dist/client/index.js.map +1 -1
- package/dist/client/link-pending-store.d.ts +3 -3
- package/dist/client/navigation-api.d.ts.map +1 -1
- package/dist/client/{transition-root.d.ts → navigation-root.d.ts} +31 -9
- package/dist/client/navigation-root.d.ts.map +1 -0
- package/dist/client/router.d.ts +1 -1
- package/dist/client/router.d.ts.map +1 -1
- package/dist/client/top-loader.d.ts +2 -2
- package/dist/server/index.js.map +1 -1
- package/dist/server/route-element-builder.d.ts +10 -0
- package/dist/server/route-element-builder.d.ts.map +1 -1
- package/dist/server/slot-resolver.d.ts.map +1 -1
- package/dist/server/ssr-wrappers.d.ts +3 -3
- package/package.json +1 -1
- package/src/client/browser-entry.ts +15 -11
- package/src/client/link-pending-store.ts +3 -3
- package/src/client/link.tsx +2 -2
- package/src/client/navigation-api.ts +10 -0
- package/src/client/navigation-context.ts +2 -2
- package/src/client/navigation-root.tsx +346 -0
- package/src/client/router.ts +38 -2
- package/src/client/top-loader.tsx +2 -2
- package/src/client/use-navigation-pending.ts +1 -1
- package/src/server/route-element-builder.ts +69 -21
- package/src/server/slot-resolver.ts +37 -35
- package/src/server/ssr-entry.ts +1 -1
- package/src/server/ssr-wrappers.tsx +10 -10
- package/dist/client/transition-root.d.ts.map +0 -1
- package/src/client/transition-root.tsx +0 -205
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
* 1. Link click handler: setLinkForCurrentNavigation(instance) →
|
|
15
15
|
* resets previous link (urgent), sets new link pending (urgent),
|
|
16
16
|
* stores setter + increments navId
|
|
17
|
-
* 2.
|
|
18
|
-
* 3.
|
|
17
|
+
* 2. NavigationRoot startTransition: captures navId, does async work
|
|
18
|
+
* 3. NavigationRoot commit: resetLinkPending(capturedNavId) →
|
|
19
19
|
* calls setter(IDLE) inside the transition (batched, atomic with tree)
|
|
20
20
|
* Only clears if navId matches (prevents stale T1 from clearing T2's link)
|
|
21
21
|
*
|
|
@@ -53,7 +53,7 @@ export declare function setLinkForCurrentNavigation(link: LinkPendingInstance |
|
|
|
53
53
|
export declare function getCurrentNavId(): number;
|
|
54
54
|
/**
|
|
55
55
|
* Reset the current link's pending state to IDLE, but only if the navId
|
|
56
|
-
* matches. Called inside
|
|
56
|
+
* matches. Called inside NavigationRoot's startTransition after the async
|
|
57
57
|
* work completes — the setter call is a transition update, so it commits
|
|
58
58
|
* atomically with the new tree.
|
|
59
59
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation-api.d.ts","sourceRoot":"","sources":["../../src/client/navigation-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"navigation-api.d.ts","sourceRoot":"","sources":["../../src/client/navigation-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,2BAA2B,CAAC;AAM9E;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAM1C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,IAAI,CAGvD;AAID;;;;;GAKG;AACH,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,kBAAkB,EAAE,CAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KACjE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnB;;;OAGG;IACH,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClF;AAED;;;GAGG;AACH,MAAM,WAAW,uBAAuB;IACtC;;;;;;;;;;;;;;OAcG;IACH,mBAAmB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAE9C;;;;;OAKG;IACH,wBAAwB,EAAE,MAAM,IAAI,CAAC;IAErC;;;;;;;;OAQG;IACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAElD;;;OAGG;IACH,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAE9C;;;OAGG;IACH,mBAAmB,EAAE,MAAM,OAAO,CAAC;IAEnC,0CAA0C;IAC1C,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,sBAAsB,GAAG,uBAAuB,CA+K7F"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* NavigationRoot — Wrapper component for transition-based rendering.
|
|
3
3
|
*
|
|
4
4
|
* Solves the "new boundary has no old content" problem for client-side
|
|
5
5
|
* navigation. When React renders a completely new Suspense boundary via
|
|
6
6
|
* root.render(), it shows the fallback immediately — root.render() is
|
|
7
7
|
* always an urgent update regardless of startTransition.
|
|
8
8
|
*
|
|
9
|
-
*
|
|
9
|
+
* NavigationRoot holds the current element in React state. Navigation
|
|
10
10
|
* updates call startTransition(() => setState(newElement)), which IS
|
|
11
11
|
* a transition update. React keeps the old committed tree visible while
|
|
12
12
|
* any new Suspense boundaries in the transition resolve.
|
|
@@ -18,11 +18,33 @@
|
|
|
18
18
|
* alongside `setElement(newTree)` — both commit atomically, so the
|
|
19
19
|
* spinner disappears in the same frame as the new content appears.
|
|
20
20
|
*
|
|
21
|
+
* Hard navigation guard: When a hard navigation is triggered (500 error,
|
|
22
|
+
* version skew), the component throws an unresolved thenable AFTER all
|
|
23
|
+
* hooks to suspend forever — preventing React from rendering children
|
|
24
|
+
* during page teardown. The throw must come after hooks to satisfy
|
|
25
|
+
* React's rules (same hook count every render) while still preventing
|
|
26
|
+
* child renders that could hit hook count mismatches in components
|
|
27
|
+
* whose positions shift during teardown. This pattern is borrowed from
|
|
28
|
+
* Next.js (app-router.tsx pushRef.mpaNavigation — also after hooks).
|
|
29
|
+
*
|
|
21
30
|
* See design/05-streaming.md §"deferSuspenseFor"
|
|
22
31
|
* See design/19-client-navigation.md §"NavigationContext"
|
|
23
32
|
*/
|
|
24
33
|
import { type ReactNode } from 'react';
|
|
25
34
|
import { type TopLoaderConfig } from './top-loader.js';
|
|
35
|
+
/**
|
|
36
|
+
* Set the hard-navigating flag. Call this BEFORE setting
|
|
37
|
+
* window.location.href or window.location.reload() to prevent:
|
|
38
|
+
* 1. React from rendering children during page teardown
|
|
39
|
+
* 2. Navigation API from intercepting the hard navigation
|
|
40
|
+
*/
|
|
41
|
+
export declare function setHardNavigating(value: boolean): void;
|
|
42
|
+
/**
|
|
43
|
+
* Check if a hard navigation is in progress.
|
|
44
|
+
* Used by NavigationRoot (throw unresolvedThenable) and by the
|
|
45
|
+
* Navigation API handler (skip interception).
|
|
46
|
+
*/
|
|
47
|
+
export declare function isHardNavigating(): boolean;
|
|
26
48
|
/**
|
|
27
49
|
* Root wrapper component that enables transition-based rendering.
|
|
28
50
|
*
|
|
@@ -31,7 +53,7 @@ import { type TopLoaderConfig } from './top-loader.js';
|
|
|
31
53
|
* (the provider renders no extra DOM elements).
|
|
32
54
|
*
|
|
33
55
|
* Usage in browser-entry.ts:
|
|
34
|
-
* const rootEl = createElement(
|
|
56
|
+
* const rootEl = createElement(NavigationRoot, { initial: wrapped });
|
|
35
57
|
* reactRoot = hydrateRoot(document, rootEl);
|
|
36
58
|
*
|
|
37
59
|
* Subsequent navigations:
|
|
@@ -40,7 +62,7 @@ import { type TopLoaderConfig } from './top-loader.js';
|
|
|
40
62
|
* Non-navigation renders:
|
|
41
63
|
* transitionRender(newWrappedElement);
|
|
42
64
|
*/
|
|
43
|
-
export declare function
|
|
65
|
+
export declare function NavigationRoot({ initial, topLoaderConfig, }: {
|
|
44
66
|
initial: ReactNode;
|
|
45
67
|
topLoaderConfig?: TopLoaderConfig;
|
|
46
68
|
}): ReactNode;
|
|
@@ -57,7 +79,7 @@ export declare function transitionRender(element: ReactNode): void;
|
|
|
57
79
|
*
|
|
58
80
|
* The `perform` callback runs inside `startTransition` — it should fetch the
|
|
59
81
|
* RSC payload, update router state, and return the wrapped React element.
|
|
60
|
-
* The pending URL shows immediately (
|
|
82
|
+
* The pending URL shows immediately (urgent update) and reverts
|
|
61
83
|
* to null when the transition commits (atomic with the new tree).
|
|
62
84
|
*
|
|
63
85
|
* Returns a Promise that resolves when the async work completes (note: the
|
|
@@ -67,10 +89,10 @@ export declare function transitionRender(element: ReactNode): void;
|
|
|
67
89
|
*/
|
|
68
90
|
export declare function navigateTransition(pendingUrl: string, perform: () => Promise<ReactNode>): Promise<void>;
|
|
69
91
|
/**
|
|
70
|
-
* Check if the
|
|
92
|
+
* Check if the NavigationRoot is mounted and ready for renders.
|
|
71
93
|
* Used by browser-entry.ts to guard against renders before hydration.
|
|
72
94
|
*/
|
|
73
|
-
export declare function
|
|
95
|
+
export declare function isNavigationRootReady(): boolean;
|
|
74
96
|
/**
|
|
75
97
|
* Install one-shot deferred callbacks for the no-RSC bootstrap path (TIM-600).
|
|
76
98
|
*
|
|
@@ -79,8 +101,8 @@ export declare function isTransitionRootReady(): boolean;
|
|
|
79
101
|
* this sets up `_transitionRender` and `_navigateTransition` so that the
|
|
80
102
|
* first client navigation triggers root creation via `createAndMount`.
|
|
81
103
|
*
|
|
82
|
-
* After `createAndMount` runs,
|
|
104
|
+
* After `createAndMount` runs, NavigationRoot renders and overwrites these
|
|
83
105
|
* callbacks with its real `startTransition`-based implementations.
|
|
84
106
|
*/
|
|
85
107
|
export declare function installDeferredNavigation(createAndMount: (initial: ReactNode) => void): void;
|
|
86
|
-
//# sourceMappingURL=
|
|
108
|
+
//# sourceMappingURL=navigation-root.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"navigation-root.d.ts","sourceRoot":"","sources":["../../src/client/navigation-root.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAAsD,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAE3F,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAsDlE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAEtD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAiCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,SAAS,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,GAAG,SAAS,CA6GZ;AAID;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,IAAI,CAIzD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAMf;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI,CAc5F"}
|
package/dist/client/router.d.ts
CHANGED
|
@@ -68,7 +68,7 @@ export interface RouterDeps {
|
|
|
68
68
|
*
|
|
69
69
|
* The `perform` callback receives a `wrapPayload` function to wrap the
|
|
70
70
|
* decoded RSC payload with NavigationProvider + NuqsAdapter before
|
|
71
|
-
*
|
|
71
|
+
* NavigationRoot sets it as the new element. The `wrapPayload` function
|
|
72
72
|
* receives the NavigationState explicitly — no temporal coupling with
|
|
73
73
|
* getNavigationState().
|
|
74
74
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/client/router.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAoB,MAAM,iBAAiB,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/client/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Shows an animated progress bar at the top of the viewport while an RSC
|
|
5
5
|
* navigation is in flight. Injected automatically by the framework into
|
|
6
|
-
*
|
|
6
|
+
* NavigationRoot — users never render this component directly.
|
|
7
7
|
*
|
|
8
8
|
* Configuration is via timber.config.ts `topLoader` key. Enabled by default.
|
|
9
9
|
* Users who want a fully custom progress indicator disable the built-in one
|
|
@@ -39,7 +39,7 @@ export interface TopLoaderConfig {
|
|
|
39
39
|
zIndex?: number;
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
|
-
* Internal top-loader component. Injected by
|
|
42
|
+
* Internal top-loader component. Injected by NavigationRoot.
|
|
43
43
|
*
|
|
44
44
|
* Reads pending navigation state from PendingNavigationContext.
|
|
45
45
|
* Phase transitions are derived synchronously during render:
|