@timber-js/app 0.2.0-alpha.220 → 0.2.0-alpha.221
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/_chunks/{actions-BwkmAYXq.js → actions-BDqn4Oxj.js} +2 -2
- package/dist/_chunks/{actions-BwkmAYXq.js.map → actions-BDqn4Oxj.js.map} +1 -1
- package/dist/_chunks/{cache-api-LA3sBpUS.js → cache-api-GE4AOe2H.js} +30 -151
- package/dist/_chunks/cache-api-GE4AOe2H.js.map +1 -0
- package/dist/_chunks/dev-server-BiWNMBVU.js +1 -0
- package/dist/_chunks/{dev-server-DnODXuNM.js → dev-server-DIy-SY-J.js} +11 -6
- package/dist/_chunks/{dev-server-DnODXuNM.js.map → dev-server-DIy-SY-J.js.map} +1 -1
- package/dist/_chunks/dev-store-BOa304m_.js +283 -0
- package/dist/_chunks/dev-store-BOa304m_.js.map +1 -0
- package/dist/_chunks/{error-boundary-xxxLtXt6.js → error-boundary-Bc8QPZuq.js} +71 -21
- package/dist/_chunks/error-boundary-Bc8QPZuq.js.map +1 -0
- package/dist/_chunks/{flight-source-node-0dE-t3kq.js → flight-source-node-HptmGMT8.js} +6 -7
- package/dist/_chunks/flight-source-node-HptmGMT8.js.map +1 -0
- package/dist/_chunks/{node-response-Dibufw_b.js → node-response-rkQqcFGq.js} +48 -2
- package/dist/_chunks/node-response-rkQqcFGq.js.map +1 -0
- package/dist/_chunks/{purge-store-Byr8XOjU.js → purge-store-WZaxu-3m.js} +2 -2
- package/dist/_chunks/purge-store-WZaxu-3m.js.map +1 -0
- package/dist/_chunks/{render-timeout-DOf_BBcO.js → render-timeout-joFhz4KH.js} +1 -10
- package/dist/_chunks/render-timeout-joFhz4KH.js.map +1 -0
- package/dist/cache/cache-api.d.ts.map +1 -1
- package/dist/cache/handler-store.d.ts +13 -1
- package/dist/cache/handler-store.d.ts.map +1 -1
- package/dist/cache/index.js +2 -1
- package/dist/cache/invalidation-epoch.d.ts +7 -0
- package/dist/cache/invalidation-epoch.d.ts.map +1 -1
- package/dist/cache/timber-cache.d.ts.map +1 -1
- package/dist/cdn/index.js +1 -1
- package/dist/cdn/purge-store.d.ts +10 -1
- package/dist/cdn/purge-store.d.ts.map +1 -1
- package/dist/cli.js +1 -1
- package/dist/client/browser-entry/router-init.d.ts.map +1 -1
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/index.js +6 -15
- package/dist/client/index.js.map +1 -1
- package/dist/client/internal.js +37 -64
- package/dist/client/internal.js.map +1 -1
- package/dist/client/link.d.ts.map +1 -1
- package/dist/client/navigation-transition.d.ts +68 -14
- package/dist/client/navigation-transition.d.ts.map +1 -1
- package/dist/client/router-effects.d.ts +35 -31
- package/dist/client/router-effects.d.ts.map +1 -1
- package/dist/client/router-pipeline.d.ts +2 -6
- package/dist/client/router-pipeline.d.ts.map +1 -1
- package/dist/client/router-types.d.ts +10 -30
- package/dist/client/router-types.d.ts.map +1 -1
- package/dist/client/router.d.ts.map +1 -1
- package/dist/dev-tools/logs.d.ts +2 -2
- package/dist/dev-tools/logs.d.ts.map +1 -1
- package/dist/index.js +144 -51
- package/dist/index.js.map +1 -1
- package/dist/plugins/dev-server.d.ts.map +1 -1
- package/dist/plugins/entries.d.ts +5 -0
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/plugins/orphaned-modules.d.ts +57 -0
- package/dist/plugins/orphaned-modules.d.ts.map +1 -0
- package/dist/plugins/prebuilt.d.ts +6 -6
- package/dist/plugins/prerender-sugar.d.ts.map +1 -1
- package/dist/plugins/routing.d.ts +1 -1
- package/dist/plugins/routing.d.ts.map +1 -1
- package/dist/rsc-runtime/dev-reference-cache.d.ts +47 -0
- package/dist/rsc-runtime/dev-reference-cache.d.ts.map +1 -0
- package/dist/rsc-runtime/rsc.d.ts +0 -15
- package/dist/rsc-runtime/rsc.d.ts.map +1 -1
- package/dist/rsc-runtime/ssr.d.ts +0 -11
- package/dist/rsc-runtime/ssr.d.ts.map +1 -1
- package/dist/server/abort-scope.d.ts +27 -0
- package/dist/server/abort-scope.d.ts.map +1 -0
- package/dist/server/flight-source-node.d.ts.map +1 -1
- package/dist/server/index.js +1 -1
- package/dist/server/instrumentation.d.ts +2 -1
- package/dist/server/instrumentation.d.ts.map +1 -1
- package/dist/server/internal.d.ts +1 -1
- package/dist/server/internal.d.ts.map +1 -1
- package/dist/server/internal.js +328 -132
- package/dist/server/internal.js.map +1 -1
- package/dist/server/pipeline-helpers.d.ts.map +1 -1
- package/dist/server/pipeline.d.ts +10 -7
- package/dist/server/pipeline.d.ts.map +1 -1
- package/dist/server/prebuilt/cache-key.d.ts +26 -0
- package/dist/server/prebuilt/cache-key.d.ts.map +1 -1
- package/dist/server/prebuilt/capture-render.d.ts +9 -4
- package/dist/server/prebuilt/capture-render.d.ts.map +1 -1
- package/dist/server/prebuilt/capture-routes.d.ts +1 -1
- package/dist/server/prebuilt/dev-store.d.ts +103 -0
- package/dist/server/prebuilt/dev-store.d.ts.map +1 -0
- package/dist/server/prebuilt/overlay.d.ts +5 -0
- package/dist/server/prebuilt/overlay.d.ts.map +1 -1
- package/dist/server/prebuilt/payload-source.d.ts +8 -0
- package/dist/server/prebuilt/payload-source.d.ts.map +1 -1
- package/dist/server/prebuilt/slots.d.ts +5 -6
- package/dist/server/prebuilt/slots.d.ts.map +1 -1
- package/dist/server/prebuilt-builder.d.ts.map +1 -1
- package/dist/server/prebuilt-runtime.d.ts +5 -10
- package/dist/server/prebuilt-runtime.d.ts.map +1 -1
- package/dist/server/render-timeout.d.ts.map +1 -1
- package/dist/server/rsc-entry/action-dispatcher.d.ts.map +1 -1
- package/dist/server/rsc-entry/index.d.ts.map +1 -1
- package/dist/server/ssr-render.d.ts.map +1 -1
- package/docs/api/32-api-cache.mdx +2 -0
- package/docs/learn/10-caching.mdx +12 -0
- package/docs/learn/11-middleware.mdx +2 -0
- package/package.json +1 -1
- package/src/cache/cache-api.ts +7 -1
- package/src/cache/handler-store.ts +38 -1
- package/src/cache/invalidation-epoch.ts +18 -6
- package/src/cache/timber-cache.ts +6 -2
- package/src/cdn/purge-store.ts +29 -1
- package/src/client/browser-entry/action-dispatch.ts +5 -5
- package/src/client/browser-entry/router-init.ts +2 -4
- package/src/client/link.tsx +14 -18
- package/src/client/navigation-transition.ts +86 -33
- package/src/client/router-effects.ts +70 -45
- package/src/client/router-lifecycle.ts +1 -1
- package/src/client/router-pipeline.ts +52 -65
- package/src/client/router-types.ts +11 -31
- package/src/client/router.ts +98 -104
- package/src/dev-tools/logs.ts +76 -50
- package/src/plugins/dev-server.ts +23 -8
- package/src/plugins/entries.ts +6 -0
- package/src/plugins/orphaned-modules.ts +78 -0
- package/src/plugins/prebuilt.ts +17 -17
- package/src/plugins/prerender-sugar.ts +38 -6
- package/src/plugins/routing.ts +23 -1
- package/src/rsc-runtime/dev-reference-cache.ts +115 -0
- package/src/rsc-runtime/rsc.ts +10 -0
- package/src/rsc-runtime/ssr.ts +10 -0
- package/src/server/abort-scope.ts +49 -0
- package/src/server/flight-source-node.ts +5 -4
- package/src/server/instrumentation.ts +32 -8
- package/src/server/internal.ts +1 -6
- package/src/server/pipeline-helpers.ts +5 -3
- package/src/server/pipeline.ts +31 -20
- package/src/server/prebuilt/cache-key.ts +41 -0
- package/src/server/prebuilt/capture-render.ts +10 -6
- package/src/server/prebuilt/capture-routes.ts +1 -1
- package/src/server/prebuilt/dev-store.ts +173 -0
- package/src/server/prebuilt/overlay.ts +7 -1
- package/src/server/prebuilt/payload-source.ts +19 -0
- package/src/server/prebuilt/slots.ts +5 -6
- package/src/server/prebuilt-builder.ts +3 -2
- package/src/server/prebuilt-runtime.ts +174 -176
- package/src/server/render-timeout.ts +12 -17
- package/src/server/rsc-entry/action-dispatcher.ts +3 -1
- package/src/server/rsc-entry/index.ts +47 -13
- package/src/server/ssr-render.ts +9 -11
- package/dist/_chunks/cache-api-LA3sBpUS.js.map +0 -1
- package/dist/_chunks/dev-server-DkytOEG2.js +0 -1
- package/dist/_chunks/error-boundary-xxxLtXt6.js.map +0 -1
- package/dist/_chunks/flight-source-node-0dE-t3kq.js.map +0 -1
- package/dist/_chunks/node-response-Dibufw_b.js.map +0 -1
- package/dist/_chunks/purge-store-Byr8XOjU.js.map +0 -1
- package/dist/_chunks/render-timeout-DOf_BBcO.js.map +0 -1
package/dist/client/internal.js
CHANGED
|
@@ -4,7 +4,7 @@ import { c as cachedSearchParams, s as cachedSearch, t as _setCachedSearch } fro
|
|
|
4
4
|
import { a as setGlobalRouter, i as getRouterOrNull, r as getRouter } from "../_chunks/navigation-root-BQfo1-kG.js";
|
|
5
5
|
import { n as registerSsrDataProvider, t as getSsrData } from "../_chunks/ssr-data-nA3I70_n.js";
|
|
6
6
|
import { i as useNavigationContext, n as useSegmentContext, r as NavigationProvider, t as SegmentProvider } from "../_chunks/segment-context-xtPUGfdq.js";
|
|
7
|
-
import { a as createSpaExits, c as
|
|
7
|
+
import { a as createSpaExits, c as createRenderOwner, d as fetchRscPayload, f as readPayloadTree, i as createScrollEffects, l as isClientStale, n as TimberErrorBoundary, o as runAsHandle, p as readPublishedParams, r as createNavigationRecovery, s as recordSkew, u as NonRscResponse } from "../_chunks/error-boundary-Bc8QPZuq.js";
|
|
8
8
|
import { t as bindUseQueryStates } from "../_chunks/use-query-states-I3JMng6J.js";
|
|
9
9
|
//#region src/client/history.ts
|
|
10
10
|
/**
|
|
@@ -70,31 +70,6 @@ var HistoryStack = class {
|
|
|
70
70
|
}
|
|
71
71
|
};
|
|
72
72
|
//#endregion
|
|
73
|
-
//#region src/client/navigation-transition.ts
|
|
74
|
-
/**
|
|
75
|
-
* Create a fresh RenderOwner. Exported so tests that call
|
|
76
|
-
* `navigateTransition` directly can construct one without a router.
|
|
77
|
-
*/
|
|
78
|
-
function createRenderOwner(kind) {
|
|
79
|
-
let resolveDisplaced;
|
|
80
|
-
const displaced = new Promise((r) => {
|
|
81
|
-
resolveDisplaced = r;
|
|
82
|
-
});
|
|
83
|
-
const owner = {
|
|
84
|
-
kind,
|
|
85
|
-
fetchAbort: new AbortController(),
|
|
86
|
-
handedOff: false,
|
|
87
|
-
outcome: null,
|
|
88
|
-
displaced,
|
|
89
|
-
settle(outcome) {
|
|
90
|
-
if (owner.outcome === null) owner.outcome = outcome;
|
|
91
|
-
else if (outcome === "superseded" && owner.outcome === "committed") owner.outcome = "superseded";
|
|
92
|
-
if (outcome !== "committed") resolveDisplaced();
|
|
93
|
-
}
|
|
94
|
-
};
|
|
95
|
-
return owner;
|
|
96
|
-
}
|
|
97
|
-
//#endregion
|
|
98
73
|
//#region src/client/router-lifecycle.ts
|
|
99
74
|
/**
|
|
100
75
|
* Navigation Lifecycle — who owns the router, and when a fetch may be cut.
|
|
@@ -392,13 +367,13 @@ function createNavigationPipeline({ deps, prefetchCache, currentStateTree, prepa
|
|
|
392
367
|
* the far side of the supersession check, which only NavigationRoot can
|
|
393
368
|
* make (TIM-1301).
|
|
394
369
|
*/
|
|
395
|
-
|
|
370
|
+
function renderViaTransition(url, owner, types, perform) {
|
|
396
371
|
const handOff = () => markHandedOff(owner);
|
|
397
372
|
const commitAndForget = (commit) => () => {
|
|
398
373
|
forgetOlderHandoffs(owner);
|
|
399
374
|
commit();
|
|
400
375
|
};
|
|
401
|
-
|
|
376
|
+
return deps.navigateTransition(url, owner, types, async (wrapPayload) => {
|
|
402
377
|
const result = await perform();
|
|
403
378
|
const params = await result.params;
|
|
404
379
|
const payload = await result.payload;
|
|
@@ -419,7 +394,7 @@ function createNavigationPipeline({ deps, prefetchCache, currentStateTree, prepa
|
|
|
419
394
|
decodePromise: observeSkew(result.decodePromise),
|
|
420
395
|
commit: commitAndForget(result.commit)
|
|
421
396
|
};
|
|
422
|
-
}
|
|
397
|
+
});
|
|
423
398
|
}
|
|
424
399
|
/**
|
|
425
400
|
* Fetch (or take from the prefetch cache) a navigation's payload and
|
|
@@ -541,15 +516,16 @@ function createRouter(deps) {
|
|
|
541
516
|
const recoverFromNavigationError = createNavigationRecovery({
|
|
542
517
|
currentOwner,
|
|
543
518
|
leaveSpaIfOwned,
|
|
544
|
-
navigate: (url, { types, replace, scroll
|
|
519
|
+
navigate: (url, { types, replace, scroll }) => navigate(url, {
|
|
545
520
|
replace,
|
|
546
521
|
scroll,
|
|
547
|
-
_renderTypes: types
|
|
548
|
-
onCommit,
|
|
549
|
-
onHandOff
|
|
522
|
+
_renderTypes: types
|
|
550
523
|
})
|
|
551
524
|
});
|
|
552
|
-
|
|
525
|
+
function navigate(url, options = {}) {
|
|
526
|
+
return runAsHandle((endings) => navigateWith(url, options, endings));
|
|
527
|
+
}
|
|
528
|
+
async function navigateWith(url, options, endings) {
|
|
553
529
|
const scroll = options.scroll !== false;
|
|
554
530
|
const replace = options.replace === true;
|
|
555
531
|
const types = options._renderTypes ?? ["navigation-forward", ...options.transitionTypes ?? []];
|
|
@@ -564,25 +540,24 @@ function createRouter(deps) {
|
|
|
564
540
|
scrollY: currentScrollY
|
|
565
541
|
}, "", deps.getCurrentUrl());
|
|
566
542
|
if (isClientStale()) await leaveSpaSuperseding(url, departingUrl);
|
|
567
|
-
const heldCommit = holdCommit(options.onCommit);
|
|
568
543
|
await runNavigation(url, async (owner) => {
|
|
569
544
|
try {
|
|
570
|
-
|
|
545
|
+
const render = renderViaTransition(fetchUrl, owner, types, () => performNavigationFetch(fetchUrl, {
|
|
571
546
|
replace,
|
|
572
547
|
commitUrl: url,
|
|
573
548
|
signal: owner.fetchAbort.signal,
|
|
574
549
|
departingUrl
|
|
575
|
-
})
|
|
550
|
+
}));
|
|
551
|
+
endings.track(render);
|
|
552
|
+
await render;
|
|
576
553
|
if (scroll && hash) scrollToHashAfterPaint(hash);
|
|
577
554
|
else restoreScrollAfterPaint(scroll ? 0 : currentScrollY);
|
|
578
555
|
} catch (error) {
|
|
579
556
|
if (await recoverFromNavigationError(error, owner, url, departingUrl, {
|
|
580
557
|
types,
|
|
581
558
|
replace,
|
|
582
|
-
scroll
|
|
583
|
-
|
|
584
|
-
onHandOff: options.onHandOff
|
|
585
|
-
})) return;
|
|
559
|
+
scroll
|
|
560
|
+
}, endings)) return;
|
|
586
561
|
throw error;
|
|
587
562
|
}
|
|
588
563
|
});
|
|
@@ -596,11 +571,10 @@ function createRouter(deps) {
|
|
|
596
571
|
* (there is no link to have hovered) and neither moves the address bar (the
|
|
597
572
|
* browser is already where it is going), so the fetch is a plain one.
|
|
598
573
|
*/
|
|
599
|
-
async function fetchCommitAndRender(url, type, opts = {}) {
|
|
600
|
-
const heldCommit = holdCommit(opts.onCommit);
|
|
574
|
+
async function fetchCommitAndRender(url, type, endings, opts = {}) {
|
|
601
575
|
await runNavigation(url, async (owner) => {
|
|
602
576
|
try {
|
|
603
|
-
|
|
577
|
+
const render = renderViaTransition(url, owner, [type], async () => {
|
|
604
578
|
const result = await fetchRscPayload(url, deps, opts.stateTree, void 0, owner.fetchAbort.signal);
|
|
605
579
|
const params = await result.params;
|
|
606
580
|
const { navState, commit } = prepareNavigation(url, {
|
|
@@ -615,23 +589,27 @@ function createRouter(deps) {
|
|
|
615
589
|
navState,
|
|
616
590
|
commit
|
|
617
591
|
};
|
|
618
|
-
}
|
|
592
|
+
});
|
|
593
|
+
endings.track(render);
|
|
594
|
+
await render;
|
|
619
595
|
} catch (error) {
|
|
620
596
|
if (await recoverFromNavigationError(error, owner, url, url, {
|
|
621
597
|
types: [type],
|
|
622
598
|
replace: true,
|
|
623
|
-
scroll: true
|
|
624
|
-
|
|
625
|
-
})) return;
|
|
599
|
+
scroll: true
|
|
600
|
+
}, endings)) return;
|
|
626
601
|
throw error;
|
|
627
602
|
}
|
|
628
603
|
if (opts.scrollY !== void 0) restoreScrollAfterPaint(opts.scrollY);
|
|
629
604
|
}, opts.externalSignal);
|
|
630
605
|
}
|
|
631
|
-
|
|
606
|
+
function refresh(options = {}) {
|
|
607
|
+
return runAsHandle((endings) => refreshWith(options, endings));
|
|
608
|
+
}
|
|
609
|
+
async function refreshWith(options, endings) {
|
|
632
610
|
const currentUrl = deps.getCurrentUrl();
|
|
633
611
|
if (isClientStale()) await leaveSpaSuperseding(currentUrl, currentUrl);
|
|
634
|
-
await fetchCommitAndRender(currentUrl, options.transitionType ?? "refresh",
|
|
612
|
+
await fetchCommitAndRender(currentUrl, options.transitionType ?? "refresh", endings);
|
|
635
613
|
}
|
|
636
614
|
async function handlePopState(url, scrollY = 0, externalSignal, direction = "navigation-traverse") {
|
|
637
615
|
if (isClientStale()) await leaveSpaSuperseding(url, url);
|
|
@@ -656,11 +634,11 @@ function createRouter(deps) {
|
|
|
656
634
|
});
|
|
657
635
|
restoreScrollAfterPaint(scrollY);
|
|
658
636
|
}, externalSignal);
|
|
659
|
-
else await fetchCommitAndRender(url, direction, {
|
|
637
|
+
else await runAsHandle((endings) => fetchCommitAndRender(url, direction, endings, {
|
|
660
638
|
stateTree: currentStateTree(),
|
|
661
639
|
scrollY,
|
|
662
640
|
externalSignal
|
|
663
|
-
});
|
|
641
|
+
}));
|
|
664
642
|
}
|
|
665
643
|
/**
|
|
666
644
|
* Prefetch an RSC payload for a URL and store it in the prefetch cache.
|
|
@@ -696,23 +674,17 @@ function createRouter(deps) {
|
|
|
696
674
|
async applyActionResult(epoch, tree) {
|
|
697
675
|
if (!lifecycle.isEpochCurrent(epoch)) return false;
|
|
698
676
|
if (tree === void 0) {
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
transitionType: "revalidate",
|
|
703
|
-
onCommit: outcomeResolve
|
|
704
|
-
}).catch(() => {}), outcomePromise]);
|
|
705
|
-
return outcome === "committed";
|
|
677
|
+
const refreshed = refresh({ transitionType: "revalidate" });
|
|
678
|
+
await refreshed.catch(() => {});
|
|
679
|
+
return await refreshed.committed === "committed";
|
|
706
680
|
}
|
|
707
681
|
const currentUrl = deps.getCurrentUrl();
|
|
708
682
|
const payloadTree = readPayloadTree(tree);
|
|
709
683
|
const params = readPublishedParams(tree);
|
|
710
684
|
const segmentInfo = committedSegmentInfo();
|
|
711
|
-
let outcomeResolve;
|
|
712
|
-
const outcomePromise = new Promise((r) => outcomeResolve = r);
|
|
713
685
|
const owner = createRenderOwner("revalidation");
|
|
714
686
|
lifecycle.placeRevalidationOwner(owner);
|
|
715
|
-
const
|
|
687
|
+
const render = renderViaTransition(currentUrl, owner, ["revalidate"], async () => {
|
|
716
688
|
const { navState, commit } = prepareNavigation(currentUrl, {
|
|
717
689
|
payload: payloadTree,
|
|
718
690
|
params,
|
|
@@ -727,8 +699,9 @@ function createRouter(deps) {
|
|
|
727
699
|
segmentInfo,
|
|
728
700
|
skippedSegments: null
|
|
729
701
|
};
|
|
730
|
-
}
|
|
731
|
-
|
|
702
|
+
});
|
|
703
|
+
await render.catch(() => {});
|
|
704
|
+
return await render.committed === "committed";
|
|
732
705
|
},
|
|
733
706
|
runWhenIdle: (task) => lifecycle.runWhenIdle(task),
|
|
734
707
|
onIdle: (listener) => lifecycle.onIdle(listener),
|