@timber-js/app 0.2.0-alpha.220 → 0.2.0-alpha.222

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.
Files changed (236) hide show
  1. package/dist/_chunks/{actions-BwkmAYXq.js → actions-vBHr2vqd.js} +3 -3
  2. package/dist/_chunks/{actions-BwkmAYXq.js.map → actions-vBHr2vqd.js.map} +1 -1
  3. package/dist/_chunks/{cache-api-LA3sBpUS.js → cache-api-DdcDLpBj.js} +72 -145
  4. package/dist/_chunks/cache-api-DdcDLpBj.js.map +1 -0
  5. package/dist/_chunks/chains-B8TCLved.js +1 -0
  6. package/dist/_chunks/{chains-e_Buf9vg.js → chains-BchW_AtW.js} +2 -2
  7. package/dist/_chunks/{chains-e_Buf9vg.js.map → chains-BchW_AtW.js.map} +1 -1
  8. package/dist/_chunks/{classify-2Yp3xJY1.js → classify-IqzMpxMs.js} +2 -2
  9. package/dist/_chunks/{classify-2Yp3xJY1.js.map → classify-IqzMpxMs.js.map} +1 -1
  10. package/dist/_chunks/{cli-check-DDwCkeDY.js → cli-check-DQne_YhU.js} +3 -3
  11. package/dist/_chunks/{cli-check-DDwCkeDY.js.map → cli-check-DQne_YhU.js.map} +1 -1
  12. package/dist/_chunks/{cli-schema-sync-BdIebmk3.js → cli-schema-sync-BS-RFGE2.js} +2 -2
  13. package/dist/_chunks/{cli-schema-sync-BdIebmk3.js.map → cli-schema-sync-BS-RFGE2.js.map} +1 -1
  14. package/dist/_chunks/{cli-schema-sync-CLNfXQDK.js → cli-schema-sync-v872sHms.js} +1 -1
  15. package/dist/_chunks/{client-dep-entries-BOkpKjj1.js → client-dep-entries-BJyP9SIu.js} +2 -2
  16. package/dist/_chunks/{client-dep-entries-BOkpKjj1.js.map → client-dep-entries-BJyP9SIu.js.map} +1 -1
  17. package/dist/_chunks/{convention-lint-ByKJ6aqD.js → convention-lint-VwzrtjIt.js} +3 -3
  18. package/dist/_chunks/{convention-lint-ByKJ6aqD.js.map → convention-lint-VwzrtjIt.js.map} +1 -1
  19. package/dist/_chunks/{dev-server-DnODXuNM.js → dev-server-BNr5drEO.js} +57 -8
  20. package/dist/_chunks/dev-server-BNr5drEO.js.map +1 -0
  21. package/dist/_chunks/dev-server-CUg7Mqh_.js +1 -0
  22. package/dist/_chunks/dev-store-BOa304m_.js +283 -0
  23. package/dist/_chunks/dev-store-BOa304m_.js.map +1 -0
  24. package/dist/_chunks/{error-boundary-xxxLtXt6.js → error-boundary-Bc8QPZuq.js} +71 -21
  25. package/dist/_chunks/error-boundary-Bc8QPZuq.js.map +1 -0
  26. package/dist/_chunks/{flight-source-node-0dE-t3kq.js → flight-source-node-BdHUOUqg.js} +6 -7
  27. package/dist/_chunks/flight-source-node-BdHUOUqg.js.map +1 -0
  28. package/dist/_chunks/global-context-B9PFncvb.js +48 -0
  29. package/dist/_chunks/global-context-B9PFncvb.js.map +1 -0
  30. package/dist/_chunks/{json-lossy-check-C8zBY2uZ.js → json-lossy-check-C3Sht92C.js} +2 -2
  31. package/dist/_chunks/{json-lossy-check-C8zBY2uZ.js.map → json-lossy-check-C3Sht92C.js.map} +1 -1
  32. package/dist/_chunks/{live-graph-tSWrv8eH.js → live-graph-DEu_GWbc.js} +4 -4
  33. package/dist/_chunks/{live-graph-tSWrv8eH.js.map → live-graph-DEu_GWbc.js.map} +1 -1
  34. package/dist/_chunks/{logger-CbLdcy-W.js → logger-CI_hThfy.js} +10 -2
  35. package/dist/_chunks/{logger-CbLdcy-W.js.map → logger-CI_hThfy.js.map} +1 -1
  36. package/dist/_chunks/{node-response-Dibufw_b.js → node-response-bF0bKoig.js} +49 -3
  37. package/dist/_chunks/node-response-bF0bKoig.js.map +1 -0
  38. package/dist/_chunks/{poison-scan-C4FgMxFl.js → poison-scan-DTWIfNgD.js} +2 -2
  39. package/dist/_chunks/{poison-scan-C4FgMxFl.js.map → poison-scan-DTWIfNgD.js.map} +1 -1
  40. package/dist/_chunks/{purge-store-Byr8XOjU.js → purge-store-WZaxu-3m.js} +2 -2
  41. package/dist/_chunks/purge-store-WZaxu-3m.js.map +1 -0
  42. package/dist/_chunks/{render-timeout-DOf_BBcO.js → render-timeout-Ln_u7fX-.js} +19 -11
  43. package/dist/_chunks/render-timeout-Ln_u7fX-.js.map +1 -0
  44. package/dist/_chunks/{resolve-schema-CBR6Lm4i.js → resolve-schema-CkAInout.js} +2 -2
  45. package/dist/_chunks/{resolve-schema-CBR6Lm4i.js.map → resolve-schema-CkAInout.js.map} +1 -1
  46. package/dist/_chunks/{scanner-Cb3fSjAC.js → scanner-C8fdKvKG.js} +2 -2
  47. package/dist/_chunks/{scanner-Cb3fSjAC.js.map → scanner-C8fdKvKG.js.map} +1 -1
  48. package/dist/_chunks/{schema-bridge-C83xa9lT.js → schema-bridge-DpOmvZlI.js} +60 -23
  49. package/dist/_chunks/schema-bridge-DpOmvZlI.js.map +1 -0
  50. package/dist/_chunks/{segment-context-xtPUGfdq.js → segment-context-D3DNxKFq.js} +4 -8
  51. package/dist/_chunks/segment-context-D3DNxKFq.js.map +1 -0
  52. package/dist/_chunks/{sizeof-QPE5nd3u.js → sizeof-CO3dk0V1.js} +2 -2
  53. package/dist/_chunks/{sizeof-QPE5nd3u.js.map → sizeof-CO3dk0V1.js.map} +1 -1
  54. package/dist/_chunks/{walkers-qu8TpiLh.js → walkers-BqzxnwGC.js} +3 -3
  55. package/dist/_chunks/{walkers-qu8TpiLh.js.map → walkers-BqzxnwGC.js.map} +1 -1
  56. package/dist/adapters/cloudflare-kv-cache.js +1 -1
  57. package/dist/analyze/crawl-entry.js +3 -3
  58. package/dist/analyze/graph-command.js +2 -2
  59. package/dist/cache/cache-api.d.ts.map +1 -1
  60. package/dist/cache/guarded-read.d.ts +29 -0
  61. package/dist/cache/guarded-read.d.ts.map +1 -0
  62. package/dist/cache/handler-store.d.ts +13 -1
  63. package/dist/cache/handler-store.d.ts.map +1 -1
  64. package/dist/cache/index.js +3 -2
  65. package/dist/cache/invalidation-epoch.d.ts +7 -0
  66. package/dist/cache/invalidation-epoch.d.ts.map +1 -1
  67. package/dist/cache/stores/memory.js +1 -1
  68. package/dist/cache/timber-cache.d.ts.map +1 -1
  69. package/dist/cdn/index.js +1 -1
  70. package/dist/cdn/purge-store.d.ts +10 -1
  71. package/dist/cdn/purge-store.d.ts.map +1 -1
  72. package/dist/cli.js +3 -3
  73. package/dist/client/browser-entry/router-init.d.ts.map +1 -1
  74. package/dist/client/error-boundary.js +1 -1
  75. package/dist/client/global-context.d.ts +21 -1
  76. package/dist/client/global-context.d.ts.map +1 -1
  77. package/dist/client/index.js +9 -27
  78. package/dist/client/index.js.map +1 -1
  79. package/dist/client/internal.js +38 -65
  80. package/dist/client/internal.js.map +1 -1
  81. package/dist/client/link.d.ts.map +1 -1
  82. package/dist/client/navigation-context.d.ts.map +1 -1
  83. package/dist/client/navigation-transition.d.ts +68 -14
  84. package/dist/client/navigation-transition.d.ts.map +1 -1
  85. package/dist/client/params-context.d.ts.map +1 -1
  86. package/dist/client/router-effects.d.ts +35 -31
  87. package/dist/client/router-effects.d.ts.map +1 -1
  88. package/dist/client/router-pipeline.d.ts +2 -6
  89. package/dist/client/router-pipeline.d.ts.map +1 -1
  90. package/dist/client/router-types.d.ts +10 -30
  91. package/dist/client/router-types.d.ts.map +1 -1
  92. package/dist/client/router.d.ts.map +1 -1
  93. package/dist/client/slot-context.d.ts +2 -2
  94. package/dist/client/slot-context.d.ts.map +1 -1
  95. package/dist/codec.js +1 -1
  96. package/dist/cookies/index.js +1 -1
  97. package/dist/dev-tools/logs.d.ts +2 -2
  98. package/dist/dev-tools/logs.d.ts.map +1 -1
  99. package/dist/index.js +149 -56
  100. package/dist/index.js.map +1 -1
  101. package/dist/params/index.js +1 -1
  102. package/dist/plugins/dev-server.d.ts +1 -1
  103. package/dist/plugins/dev-server.d.ts.map +1 -1
  104. package/dist/plugins/dev-store-clear.d.ts +28 -0
  105. package/dist/plugins/dev-store-clear.d.ts.map +1 -0
  106. package/dist/plugins/entries.d.ts +5 -0
  107. package/dist/plugins/entries.d.ts.map +1 -1
  108. package/dist/plugins/orphaned-modules.d.ts +57 -0
  109. package/dist/plugins/orphaned-modules.d.ts.map +1 -0
  110. package/dist/plugins/prebuilt.d.ts +6 -6
  111. package/dist/plugins/prerender-sugar.d.ts.map +1 -1
  112. package/dist/plugins/routing.d.ts +1 -1
  113. package/dist/plugins/routing.d.ts.map +1 -1
  114. package/dist/routing/index.js +2 -2
  115. package/dist/rsc-runtime/dev-reference-cache.d.ts +47 -0
  116. package/dist/rsc-runtime/dev-reference-cache.d.ts.map +1 -0
  117. package/dist/rsc-runtime/rsc.d.ts +0 -15
  118. package/dist/rsc-runtime/rsc.d.ts.map +1 -1
  119. package/dist/rsc-runtime/ssr.d.ts +0 -11
  120. package/dist/rsc-runtime/ssr.d.ts.map +1 -1
  121. package/dist/schema-bridge.d.ts +28 -19
  122. package/dist/schema-bridge.d.ts.map +1 -1
  123. package/dist/search-params/define.d.ts +1 -1
  124. package/dist/search-params/define.d.ts.map +1 -1
  125. package/dist/search-params/index.js +7 -8
  126. package/dist/search-params/index.js.map +1 -1
  127. package/dist/search-params/wrappers.d.ts +3 -3
  128. package/dist/server/abort-scope.d.ts +27 -0
  129. package/dist/server/abort-scope.d.ts.map +1 -0
  130. package/dist/server/flight-source-node.d.ts.map +1 -1
  131. package/dist/server/index.js +2 -2
  132. package/dist/server/instrumentation.d.ts +2 -1
  133. package/dist/server/instrumentation.d.ts.map +1 -1
  134. package/dist/server/internal.d.ts +1 -1
  135. package/dist/server/internal.d.ts.map +1 -1
  136. package/dist/server/internal.js +350 -151
  137. package/dist/server/internal.js.map +1 -1
  138. package/dist/server/logger.d.ts +9 -0
  139. package/dist/server/logger.d.ts.map +1 -1
  140. package/dist/server/pipeline-helpers.d.ts.map +1 -1
  141. package/dist/server/pipeline.d.ts +10 -7
  142. package/dist/server/pipeline.d.ts.map +1 -1
  143. package/dist/server/prebuilt/cache-key.d.ts +26 -0
  144. package/dist/server/prebuilt/cache-key.d.ts.map +1 -1
  145. package/dist/server/prebuilt/capture-render.d.ts +9 -4
  146. package/dist/server/prebuilt/capture-render.d.ts.map +1 -1
  147. package/dist/server/prebuilt/capture-routes.d.ts +1 -1
  148. package/dist/server/prebuilt/dev-store.d.ts +103 -0
  149. package/dist/server/prebuilt/dev-store.d.ts.map +1 -0
  150. package/dist/server/prebuilt/overlay.d.ts +14 -3
  151. package/dist/server/prebuilt/overlay.d.ts.map +1 -1
  152. package/dist/server/prebuilt/payload-source.d.ts +8 -0
  153. package/dist/server/prebuilt/payload-source.d.ts.map +1 -1
  154. package/dist/server/prebuilt/slots.d.ts +5 -6
  155. package/dist/server/prebuilt/slots.d.ts.map +1 -1
  156. package/dist/server/prebuilt-builder.d.ts.map +1 -1
  157. package/dist/server/prebuilt-runtime.d.ts +5 -10
  158. package/dist/server/prebuilt-runtime.d.ts.map +1 -1
  159. package/dist/server/render-timeout.d.ts.map +1 -1
  160. package/dist/server/rsc-entry/action-dispatcher.d.ts.map +1 -1
  161. package/dist/server/rsc-entry/index.d.ts.map +1 -1
  162. package/dist/server/ssr-render.d.ts.map +1 -1
  163. package/docs/api/32-api-cache.mdx +2 -0
  164. package/docs/api/33-api-search-params.mdx +3 -1
  165. package/docs/learn/06-typed-params.mdx +2 -2
  166. package/docs/learn/10-caching.mdx +12 -0
  167. package/docs/learn/11-middleware.mdx +2 -0
  168. package/package.json +1 -1
  169. package/src/cache/cache-api.ts +7 -1
  170. package/src/cache/guarded-read.ts +44 -0
  171. package/src/cache/handler-store.ts +38 -1
  172. package/src/cache/invalidation-epoch.ts +18 -6
  173. package/src/cache/timber-cache.ts +9 -3
  174. package/src/cdn/purge-store.ts +29 -1
  175. package/src/client/browser-entry/action-dispatch.ts +5 -5
  176. package/src/client/browser-entry/router-init.ts +2 -4
  177. package/src/client/global-context.ts +42 -14
  178. package/src/client/link.tsx +14 -18
  179. package/src/client/navigation-context.ts +4 -11
  180. package/src/client/navigation-transition.ts +86 -33
  181. package/src/client/params-context.ts +5 -17
  182. package/src/client/router-effects.ts +70 -45
  183. package/src/client/router-lifecycle.ts +1 -1
  184. package/src/client/router-pipeline.ts +52 -65
  185. package/src/client/router-types.ts +11 -31
  186. package/src/client/router.ts +98 -104
  187. package/src/client/segment-update-context.ts +1 -1
  188. package/src/client/slot-content-cache-context.ts +1 -1
  189. package/src/client/slot-context.ts +6 -17
  190. package/src/dev-tools/logs.ts +76 -50
  191. package/src/plugins/dev-server.ts +58 -9
  192. package/src/plugins/dev-store-clear.ts +47 -0
  193. package/src/plugins/entries.ts +6 -0
  194. package/src/plugins/orphaned-modules.ts +78 -0
  195. package/src/plugins/prebuilt.ts +17 -17
  196. package/src/plugins/prerender-sugar.ts +38 -6
  197. package/src/plugins/routing.ts +23 -1
  198. package/src/rsc-runtime/dev-reference-cache.ts +115 -0
  199. package/src/rsc-runtime/rsc.ts +10 -0
  200. package/src/rsc-runtime/ssr.ts +10 -0
  201. package/src/rsc-runtime/vendor-types.d.ts +8 -0
  202. package/src/schema-bridge.ts +93 -38
  203. package/src/search-params/define.ts +5 -6
  204. package/src/search-params/wrappers.ts +3 -3
  205. package/src/server/abort-scope.ts +49 -0
  206. package/src/server/action-handler.ts +18 -2
  207. package/src/server/flight-source-node.ts +5 -4
  208. package/src/server/instrumentation.ts +32 -8
  209. package/src/server/internal.ts +1 -6
  210. package/src/server/logger.ts +9 -0
  211. package/src/server/pipeline-helpers.ts +5 -3
  212. package/src/server/pipeline.ts +31 -20
  213. package/src/server/prebuilt/cache-key.ts +41 -0
  214. package/src/server/prebuilt/capture-render.ts +10 -6
  215. package/src/server/prebuilt/capture-routes.ts +1 -1
  216. package/src/server/prebuilt/dev-store.ts +173 -0
  217. package/src/server/prebuilt/overlay.ts +21 -5
  218. package/src/server/prebuilt/payload-source.ts +19 -0
  219. package/src/server/prebuilt/slots.ts +5 -6
  220. package/src/server/prebuilt-builder.ts +3 -2
  221. package/src/server/prebuilt-runtime.ts +194 -177
  222. package/src/server/render-timeout.ts +12 -17
  223. package/src/server/rsc-entry/action-dispatcher.ts +3 -1
  224. package/src/server/rsc-entry/index.ts +47 -13
  225. package/src/server/ssr-render.ts +9 -11
  226. package/dist/_chunks/cache-api-LA3sBpUS.js.map +0 -1
  227. package/dist/_chunks/chains-CDK1AWZQ.js +0 -1
  228. package/dist/_chunks/dev-server-DkytOEG2.js +0 -1
  229. package/dist/_chunks/dev-server-DnODXuNM.js.map +0 -1
  230. package/dist/_chunks/error-boundary-xxxLtXt6.js.map +0 -1
  231. package/dist/_chunks/flight-source-node-0dE-t3kq.js.map +0 -1
  232. package/dist/_chunks/node-response-Dibufw_b.js.map +0 -1
  233. package/dist/_chunks/purge-store-Byr8XOjU.js.map +0 -1
  234. package/dist/_chunks/render-timeout-DOf_BBcO.js.map +0 -1
  235. package/dist/_chunks/schema-bridge-C83xa9lT.js.map +0 -1
  236. package/dist/_chunks/segment-context-xtPUGfdq.js.map +0 -1
@@ -3,8 +3,8 @@ import { a as routerUrlKey, c as prefetchScopeOf, i as parseRouterUrl, n as crea
3
3
  import { c as cachedSearchParams, s as cachedSearch, t as _setCachedSearch } from "../_chunks/state-BhNGPsdi.js";
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
- 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 isClientStale, d as readPayloadTree, f as readPublishedParams, i as createScrollEffects, l as NonRscResponse, n as TimberErrorBoundary, o as holdCommit, r as createNavigationRecovery, s as recordSkew, u as fetchRscPayload } from "../_chunks/error-boundary-xxxLtXt6.js";
6
+ import { i as useNavigationContext, n as useSegmentContext, r as NavigationProvider, t as SegmentProvider } from "../_chunks/segment-context-D3DNxKFq.js";
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
- async function renderViaTransition(url, owner, types, perform, onCommit, onHandOff) {
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
- await deps.navigateTransition(url, owner, types, async (wrapPayload) => {
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
- }, onCommit, onHandOff);
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, onCommit, onHandOff }) => navigate(url, {
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
- async function navigate(url, options = {}) {
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
- await renderViaTransition(fetchUrl, owner, types, () => performNavigationFetch(fetchUrl, {
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
- }), heldCommit.transition, options.onHandOff);
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
- onCommit: heldCommit.settle,
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
- await renderViaTransition(url, owner, [type], async () => {
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
- }, heldCommit.transition);
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
- onCommit: heldCommit.settle
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
- async function refresh(options = {}) {
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", { onCommit: options.onCommit });
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
- let outcomeResolve;
700
- const outcomePromise = new Promise((r) => outcomeResolve = r);
701
- const [, outcome] = await Promise.all([refresh({
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 [, outcome] = await Promise.all([renderViaTransition(currentUrl, owner, ["revalidate"], async () => {
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
- }, outcomeResolve).catch(() => {}), outcomePromise]);
731
- return outcome === "committed";
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),