@timber-js/app 0.2.0-alpha.240 → 0.2.0-alpha.241
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-DIgnvDrG.js → actions-BCYVyoFl.js} +117 -11
- package/dist/_chunks/actions-BCYVyoFl.js.map +1 -0
- package/dist/_chunks/{als-registry-PPYstxK0.js → als-registry-fabsRnPY.js} +4 -2
- package/dist/_chunks/{als-registry-PPYstxK0.js.map → als-registry-fabsRnPY.js.map} +1 -1
- package/dist/_chunks/{als-slots-kbQrHTzm.js → als-slots-CVTF-AMz.js} +3 -3
- package/dist/_chunks/als-slots-CVTF-AMz.js.map +1 -0
- package/dist/_chunks/{cache-api-uWQwuxWb.js → cache-api-n5FL4wFs.js} +5 -5
- package/dist/_chunks/{cache-api-uWQwuxWb.js.map → cache-api-n5FL4wFs.js.map} +1 -1
- package/dist/_chunks/chains-DPZAMMav.js +1 -0
- package/dist/_chunks/{chains-C7CExrUI.js → chains-IswOWMnq.js} +2 -2
- package/dist/_chunks/{chains-C7CExrUI.js.map → chains-IswOWMnq.js.map} +1 -1
- package/dist/_chunks/{classify-Cj9EeZoL.js → classify-B08RCF6s.js} +2 -2
- package/dist/_chunks/{classify-Cj9EeZoL.js.map → classify-B08RCF6s.js.map} +1 -1
- package/dist/_chunks/{cli-check-C3QOAru7.js → cli-check-tpFb6pBU.js} +7 -6
- package/dist/_chunks/cli-check-tpFb6pBU.js.map +1 -0
- package/dist/_chunks/{cli-schema-sync-BRxZz66D.js → cli-schema-sync-C0pXBtzG.js} +1 -1
- package/dist/_chunks/{cli-schema-sync-DQUS_o3V.js → cli-schema-sync-DRNJutey.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-DQUS_o3V.js.map → cli-schema-sync-DRNJutey.js.map} +1 -1
- package/dist/_chunks/{client-dep-entries-ZETBdLgv.js → client-dep-entries-Dw5Dvatr.js} +2 -2
- package/dist/_chunks/{client-dep-entries-ZETBdLgv.js.map → client-dep-entries-Dw5Dvatr.js.map} +1 -1
- package/dist/_chunks/{cloudflare-Dk5Hqo-O.js → cloudflare-9dbhVOxS.js} +2 -2
- package/dist/_chunks/{cloudflare-Dk5Hqo-O.js.map → cloudflare-9dbhVOxS.js.map} +1 -1
- package/dist/_chunks/{convention-lint-BoVISNS6.js → convention-lint-BfC_dAhZ.js} +364 -10
- package/dist/_chunks/convention-lint-BfC_dAhZ.js.map +1 -0
- package/dist/_chunks/dev-server-3DNTXQV-.js +1 -0
- package/dist/_chunks/{dev-server-C5R6jx8Q.js → dev-server-3R6Bl9_R.js} +9 -2
- package/dist/_chunks/dev-server-3R6Bl9_R.js.map +1 -0
- package/dist/_chunks/{dist-C1Rjlo6s.js → dist-GyaJm4GA.js} +18 -2
- package/dist/_chunks/dist-GyaJm4GA.js.map +1 -0
- package/dist/_chunks/{error-boundary-DB51f9ih.js → error-boundary-Dfhxigko.js} +8 -4
- package/dist/_chunks/error-boundary-Dfhxigko.js.map +1 -0
- package/dist/_chunks/{flight-source-node-D9cHBhjP.js → flight-source-node-QOpWZATb.js} +2 -2
- package/dist/_chunks/{flight-source-node-D9cHBhjP.js.map → flight-source-node-QOpWZATb.js.map} +1 -1
- package/dist/_chunks/{json-lossy-check-Y1GxqVX_.js → json-lossy-check-5KFcC1yt.js} +2 -2
- package/dist/_chunks/{json-lossy-check-Y1GxqVX_.js.map → json-lossy-check-5KFcC1yt.js.map} +1 -1
- package/dist/_chunks/{live-graph-BDQWvnMm.js → live-graph-D1dfVqoT.js} +4 -4
- package/dist/_chunks/{live-graph-BDQWvnMm.js.map → live-graph-D1dfVqoT.js.map} +1 -1
- package/dist/_chunks/{logger-DmRR9tmZ.js → logger-BvGxPd1e.js} +2 -2
- package/dist/_chunks/{logger-DmRR9tmZ.js.map → logger-BvGxPd1e.js.map} +1 -1
- package/dist/_chunks/metadata-routes-MXNjWOt5.js.map +1 -1
- package/dist/_chunks/{node-response-yp8zdyRp.js → node-response-D5cfiyWP.js} +2 -2
- package/dist/_chunks/{node-response-yp8zdyRp.js.map → node-response-D5cfiyWP.js.map} +1 -1
- package/dist/_chunks/{poison-scan-WQgUydF_.js → poison-scan-CX02ilxN.js} +2 -2
- package/dist/_chunks/{poison-scan-WQgUydF_.js.map → poison-scan-CX02ilxN.js.map} +1 -1
- package/dist/_chunks/{rsc-cache-key-D0cb0Gmc.js → rsc-cache-key-BGvUtMtN.js} +40 -4
- package/dist/_chunks/{rsc-cache-key-D0cb0Gmc.js.map → rsc-cache-key-BGvUtMtN.js.map} +1 -1
- package/dist/_chunks/{scanner-C9Lrf77z.js → scanner-DneYxQoY.js} +14 -81
- package/dist/_chunks/scanner-DneYxQoY.js.map +1 -0
- package/dist/_chunks/{sizeof-BISkSaU0.js → sizeof-BtQ3ErLf.js} +2 -2
- package/dist/_chunks/{sizeof-BISkSaU0.js.map → sizeof-BtQ3ErLf.js.map} +1 -1
- package/dist/_chunks/{walkers-Bxv4v7tX.js → walkers-C9R2A4jN.js} +3 -3
- package/dist/_chunks/{walkers-Bxv4v7tX.js.map → walkers-C9R2A4jN.js.map} +1 -1
- package/dist/adapters/cloudflare-dev.js +1 -1
- package/dist/adapters/cloudflare-kv-cache.js +2 -2
- package/dist/adapters/cloudflare.js +1 -1
- package/dist/analyze/crawl-entry.js +3 -3
- package/dist/analyze/graph-command.js +2 -2
- package/dist/cache/index.js +2 -2
- package/dist/cache/stores/memory.js +1 -1
- package/dist/cdn/workers-cache-purge.js +1 -1
- package/dist/cli-check.d.ts +3 -0
- package/dist/cli-check.d.ts.map +1 -1
- package/dist/cli.js +3 -3
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/index.js +1 -1
- package/dist/client/internal.js +3 -2
- package/dist/client/internal.js.map +1 -1
- package/dist/client/navigation-commit.d.ts +5 -0
- package/dist/client/navigation-commit.d.ts.map +1 -1
- package/dist/client/outlet-content-cache.d.ts +28 -7
- package/dist/client/outlet-content-cache.d.ts.map +1 -1
- package/dist/client/router.d.ts.map +1 -1
- package/dist/client/segment-outlet.d.ts +3 -1
- package/dist/client/segment-outlet.d.ts.map +1 -1
- package/dist/config-types.d.ts +24 -0
- package/dist/config-types.d.ts.map +1 -1
- package/dist/config-validation.d.ts.map +1 -1
- package/dist/cookies/define-cookie.d.ts.map +1 -1
- package/dist/cookies/index.js +5 -2
- package/dist/cookies/index.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +109 -25
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/cookies/define-cookie.js +6 -2
- package/dist/native/rsc/cookies/define-cookie.js.map +1 -1
- package/dist/native/rsc/manifest.json +10 -0
- package/dist/native/rsc/routing/segment-keys.js +11 -1
- package/dist/native/rsc/routing/segment-keys.js.map +1 -1
- package/dist/native/rsc/search-params/define.js +4 -1
- package/dist/native/rsc/search-params/define.js.map +1 -1
- package/dist/native/rsc/server/als-registry.js +2 -1
- package/dist/native/rsc/server/als-registry.js.map +1 -1
- package/dist/native/rsc/server/client-state-tree.js +14 -9
- package/dist/native/rsc/server/client-state-tree.js.map +1 -1
- package/dist/native/rsc/server/cookie-context.js +12 -0
- package/dist/native/rsc/server/cookie-context.js.map +1 -1
- package/dist/native/rsc/server/flight-source.js +5 -2
- package/dist/native/rsc/server/flight-source.js.map +1 -1
- package/dist/native/rsc/server/framework-stack-frames.js +18 -0
- package/dist/native/rsc/server/framework-stack-frames.js.map +1 -0
- package/dist/native/rsc/server/prebuilt-builder.js +15 -1
- package/dist/native/rsc/server/prebuilt-builder.js.map +1 -1
- package/dist/native/rsc/server/request-context.js +10 -4
- package/dist/native/rsc/server/request-context.js.map +1 -1
- package/dist/native/rsc/server/route-element-builder.js +25 -7
- package/dist/native/rsc/server/route-element-builder.js.map +1 -1
- package/dist/native/rsc/server/route-module-loader.js +14 -6
- package/dist/native/rsc/server/route-module-loader.js.map +1 -1
- package/dist/native/rsc/server/rsc-cache-key-guard.js +5 -1
- package/dist/native/rsc/server/rsc-cache-key-guard.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +8 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +8 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js.map +1 -1
- package/dist/native/rsc/server/segment-hash/outlet.js +28 -8
- package/dist/native/rsc/server/segment-hash/outlet.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/document-outlet.js +24 -0
- package/dist/native/rsc/server/segment-lifetime/document-outlet.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/key-digest.js +74 -0
- package/dist/native/rsc/server/segment-lifetime/key-digest.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/read-rule.js +56 -0
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/read-scope.js +40 -0
- package/dist/native/rsc/server/segment-lifetime/read-scope.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/segment-key.js +50 -0
- package/dist/native/rsc/server/segment-lifetime/segment-key.js.map +1 -0
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js +72 -0
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js.map +1 -0
- package/dist/native/rsc/server/slot-resolver.js +50 -26
- package/dist/native/rsc/server/slot-resolver.js.map +1 -1
- package/dist/native/rsc/server/slot-subtree-contain.js +17 -89
- package/dist/native/rsc/server/slot-subtree-contain.js.map +1 -1
- package/dist/native/rsc/server/subtree-walk.js +140 -0
- package/dist/native/rsc/server/subtree-walk.js.map +1 -0
- package/dist/native/rsc/shared/als-slots.js +2 -2
- package/dist/native/rsc/shared/als-slots.js.map +1 -1
- package/dist/native/rsc/shared/cookie-read-through.js +5 -0
- package/dist/native/rsc/shared/cookie-read-through.js.map +1 -0
- package/dist/native/rsc/shared/outlet-decision.js.map +1 -1
- package/dist/native/rsc/shared/route-options-export.js +8 -0
- package/dist/native/rsc/shared/route-options-export.js.map +1 -0
- package/dist/native/rsc/shared/rsc-cache-key.js +19 -3
- package/dist/native/rsc/shared/rsc-cache-key.js.map +1 -1
- package/dist/native/rsc/shims/headers.js +3 -4
- package/dist/native/rsc/shims/headers.js.map +1 -1
- package/dist/native/ssr/client/outlet-content-cache.js +17 -3
- package/dist/native/ssr/client/outlet-content-cache.js.map +1 -1
- package/dist/native/ssr/client/segment-outlet.js +3 -3
- package/dist/native/ssr/client/segment-outlet.js.map +1 -1
- package/dist/native/ssr/cookies/define-cookie.js +6 -2
- package/dist/native/ssr/cookies/define-cookie.js.map +1 -1
- package/dist/native/ssr/manifest.json +4 -0
- package/dist/native/ssr/search-params/define.js +4 -1
- package/dist/native/ssr/search-params/define.js.map +1 -1
- package/dist/native/ssr/server/als-registry.js +2 -1
- package/dist/native/ssr/server/als-registry.js.map +1 -1
- package/dist/native/ssr/server/client-state-tree.js +14 -9
- package/dist/native/ssr/server/client-state-tree.js.map +1 -1
- package/dist/native/ssr/server/cookie-context.js +12 -0
- package/dist/native/ssr/server/cookie-context.js.map +1 -1
- package/dist/native/ssr/server/flight-source.js +1 -0
- package/dist/native/ssr/server/flight-source.js.map +1 -1
- package/dist/native/ssr/server/framework-stack-frames.js +18 -0
- package/dist/native/ssr/server/framework-stack-frames.js.map +1 -0
- package/dist/native/ssr/server/request-context.js +10 -4
- package/dist/native/ssr/server/request-context.js.map +1 -1
- package/dist/native/ssr/server/rsc-cache-key-guard.js +5 -1
- package/dist/native/ssr/server/rsc-cache-key-guard.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/key-digest.js +6 -0
- package/dist/native/ssr/server/segment-lifetime/key-digest.js.map +1 -0
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +56 -0
- package/dist/native/ssr/server/segment-lifetime/read-rule.js.map +1 -0
- package/dist/native/ssr/shared/als-slots.js +2 -2
- package/dist/native/ssr/shared/als-slots.js.map +1 -1
- package/dist/native/ssr/shared/cookie-read-through.js +5 -0
- package/dist/native/ssr/shared/cookie-read-through.js.map +1 -0
- package/dist/native/ssr/shared/rsc-cache-key.js +19 -3
- package/dist/native/ssr/shared/rsc-cache-key.js.map +1 -1
- package/dist/native/ssr/shims/headers.js +3 -4
- package/dist/native/ssr/shims/headers.js.map +1 -1
- package/dist/plugins/callsite-jsx.d.ts +8 -1
- package/dist/plugins/callsite-jsx.d.ts.map +1 -1
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/plugins/prerender-sugar.d.ts +9 -8
- package/dist/plugins/prerender-sugar.d.ts.map +1 -1
- package/dist/plugins/routing.d.ts.map +1 -1
- package/dist/routing/convention-lint.d.ts +11 -3
- package/dist/routing/convention-lint.d.ts.map +1 -1
- package/dist/routing/export-detect.d.ts +50 -23
- package/dist/routing/export-detect.d.ts.map +1 -1
- package/dist/routing/index.js +2 -2
- package/dist/routing/route-options-lint.d.ts +36 -0
- package/dist/routing/route-options-lint.d.ts.map +1 -0
- package/dist/routing/route-options.d.ts +55 -0
- package/dist/routing/route-options.d.ts.map +1 -0
- package/dist/routing/segment-keys.d.ts +35 -0
- package/dist/routing/segment-keys.d.ts.map +1 -1
- package/dist/search-params/index.js +5 -2
- package/dist/search-params/index.js.map +1 -1
- package/dist/server/als-registry.d.ts +23 -0
- package/dist/server/als-registry.d.ts.map +1 -1
- package/dist/server/client-state-tree.d.ts +10 -3
- package/dist/server/client-state-tree.d.ts.map +1 -1
- package/dist/server/cookie-context.d.ts +3 -0
- package/dist/server/cookie-context.d.ts.map +1 -1
- package/dist/server/flight-source.d.ts +4 -1
- package/dist/server/flight-source.d.ts.map +1 -1
- package/dist/server/framework-stack-frames.d.ts +23 -0
- package/dist/server/framework-stack-frames.d.ts.map +1 -0
- package/dist/server/index.d.ts +1 -0
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +2 -2
- package/dist/server/internal.js +105 -21
- package/dist/server/internal.js.map +1 -1
- package/dist/server/prebuilt/capture-routes.d.ts +1 -1
- package/dist/server/prebuilt-builder.d.ts.map +1 -1
- package/dist/server/request-context.d.ts +6 -1
- package/dist/server/request-context.d.ts.map +1 -1
- package/dist/server/route-element-builder.d.ts.map +1 -1
- package/dist/server/route-module-loader.d.ts +10 -2
- package/dist/server/route-module-loader.d.ts.map +1 -1
- package/dist/server/rsc-cache-key-guard.d.ts +3 -1
- package/dist/server/rsc-cache-key-guard.d.ts.map +1 -1
- package/dist/server/rsc-entry/index.d.ts.map +1 -1
- package/dist/server/rsc-entry/render-route.d.ts +10 -0
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- package/dist/server/rsc-entry/revalidate-renderer.d.ts +12 -0
- package/dist/server/rsc-entry/revalidate-renderer.d.ts.map +1 -1
- package/dist/server/segment-hash/outlet.d.ts +28 -0
- package/dist/server/segment-hash/outlet.d.ts.map +1 -1
- package/dist/server/segment-lifetime/document-outlet.d.ts +66 -0
- package/dist/server/segment-lifetime/document-outlet.d.ts.map +1 -0
- package/dist/server/segment-lifetime/key-digest.d.ts +46 -0
- package/dist/server/segment-lifetime/key-digest.d.ts.map +1 -0
- package/dist/server/segment-lifetime/read-rule.d.ts +43 -0
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -0
- package/dist/server/segment-lifetime/read-scope.d.ts +39 -0
- package/dist/server/segment-lifetime/read-scope.d.ts.map +1 -0
- package/dist/server/segment-lifetime/segment-key.d.ts +60 -0
- package/dist/server/segment-lifetime/segment-key.d.ts.map +1 -0
- package/dist/server/segment-lifetime/slot-outlets.d.ts +81 -0
- package/dist/server/segment-lifetime/slot-outlets.d.ts.map +1 -0
- package/dist/server/slot-resolver.d.ts +6 -1
- package/dist/server/slot-resolver.d.ts.map +1 -1
- package/dist/server/slot-subtree-contain.d.ts +2 -6
- package/dist/server/slot-subtree-contain.d.ts.map +1 -1
- package/dist/server/subtree-walk.d.ts +56 -0
- package/dist/server/subtree-walk.d.ts.map +1 -0
- package/dist/server/types.d.ts +69 -0
- package/dist/server/types.d.ts.map +1 -1
- package/dist/shared/als-slots.d.ts +12 -2
- package/dist/shared/als-slots.d.ts.map +1 -1
- package/dist/shared/cookie-read-through.d.ts +18 -0
- package/dist/shared/cookie-read-through.d.ts.map +1 -0
- package/dist/shared/outlet-decision.d.ts +23 -4
- package/dist/shared/outlet-decision.d.ts.map +1 -1
- package/dist/shared/route-options-export.d.ts +13 -0
- package/dist/shared/route-options-export.d.ts.map +1 -0
- package/dist/shared/rsc-cache-key.d.ts +22 -0
- package/dist/shared/rsc-cache-key.d.ts.map +1 -1
- package/dist/shared/segment-info.d.ts +6 -0
- package/dist/shared/segment-info.d.ts.map +1 -1
- package/dist/shims/headers.d.ts.map +1 -1
- package/docs/api/30-api-server.mdx +29 -0
- package/docs/api/32-api-cache.mdx +10 -4
- package/docs/api/34-api-config.mdx +5 -0
- package/docs/learn/09-streaming.mdx +6 -2
- package/docs/learn/10-caching.mdx +10 -4
- package/package.json +1 -1
- package/src/cli-check.ts +11 -3
- package/src/client/navigation-commit.ts +11 -2
- package/src/client/outlet-content-cache.ts +40 -8
- package/src/client/router.ts +1 -0
- package/src/client/segment-outlet.tsx +10 -4
- package/src/config-types.ts +25 -0
- package/src/config-validation.ts +17 -0
- package/src/cookies/define-cookie.ts +5 -1
- package/src/index.ts +2 -1
- package/src/plugins/callsite-jsx.ts +104 -6
- package/src/plugins/entries.ts +3 -0
- package/src/plugins/prerender-sugar.ts +34 -18
- package/src/plugins/routing.ts +3 -1
- package/src/routing/convention-lint.ts +18 -7
- package/src/routing/export-detect.ts +14 -117
- package/src/routing/route-options-lint.ts +153 -0
- package/src/routing/route-options.ts +423 -0
- package/src/routing/segment-keys.ts +50 -0
- package/src/rsc-runtime/vendor-types.d.ts +4 -0
- package/src/search-params/define.ts +1 -1
- package/src/server/als-registry.ts +29 -0
- package/src/server/client-state-tree.ts +30 -16
- package/src/server/cookie-context.ts +17 -0
- package/src/server/flight-source.ts +7 -1
- package/src/server/framework-stack-frames.ts +44 -0
- package/src/server/index.ts +7 -0
- package/src/server/prebuilt/capture-routes.ts +1 -1
- package/src/server/prebuilt-builder.ts +30 -2
- package/src/server/request-context.ts +28 -4
- package/src/server/route-element-builder.ts +80 -5
- package/src/server/route-module-loader.ts +43 -10
- package/src/server/rsc-cache-key-guard.ts +17 -2
- package/src/server/rsc-entry/index.ts +16 -0
- package/src/server/rsc-entry/render-route.ts +19 -1
- package/src/server/rsc-entry/revalidate-renderer.ts +17 -1
- package/src/server/segment-hash/outlet.ts +62 -18
- package/src/server/segment-lifetime/document-outlet.ts +98 -0
- package/src/server/segment-lifetime/key-digest.ts +139 -0
- package/src/server/segment-lifetime/read-rule.ts +136 -0
- package/src/server/segment-lifetime/read-scope.ts +99 -0
- package/src/server/segment-lifetime/segment-key.ts +140 -0
- package/src/server/segment-lifetime/slot-outlets.ts +180 -0
- package/src/server/slot-resolver.ts +99 -56
- package/src/server/slot-subtree-contain.ts +35 -182
- package/src/server/subtree-walk.ts +316 -0
- package/src/server/types.ts +85 -0
- package/src/shared/als-slots.ts +19 -8
- package/src/shared/cookie-read-through.ts +18 -0
- package/src/shared/outlet-decision.ts +25 -4
- package/src/shared/route-options-export.ts +14 -0
- package/src/shared/rsc-cache-key.ts +41 -2
- package/src/shared/segment-info.ts +6 -0
- package/src/shims/headers.ts +5 -4
- package/dist/_chunks/actions-DIgnvDrG.js.map +0 -1
- package/dist/_chunks/als-slots-kbQrHTzm.js.map +0 -1
- package/dist/_chunks/chains-CSslTUdI.js +0 -1
- package/dist/_chunks/cli-check-C3QOAru7.js.map +0 -1
- package/dist/_chunks/convention-lint-BoVISNS6.js.map +0 -1
- package/dist/_chunks/dev-server-B8roKA3Q.js +0 -1
- package/dist/_chunks/dev-server-C5R6jx8Q.js.map +0 -1
- package/dist/_chunks/dist-C1Rjlo6s.js.map +0 -1
- package/dist/_chunks/error-boundary-DB51f9ih.js.map +0 -1
- package/dist/_chunks/scanner-C9Lrf77z.js.map +0 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { getCookieJar } from "../server/cookie-context.js";
|
|
2
1
|
import { resolveCodecOrSchema } from "../schema-bridge.js";
|
|
2
|
+
import { getCookieJar } from "../server/cookie-context.js";
|
|
3
3
|
import "../server/index.js";
|
|
4
|
+
import { COOKIE_READ_THROUGH } from "../shared/cookie-read-through.js";
|
|
4
5
|
import { deleteClientCookie, getCookieValue, useCookie, writeClientCookie } from "../client/use-cookie.js";
|
|
5
6
|
// src/cookies/define-cookie.ts
|
|
6
7
|
function tryGetServerCookieJar() {
|
|
@@ -29,7 +30,10 @@ function defineCookie(name, options) {
|
|
|
29
30
|
codec,
|
|
30
31
|
get() {
|
|
31
32
|
const serverJar = tryGetServerCookieJar();
|
|
32
|
-
if (serverJar)
|
|
33
|
+
if (serverJar) {
|
|
34
|
+
const readThrough = serverJar[COOKIE_READ_THROUGH];
|
|
35
|
+
return codec.parse(readThrough ? readThrough(name, codec) : serverJar.get(name));
|
|
36
|
+
}
|
|
33
37
|
if (isHttpOnly) throw new Error(`[timber] defineCookie('${name}').get() cannot be used with httpOnly cookies — the browser cannot access them. Set httpOnly: false to enable client access.`);
|
|
34
38
|
const raw = getCookieValue(name);
|
|
35
39
|
return codec.parse(raw);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define-cookie.js","names":["useRawCookie"],"sources":["../../../../src/cookies/define-cookie.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"define-cookie.js","names":["useRawCookie"],"sources":["../../../../src/cookies/define-cookie.ts"],"mappings":";;;;;;AA4GA,SAAS,wBAAgE;CACvE,IAAI;EACF,OAAO,aAAa;CACtB,SAAS,GAAG;EAEV,IAAI,aAAa,SAAS,EAAE,QAAQ,SAAS,8BAA8B,GACzE,MAAM;EAGR,OAAO;CACT;AACF;AAIA,SAAS,aAAgB,eAAqE;CAM5F,OAAO,qBAAqB,SAAS,eAAe,QAAQ;AAC9D;AAiCA,SAAgB,aACd,MACA,SAC8E;CAC9E,MAAM,EAAE,OAAO,eAAe,GAAG,eAAe;CAChD,MAAM,QAAQ,aAAa,aAAa;CACxC,MAAM,kBAAiC,EAAE,GAAG,WAAW;CACvD,MAAM,aAAa,QAAQ,aAAa;CAExC,SAAS,gBAAqC;EAE5C,MAAM,EAAE,UAAU,WAAW,GAAG,eAAe;EAE/C,OAAO;CACT;CAEA,MAAM,OAAsC;EAC1C;EACA,SAAS;EACT;EAEA,MAAS;GACP,MAAM,YAAY,sBAAsB;GACxC,IAAI,WAAW;IAGb,MAAM,cAAc,UAAU;IAC9B,OAAO,MAAM,MAAM,cAAc,YAAY,MAAM,KAAK,IAAI,UAAU,IAAI,IAAI,CAAC;GACjF;GAEA,IAAI,YACF,MAAM,IAAI,MACR,0BAA0B,KAAK,6HAEjC;GAEF,MAAM,MAAM,eAAe,IAAI;GAC/B,OAAO,MAAM,MAAM,GAAG;EACxB;EAEA,IAAI,OAAgB;GAClB,MAAM,YAAY,sBAAsB;GACxC,IAAI,WAAW;IACb,MAAM,aAAa,MAAM,UAAU,KAAK;IACxC,IAAI,eAAe,MACjB,UAAU,OAAO,MAAM,eAAe;SAEtC,UAAU,IAAI,MAAM,YAAY,eAAe;IAEjD;GACF;GAEA,IAAI,YACF,MAAM,IAAI,MACR,0BAA0B,KAAK,6HAEjC;GAEF,MAAM,aAAa,MAAM,UAAU,KAAK;GACxC,IAAI,eAAe,MACjB,mBAAmB,MAAM,cAAc,CAAC;QAExC,kBAAkB,MAAM,YAAY,cAAc,CAAC;EAEvD;EAEA,SAAe;GACb,MAAM,YAAY,sBAAsB;GACxC,IAAI,WAAW;IACb,UAAU,OAAO,MAAM,eAAe;IACtC;GACF;GAEA,IAAI,YACF,MAAM,IAAI,MACR,0BAA0B,KAAK,gIAEjC;GAEF,mBAAmB,MAAM,cAAc,CAAC;EAC1C;CACF;CAEA,IAAI,YACF,OAAO;CAyBT,OAAO;EApBL,GAAG;EAEH,YAAiD;GAC/C,MAAM,aAAa,cAAc;GACjC,MAAM,CAAC,KAAK,QAAQ,aAAaA,UAAa,MAAM,UAAU;GAC9D,MAAM,SAAS,MAAM,MAAM,GAAG;GAE9B,MAAM,YAAY,UAAmB;IACnC,MAAM,aAAa,MAAM,UAAU,KAAK;IACxC,IAAI,eAAe,MACjB,UAAU;SAEV,OAAO,UAAU;GAErB;GAEA,OAAO;IAAC;IAAQ;IAAU;GAAS;EACrC;CAGK;AACT"}
|
|
@@ -111,6 +111,7 @@
|
|
|
111
111
|
"server/flight-source.ts": "server/flight-source.js",
|
|
112
112
|
"server/form-data.ts": "server/form-data.js",
|
|
113
113
|
"server/form-state-flight.ts": "server/form-state-flight.js",
|
|
114
|
+
"server/framework-stack-frames.ts": "server/framework-stack-frames.js",
|
|
114
115
|
"server/head-response.ts": "server/head-response.js",
|
|
115
116
|
"server/html-injector-core.ts": "server/html-injector-core.js",
|
|
116
117
|
"server/html-injectors.ts": "server/html-injectors.js",
|
|
@@ -186,6 +187,12 @@
|
|
|
186
187
|
"server/segment-hash/outlet.ts": "server/segment-hash/outlet.js",
|
|
187
188
|
"server/segment-hash/stream-tap.ts": "server/segment-hash/stream-tap.js",
|
|
188
189
|
"server/segment-hash/value-hash.ts": "server/segment-hash/value-hash.js",
|
|
190
|
+
"server/segment-lifetime/document-outlet.ts": "server/segment-lifetime/document-outlet.js",
|
|
191
|
+
"server/segment-lifetime/key-digest.ts": "server/segment-lifetime/key-digest.js",
|
|
192
|
+
"server/segment-lifetime/read-rule.ts": "server/segment-lifetime/read-rule.js",
|
|
193
|
+
"server/segment-lifetime/read-scope.ts": "server/segment-lifetime/read-scope.js",
|
|
194
|
+
"server/segment-lifetime/segment-key.ts": "server/segment-lifetime/segment-key.js",
|
|
195
|
+
"server/segment-lifetime/slot-outlets.ts": "server/segment-lifetime/slot-outlets.js",
|
|
189
196
|
"server/sensitive-fields.ts": "server/sensitive-fields.js",
|
|
190
197
|
"server/server-only-guard-noop.js": "server/server-only-guard-noop.js",
|
|
191
198
|
"server/server-timing.ts": "server/server-timing.js",
|
|
@@ -199,6 +206,7 @@
|
|
|
199
206
|
"server/static-not-found.ts": "server/static-not-found.js",
|
|
200
207
|
"server/status-code-resolver.ts": "server/status-code-resolver.js",
|
|
201
208
|
"server/stream-utils.ts": "server/stream-utils.js",
|
|
209
|
+
"server/subtree-walk.ts": "server/subtree-walk.js",
|
|
202
210
|
"server/traced-access.ts": "server/traced-access.js",
|
|
203
211
|
"server/tracing.ts": "server/tracing.js",
|
|
204
212
|
"server/tree-match.ts": "server/tree-match.js",
|
|
@@ -210,6 +218,7 @@
|
|
|
210
218
|
"server/workers-cache-bridge.ts": "server/workers-cache-bridge.js",
|
|
211
219
|
"shared/als-slots.ts": "shared/als-slots.js",
|
|
212
220
|
"shared/base-path.ts": "shared/base-path.js",
|
|
221
|
+
"shared/cookie-read-through.ts": "shared/cookie-read-through.js",
|
|
213
222
|
"shared/csrf-reject.ts": "shared/csrf-reject.js",
|
|
214
223
|
"shared/dev-span.ts": "shared/dev-span.js",
|
|
215
224
|
"shared/error-digest.ts": "shared/error-digest.js",
|
|
@@ -220,6 +229,7 @@
|
|
|
220
229
|
"shared/outlet-decision.ts": "shared/outlet-decision.js",
|
|
221
230
|
"shared/param-value.ts": "shared/param-value.js",
|
|
222
231
|
"shared/redirect-type.ts": "shared/redirect-type.js",
|
|
232
|
+
"shared/route-options-export.ts": "shared/route-options-export.js",
|
|
223
233
|
"shared/rsc-cache-key.ts": "shared/rsc-cache-key.js",
|
|
224
234
|
"shared/rsc-error-envelope.ts": "shared/rsc-error-envelope.js",
|
|
225
235
|
"shared/rsc-media-type.ts": "shared/rsc-media-type.js",
|
|
@@ -45,6 +45,16 @@ function computeSlotKey(parentSegmentId, slotName) {
|
|
|
45
45
|
function childrenOutletKey(segmentId) {
|
|
46
46
|
return computeSlotKey(segmentId, "@children");
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
function pageOutletKey(treePath) {
|
|
49
|
+
return `${treePath === "/" ? "" : treePath}/#page`;
|
|
50
|
+
}
|
|
51
|
+
function layoutOutletKey(treePath) {
|
|
52
|
+
return `${treePath === "/" ? "" : treePath}/#layout`;
|
|
53
|
+
}
|
|
54
|
+
function slotChainTreePath(chain, parentTreePath) {
|
|
55
|
+
const slotSuffix = chain.map((s) => s.segmentName).filter(Boolean).join("/");
|
|
56
|
+
return `${parentTreePath === "/" ? "" : parentTreePath}/${slotSuffix}`;
|
|
57
|
+
}
|
|
58
|
+
export { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths, computeSlotKey, layoutOutletKey, pageOutletKey, slotChainTreePath, treePathDepth, treePathNames };
|
|
49
59
|
|
|
50
60
|
//# sourceMappingURL=segment-keys.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segment-keys.js","names":[],"sources":["../../../../src/routing/segment-keys.ts"],"mappings":";AAqDA,SAAgB,mBAAmB,UAAuC;CACxE,MAAM,OAAiB,CAAC;CACxB,IAAI,UAAU;CACd,IAAI,qBAAqB;CAEzB,KAAK,MAAM,WAAW,UAAU;EAC9B,IAAI,QAAQ,gBAAgB,gBAAgB,qBAAqB;EACjE,IAAI,QAAQ,gBAAgB,WAAW,oBAAoB;GAEzD,MAAM,MAAM,GADC,YAAY,MAAM,KAAK,QAChB,GAAG,QAAQ;GAC/B,KAAK,KAAK,GAAG;GACb,UAAU;EACZ,OAAO;GACL,KAAK,KAAK,QAAQ,OAAO;GACzB,UAAU,QAAQ;EACpB;CACF;CAEA,OAAO;AACT;AAiBA,SAAgB,wBAAwB,UAAuC;CAC7E,MAAM,QAAkB,CAAC;CACzB,IAAI,OAAO;CAEX,KAAK,MAAM,WAAW,UAAU;EAC9B,MAAM,OAAO,QAAQ,eAAe;EACpC,IAAI,CAAC,MAAM;GAET,MAAM,KAAK,GAAG;GACd,OAAO;GACP;EACF;EAEA,MAAM,OAAO,GADA,SAAS,MAAM,KAAK,KACZ,GAAG;EACxB,MAAM,KAAK,IAAI;EACf,OAAO;CACT;CAEA,OAAO;AACT;AAaA,SAAgB,cAAc,UAA4B;CACxD,OAAO,aAAa,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG;AAC5D;AAWA,SAAgB,cAAc,UAA0B;CACtD,OAAO,cAAc,QAAQ,CAAC,CAAC;AACjC;AAMA,SAAgB,eAAe,iBAAyB,UAA0B;CAChF,MAAM,OAAO,SAAS,WAAW,GAAG,IAAI,WAAW,IAAI;CAEvD,OAAO,GADQ,oBAAoB,MAAM,KAAK,gBAC7B,GAAG;AACtB;AAWA,SAAgB,kBAAkB,WAA2B;CAC3D,OAAO,eAAe,WAAW,WAAW;AAC9C"}
|
|
1
|
+
{"version":3,"file":"segment-keys.js","names":[],"sources":["../../../../src/routing/segment-keys.ts"],"mappings":";AAqDA,SAAgB,mBAAmB,UAAuC;CACxE,MAAM,OAAiB,CAAC;CACxB,IAAI,UAAU;CACd,IAAI,qBAAqB;CAEzB,KAAK,MAAM,WAAW,UAAU;EAC9B,IAAI,QAAQ,gBAAgB,gBAAgB,qBAAqB;EACjE,IAAI,QAAQ,gBAAgB,WAAW,oBAAoB;GAEzD,MAAM,MAAM,GADC,YAAY,MAAM,KAAK,QAChB,GAAG,QAAQ;GAC/B,KAAK,KAAK,GAAG;GACb,UAAU;EACZ,OAAO;GACL,KAAK,KAAK,QAAQ,OAAO;GACzB,UAAU,QAAQ;EACpB;CACF;CAEA,OAAO;AACT;AAiBA,SAAgB,wBAAwB,UAAuC;CAC7E,MAAM,QAAkB,CAAC;CACzB,IAAI,OAAO;CAEX,KAAK,MAAM,WAAW,UAAU;EAC9B,MAAM,OAAO,QAAQ,eAAe;EACpC,IAAI,CAAC,MAAM;GAET,MAAM,KAAK,GAAG;GACd,OAAO;GACP;EACF;EAEA,MAAM,OAAO,GADA,SAAS,MAAM,KAAK,KACZ,GAAG;EACxB,MAAM,KAAK,IAAI;EACf,OAAO;CACT;CAEA,OAAO;AACT;AAaA,SAAgB,cAAc,UAA4B;CACxD,OAAO,aAAa,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG;AAC5D;AAWA,SAAgB,cAAc,UAA0B;CACtD,OAAO,cAAc,QAAQ,CAAC,CAAC;AACjC;AAMA,SAAgB,eAAe,iBAAyB,UAA0B;CAChF,MAAM,OAAO,SAAS,WAAW,GAAG,IAAI,WAAW,IAAI;CAEvD,OAAO,GADQ,oBAAoB,MAAM,KAAK,gBAC7B,GAAG;AACtB;AAWA,SAAgB,kBAAkB,WAA2B;CAC3D,OAAO,eAAe,WAAW,WAAW;AAC9C;AAiBA,SAAgB,cAAc,UAA0B;CACtD,OAAO,GAAG,aAAa,MAAM,KAAK,SAAS;AAC7C;AAGA,SAAgB,gBAAgB,UAA0B;CACxD,OAAO,GAAG,aAAa,MAAM,KAAK,SAAS;AAC7C;AAgBA,SAAgB,kBACd,OACA,gBACQ;CACR,MAAM,aAAa,MAChB,KAAK,MAAM,EAAE,WAAW,CAAC,CACzB,OAAO,OAAO,CAAC,CACf,KAAK,GAAG;CAEX,OAAO,GADQ,mBAAmB,MAAM,KAAK,eAC5B,GAAG;AACtB"}
|
|
@@ -127,7 +127,10 @@ function buildDefinition(codecMap, urlKeys) {
|
|
|
127
127
|
}
|
|
128
128
|
function get() {
|
|
129
129
|
if (typeof window !== "undefined") throw new Error("[timber] searchParams.get() is server-only. Use searchParams.useQueryStates() on the client.");
|
|
130
|
-
return parseSync(getSearchParamsFromAls(
|
|
130
|
+
return parseSync(getSearchParamsFromAls({
|
|
131
|
+
codecs: codecMap,
|
|
132
|
+
urlKeys
|
|
133
|
+
}));
|
|
131
134
|
}
|
|
132
135
|
return {
|
|
133
136
|
parse,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.js","names":["useQueryStates","clientUseQueryStates"],"sources":["../../../../src/search-params/define.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"define.js","names":["useQueryStates","clientUseQueryStates"],"sources":["../../../../src/search-params/define.ts"],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ var workersCachePurgeAls = getOrCreateAls(Symbol.for("timber:workers-cache-purge
|
|
|
19
19
|
var reactCacheScopeAls = getOrCreateAls(Symbol.for("timber:react-cache-scope-als"));
|
|
20
20
|
var prebuiltCaptureAls = getOrCreateAls(Symbol.for("timber:prebuilt-capture-als"));
|
|
21
21
|
var segmentCaptureAls = getOrCreateAls(Symbol.for("timber:segment-capture-als"));
|
|
22
|
-
|
|
22
|
+
var documentReadScopeAls = getOrCreateAls(Symbol.for("timber:document-read-scope-als"));
|
|
23
|
+
export { documentReadScopeAls, earlyHintsSenderAls, prebuiltCaptureAls, reactCacheScopeAls, requestContextAls, revalidationAls, segmentCaptureAls, timingAls, traceAls, waitUntilAls, workersCachePurgeAls };
|
|
23
24
|
|
|
24
25
|
//# sourceMappingURL=als-registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"als-registry.js","names":[],"sources":["../../../../src/server/als-registry.ts"],"mappings":";;;AAgDA,SAAS,eAAkB,QAAsC;CAC/D,MAAM,IAAI;CACV,MAAM,WAAW,EAAE;CACnB,IAAI,oBAAoB,mBACtB,OAAO;CAET,MAAM,UAAU,IAAI,kBAAqB;CACzC,EAAE,UAAU;CACZ,OAAO;AACT;AAOA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC;AAiKA,IAAa,WAAW,eAA2B,OAAO,IAAI,kBAAkB,CAAC;AAWjF,IAAa,YAAY,eAA4B,OAAO,IAAI,mBAAmB,CAAC;AAqBpF,IAAa,kBAAkB,eAC7B,OAAO,IAAI,yBAAyB,CACtC;AAUA,IAAa,sBAAsB,eACjC,OAAO,IAAI,+BAA+B,CAC5C;AAUA,IAAa,eAAe,eAA4B,OAAO,IAAI,uBAAuB,CAAC;AAY3F,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C;AAeA,IAAa,qBAAqB,eAChC,OAAO,IAAI,8BAA8B,CAC3C;AAwBA,IAAa,qBAAqB,eAChC,OAAO,IAAI,6BAA6B,CAC1C;AAqBA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC"}
|
|
1
|
+
{"version":3,"file":"als-registry.js","names":[],"sources":["../../../../src/server/als-registry.ts"],"mappings":";;;AAgDA,SAAS,eAAkB,QAAsC;CAC/D,MAAM,IAAI;CACV,MAAM,WAAW,EAAE;CACnB,IAAI,oBAAoB,mBACtB,OAAO;CAET,MAAM,UAAU,IAAI,kBAAqB;CACzC,EAAE,UAAU;CACZ,OAAO;AACT;AAOA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC;AAiKA,IAAa,WAAW,eAA2B,OAAO,IAAI,kBAAkB,CAAC;AAWjF,IAAa,YAAY,eAA4B,OAAO,IAAI,mBAAmB,CAAC;AAqBpF,IAAa,kBAAkB,eAC7B,OAAO,IAAI,yBAAyB,CACtC;AAUA,IAAa,sBAAsB,eACjC,OAAO,IAAI,+BAA+B,CAC5C;AAUA,IAAa,eAAe,eAA4B,OAAO,IAAI,uBAAuB,CAAC;AAY3F,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C;AAeA,IAAa,qBAAqB,eAChC,OAAO,IAAI,8BAA8B,CAC3C;AAwBA,IAAa,qBAAqB,eAChC,OAAO,IAAI,6BAA6B,CAC1C;AAqBA,IAAa,oBAAoB,eAC/B,OAAO,IAAI,4BAA4B,CACzC;AA2BA,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import "./segment-hash/value-hash.js";
|
|
2
|
+
import { KEY_DIGEST_SHAPE } from "./segment-lifetime/key-digest.js";
|
|
2
3
|
import { swallow } from "./logger.js";
|
|
3
4
|
// src/server/client-state-tree.ts
|
|
4
|
-
var
|
|
5
|
+
var MAX_ENTRIES = 512;
|
|
5
6
|
var HASH_SHAPE = new RegExp(`^[A-Za-z0-9_-]{22}$`);
|
|
6
7
|
function parseClientStateTree(req) {
|
|
7
8
|
const header = req.headers.get("X-Timber-State-Tree");
|
|
@@ -14,20 +15,24 @@ function parseClientStateTree(req) {
|
|
|
14
15
|
return null;
|
|
15
16
|
}
|
|
16
17
|
if (!parsed || typeof parsed !== "object") return null;
|
|
17
|
-
const hashes =
|
|
18
|
-
|
|
19
|
-
const entries = Object.entries(parsed.hashes);
|
|
20
|
-
if (entries.length <= MAX_HASHES) {
|
|
21
|
-
for (const [path, hash] of entries) if (typeof hash === "string" && HASH_SHAPE.test(hash)) hashes.set(path, hash);
|
|
22
|
-
}
|
|
23
|
-
}
|
|
18
|
+
const hashes = readTokenMap(parsed.hashes, HASH_SHAPE);
|
|
19
|
+
const documents = readTokenMap(parsed.documents, KEY_DIGEST_SHAPE);
|
|
24
20
|
const treePaths = Array.isArray(parsed.treePaths) ? new Set(parsed.treePaths.filter((p) => typeof p === "string")) : new Set();
|
|
25
|
-
if (hashes.size === 0 && treePaths.size === 0) return null;
|
|
21
|
+
if (hashes.size === 0 && documents.size === 0 && treePaths.size === 0) return null;
|
|
26
22
|
return {
|
|
27
23
|
hashes: hashes.size > 0 ? hashes : null,
|
|
24
|
+
documents: documents.size > 0 ? documents : null,
|
|
28
25
|
treePaths: treePaths.size > 0 ? treePaths : null
|
|
29
26
|
};
|
|
30
27
|
}
|
|
28
|
+
function readTokenMap(value, shape) {
|
|
29
|
+
const map = new Map();
|
|
30
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return map;
|
|
31
|
+
const entries = Object.entries(value);
|
|
32
|
+
if (entries.length > MAX_ENTRIES) return map;
|
|
33
|
+
for (const [path, token] of entries) if (typeof token === "string" && shape.test(token)) map.set(path, token);
|
|
34
|
+
return map;
|
|
35
|
+
}
|
|
31
36
|
export { parseClientStateTree };
|
|
32
37
|
|
|
33
38
|
//# sourceMappingURL=client-state-tree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-state-tree.js","names":[],"sources":["../../../../src/server/client-state-tree.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"client-state-tree.js","names":[],"sources":["../../../../src/server/client-state-tree.ts"],"mappings":";;;;AA0CA,IAAM,cAAc;AAEpB,IAAM,aAAa,IAAI,OAAO,qBAAyC;AAMvE,SAAgB,qBAAqB,KAAsC;CACzE,MAAM,SAAS,IAAI,QAAQ,IAAI,qBAAqB;CACpD,IAAI,CAAC,QAAQ,OAAO;CAEpB,IAAI;CACJ,IAAI;EACF,SAAS,KAAK,MAAM,MAAM;CAC5B,SAAS,KAAK;EACZ,QAAQ,KAAK,sCAAsC;EACnD,OAAO;CACT;CACA,IAAI,CAAC,UAAU,OAAO,WAAW,UAAU,OAAO;CAElD,MAAM,SAAS,aAAa,OAAO,QAAQ,UAAU;CACrD,MAAM,YAAY,aAAa,OAAO,WAAW,gBAAgB;CAEjE,MAAM,YAAY,MAAM,QAAQ,OAAO,SAAS,IAC5C,IAAI,IAAI,OAAO,UAAU,QAAQ,MAAmB,OAAO,MAAM,QAAQ,CAAC,IAC1E,IAAI,IAAY;CAEpB,IAAI,OAAO,SAAS,KAAK,UAAU,SAAS,KAAK,UAAU,SAAS,GAAG,OAAO;CAC9E,OAAO;EACL,QAAQ,OAAO,OAAO,IAAI,SAAS;EACnC,WAAW,UAAU,OAAO,IAAI,YAAY;EAC5C,WAAW,UAAU,OAAO,IAAI,YAAY;CAC9C;AACF;AAGA,SAAS,aAAa,OAAgB,OAAoC;CACxE,MAAM,MAAM,IAAI,IAAoB;CACpC,IAAI,CAAC,SAAS,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG,OAAO;CACxE,MAAM,UAAU,OAAO,QAAQ,KAAgC;CAC/D,IAAI,QAAQ,SAAS,aAAa,OAAO;CACzC,KAAK,MAAM,CAAC,MAAM,UAAU,SAC1B,IAAI,OAAO,UAAU,YAAY,MAAM,KAAK,KAAK,GAAG,IAAI,IAAI,MAAM,KAAK;CAEzE,OAAO;AACT"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { assertCookieRead, assertUnscopedRead } from "./segment-lifetime/read-rule.js";
|
|
2
|
+
import { COOKIE_READ_THROUGH } from "../shared/cookie-read-through.js";
|
|
1
3
|
import { requestContextAls } from "./als-registry.js";
|
|
2
4
|
import { isDebug } from "./debug.js";
|
|
3
5
|
import { noteCookieReadForReactCache, warnIfCachedCookieIsWritten } from "./react-cache-scope.js";
|
|
@@ -11,14 +13,22 @@ function getCookieJar() {
|
|
|
11
13
|
const map = store.parsedCookies;
|
|
12
14
|
return {
|
|
13
15
|
get(name) {
|
|
16
|
+
assertCookieRead(name);
|
|
17
|
+
noteCookieReadForReactCache(name);
|
|
18
|
+
return map.get(name);
|
|
19
|
+
},
|
|
20
|
+
[COOKIE_READ_THROUGH](name, codec) {
|
|
21
|
+
assertCookieRead(name, codec);
|
|
14
22
|
noteCookieReadForReactCache(name);
|
|
15
23
|
return map.get(name);
|
|
16
24
|
},
|
|
17
25
|
has(name) {
|
|
26
|
+
assertCookieRead(name);
|
|
18
27
|
noteCookieReadForReactCache(name);
|
|
19
28
|
return map.has(name);
|
|
20
29
|
},
|
|
21
30
|
getAll() {
|
|
31
|
+
assertUnscopedRead("every cookie");
|
|
22
32
|
noteCookieReadForReactCache("*");
|
|
23
33
|
return Array.from(map.entries()).map(([name, value]) => ({
|
|
24
34
|
name,
|
|
@@ -26,6 +36,7 @@ function getCookieJar() {
|
|
|
26
36
|
}));
|
|
27
37
|
},
|
|
28
38
|
get size() {
|
|
39
|
+
assertUnscopedRead("the number of cookies");
|
|
29
40
|
noteCookieReadForReactCache("*");
|
|
30
41
|
return map.size;
|
|
31
42
|
},
|
|
@@ -103,6 +114,7 @@ function getCookieJar() {
|
|
|
103
114
|
warnIfCachedCookieIsWritten("*");
|
|
104
115
|
},
|
|
105
116
|
toString() {
|
|
117
|
+
assertUnscopedRead("every cookie");
|
|
106
118
|
noteCookieReadForReactCache("*");
|
|
107
119
|
return Array.from(map.entries()).map(([name, value]) => `${name}=${encodeURIComponent(value)}`).join("; ");
|
|
108
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie-context.js","names":[],"sources":["../../../../src/server/cookie-context.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"cookie-context.js","names":[],"sources":["../../../../src/server/cookie-context.ts"],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isAppStackFrame } from "./framework-stack-frames.js";
|
|
1
2
|
import { nodeStreamsPlatform } from "./node-streams-platform.js";
|
|
2
3
|
import { releaseReason } from "./render-utils.js";
|
|
3
4
|
import { withTimeout } from "./render-timeout.js";
|
|
@@ -20,7 +21,8 @@ function createRenderFlight(web, node) {
|
|
|
20
21
|
stream: pipeFlightToNode(node(model, {
|
|
21
22
|
onError: options.onError,
|
|
22
23
|
temporaryReferences: options.temporaryReferences,
|
|
23
|
-
identifierPrefix: options.identifierPrefix
|
|
24
|
+
identifierPrefix: options.identifierPrefix,
|
|
25
|
+
filterStackFrame: isAppStackFrame
|
|
24
26
|
}), {
|
|
25
27
|
signal: options.signal,
|
|
26
28
|
timeoutMs: options.timeoutMs ?? defaultRenderTimeoutMs,
|
|
@@ -33,7 +35,8 @@ function createRenderFlight(web, node) {
|
|
|
33
35
|
onError: options.onError,
|
|
34
36
|
signal: options.signal,
|
|
35
37
|
temporaryReferences: options.temporaryReferences,
|
|
36
|
-
identifierPrefix: options.identifierPrefix
|
|
38
|
+
identifierPrefix: options.identifierPrefix,
|
|
39
|
+
filterStackFrame: isAppStackFrame
|
|
37
40
|
});
|
|
38
41
|
const timeoutMs = options.timeoutMs ?? defaultRenderTimeoutMs;
|
|
39
42
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flight-source.js","names":[],"sources":["../../../../src/server/flight-source.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"flight-source.js","names":[],"sources":["../../../../src/server/flight-source.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
// src/server/framework-stack-frames.ts
|
|
2
|
+
function frameworkRoot(moduleUrl) {
|
|
3
|
+
if (!moduleUrl) return null;
|
|
4
|
+
const path = stripFileScheme(moduleUrl);
|
|
5
|
+
const at = Math.max(path.lastIndexOf("/src/"), path.lastIndexOf("/dist/"));
|
|
6
|
+
return at > 0 ? path.slice(0, at + 1) : null;
|
|
7
|
+
}
|
|
8
|
+
function stripFileScheme(url) {
|
|
9
|
+
return url.startsWith("file://") ? decodeURI(url.slice(7)) : url;
|
|
10
|
+
}
|
|
11
|
+
var FRAMEWORK_ROOT = frameworkRoot(import.meta.url);
|
|
12
|
+
function isAppStackFrame(url) {
|
|
13
|
+
if (url === "" || url.startsWith("node:") || url.includes("node_modules")) return false;
|
|
14
|
+
return FRAMEWORK_ROOT === null || !stripFileScheme(url).startsWith(FRAMEWORK_ROOT);
|
|
15
|
+
}
|
|
16
|
+
export { isAppStackFrame };
|
|
17
|
+
|
|
18
|
+
//# sourceMappingURL=framework-stack-frames.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"framework-stack-frames.js","names":[],"sources":["../../../../src/server/framework-stack-frames.ts"],"mappings":";AAuBA,SAAS,cAAc,WAA8C;CACnE,IAAI,CAAC,WAAW,OAAO;CACvB,MAAM,OAAO,gBAAgB,SAAS;CACtC,MAAM,KAAK,KAAK,IAAI,KAAK,YAAY,OAAO,GAAG,KAAK,YAAY,QAAQ,CAAC;CACzE,OAAO,KAAK,IAAI,KAAK,MAAM,GAAG,KAAK,CAAC,IAAI;AAC1C;AAEA,SAAS,gBAAgB,KAAqB;CAC5C,OAAO,IAAI,WAAW,SAAS,IAAI,UAAU,IAAI,MAAM,CAAgB,CAAC,IAAI;AAC9E;AAEA,IAAM,iBAAiB,cAAc,YAAY,GAAG;AAMpD,SAAgB,gBAAgB,KAAsB;CACpD,IAAI,QAAQ,MAAM,IAAI,WAAW,OAAO,KAAK,IAAI,SAAS,cAAc,GAAG,OAAO;CAClF,OAAO,mBAAmB,QAAQ,CAAC,gBAAgB,GAAG,CAAC,CAAC,WAAW,cAAc;AACnF"}
|
|
@@ -49,6 +49,7 @@ async function capturePrebuiltPayloads(manifest, options) {
|
|
|
49
49
|
const emittedParamIndependent = new Set();
|
|
50
50
|
const provenParamIndependent = new Set();
|
|
51
51
|
const pendingByComponent = new Map();
|
|
52
|
+
const emptyPropsFailures = new Map();
|
|
52
53
|
const skip = (issue) => {
|
|
53
54
|
summary.skipped.push(issue);
|
|
54
55
|
log(`[timber] cache.component skipped "${issue.componentId}" for ${issue.routeUrlPath} ${JSON.stringify(issue.params)} — ${issue.message}`);
|
|
@@ -149,7 +150,8 @@ async function capturePrebuiltPayloads(manifest, options) {
|
|
|
149
150
|
if (registration.options.prerender !== true) continue;
|
|
150
151
|
if (emittedParamIndependent.has(componentId)) continue;
|
|
151
152
|
const capturedProps = options.callSiteProps?.[componentId];
|
|
152
|
-
const
|
|
153
|
+
const rendersEmptyProps = !capturedProps || capturedProps.length === 0;
|
|
154
|
+
const propsSets = rendersEmptyProps ? [{}] : [...capturedProps];
|
|
153
155
|
let pending = pendingByComponent.get(componentId);
|
|
154
156
|
if (!pending) {
|
|
155
157
|
pending = {
|
|
@@ -198,6 +200,14 @@ async function capturePrebuiltPayloads(manifest, options) {
|
|
|
198
200
|
if (outcome.failure instanceof BuildTimeContextError) {
|
|
199
201
|
summary.hardErrors.push(issue);
|
|
200
202
|
log(`[timber] BUILD ERROR: ${issue.message}`);
|
|
203
|
+
} else if (rendersEmptyProps) {
|
|
204
|
+
const failures = (emptyPropsFailures.get(componentId) ?? 0) + 1;
|
|
205
|
+
emptyPropsFailures.set(componentId, failures);
|
|
206
|
+
if (failures === 1) skip({
|
|
207
|
+
...issue,
|
|
208
|
+
message: `${issue.message} (rendered with empty props: no call site with statically readable props was found — pass literals, not spreads or computed values)`
|
|
209
|
+
});
|
|
210
|
+
else summary.skipped.push(issue);
|
|
201
211
|
} else skip(issue);
|
|
202
212
|
continue;
|
|
203
213
|
}
|
|
@@ -237,6 +247,10 @@ async function capturePrebuiltPayloads(manifest, options) {
|
|
|
237
247
|
}
|
|
238
248
|
}
|
|
239
249
|
}
|
|
250
|
+
for (const [componentId, failures] of emptyPropsFailures) {
|
|
251
|
+
if (failures < 2) continue;
|
|
252
|
+
log(`[timber] cache.component skipped "${componentId}" for ${failures} param combos in all, each rendered with empty props — those requests render live`);
|
|
253
|
+
}
|
|
240
254
|
for (const [componentId, pending] of pendingByComponent) {
|
|
241
255
|
if (pending.entries.length === 0) continue;
|
|
242
256
|
emittedParamIndependent.add(componentId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prebuilt-builder.js","names":[],"sources":["../../../../src/server/prebuilt-builder.ts"],"mappings":";;;;;;;;;;;;;;AAoJA,eAAe,cAAc,WAAkC;CAE7D,MAAM,OADM,YAAY,KAAK,SAAS,IAAI,YAAY,IAAI,IAAI,WAAW,YAAY,GAAG,CAAC,CAAC;AAE5F;AAGA,SAAS,gBAAgB,OAAwB;CAC/C,IAAI,aAAa,KAAK,GAAG,OAAO,yBAAyB,MAAM,OAAO;CACtE,IAAI,iBAAiB,KAAK,GAAG,OAAO,8BAA8B,MAAM,SAAS;CACjF,IAAI,iBAAiB,OAAO,OAAO,MAAM;CACzC,OAAO,OAAO,KAAK;AACrB;AAaA,SAAS,uBAAuB,aAAqB,OAAoC;CACvF,MAAM,WAAW,OAAO,KAAK,MAAM,aAAa,CAAC,CAAC,SAAS;CAC3D,OAAO;EACL;EACA,UAAU,MAAM;EAChB,QAAQ,MAAM;EACd,GAAI,WAAW,EAAE,OAAO,MAAM,cAAc,IAAI,CAAC;EACjD,OAAO,MAAM;EACb,MAAM,MAAM;CACd;AACF;AAMA,eAAsB,wBACpB,UACA,SACyB;CACzB,MAAM,MAAM,QAAQ,SAAS,YAAoB,QAAQ,KAAK,OAAO;CACrE,MAAM,YAAY,uBAAuB,QAAQ,eAAe;CAChE,MAAM,aAAa,mBAAmB,QAAQ;CAE9C,MAAM,UAA0B;EAAE,UAAU;EAAG,SAAS,CAAC;EAAG,YAAY,CAAC;EAAG,iBAAiB;CAAE;CAC/F,MAAM,cAAc,IAAI,IAAY;CACpC,MAAM,cAAc,IAAI,IAAY;CACpC,MAAM,+BAA+B,IAAI,IAAY;CACrD,MAAM,oBAAoB,IAAI,IAAY;CAE1C,MAAM,0BAA0B,IAAI,IAAY;CAOhD,MAAM,yBAAyB,IAAI,IAAY;CAG/C,MAAM,qBAAqB,IAAI,IAAgE;
|
|
1
|
+
{"version":3,"file":"prebuilt-builder.js","names":[],"sources":["../../../../src/server/prebuilt-builder.ts"],"mappings":"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"}
|
|
@@ -4,18 +4,22 @@ import { appVisibleSearch } from "../shared/rsc-cache-key.js";
|
|
|
4
4
|
import { mergeSlotParams, resolveSegmentParams } from "../shared/slot-params.js";
|
|
5
5
|
import { isDebug } from "./debug.js";
|
|
6
6
|
import { runWithReactCacheScope } from "./react-cache-scope.js";
|
|
7
|
+
import { assertSearchParamsRead, assertUnscopedRead, scopedParams } from "./segment-lifetime/read-rule.js";
|
|
7
8
|
// src/server/request-context.ts
|
|
8
9
|
function getHeaders() {
|
|
9
10
|
const store = requestContextAls.getStore();
|
|
10
11
|
if (!store) throw new Error("[timber] getHeaders() called outside of a request context. It can only be used in middleware, access checks, server components, and server actions.");
|
|
12
|
+
assertUnscopedRead("the request headers");
|
|
11
13
|
return store.headers;
|
|
12
14
|
}
|
|
13
15
|
function getHeader(name) {
|
|
14
16
|
return getHeaders().get(name) ?? void 0;
|
|
15
17
|
}
|
|
16
|
-
function getSearchParams() {
|
|
18
|
+
function getSearchParams(reader) {
|
|
17
19
|
const store = requestContextAls.getStore();
|
|
18
20
|
if (!store) throw new Error("[timber] getSearchParams() called outside of a request context. It can only be used in middleware, access checks, server components, and server actions.");
|
|
21
|
+
if (reader) assertSearchParamsRead(reader);
|
|
22
|
+
else assertUnscopedRead("the raw search params");
|
|
19
23
|
return store.searchParams;
|
|
20
24
|
}
|
|
21
25
|
_setGetSearchParamsFn(getSearchParams);
|
|
@@ -25,14 +29,14 @@ function getSegmentParams(segmentPath) {
|
|
|
25
29
|
if (!store) throw new Error("[timber] getSegmentParams() called outside of a request context. It can only be used in middleware, access checks, server components, and server actions.");
|
|
26
30
|
if (!store.segmentParams) throw new Error("[timber] getSegmentParams() called before route matching completed. Segment params are not available until after the route is matched.");
|
|
27
31
|
const slotResolved = resolveSegmentParams(store.segmentParams, store.slotParams, segmentPath);
|
|
28
|
-
if (slotResolved !== store.segmentParams) return slotResolved;
|
|
32
|
+
if (slotResolved !== store.segmentParams) return scopedParams(slotResolved);
|
|
29
33
|
if (segmentPath && isDebug() && store.matchedSegmentPath) {
|
|
30
34
|
const expected = extractDynamicSegments(segmentPath);
|
|
31
35
|
const actual = extractDynamicSegments(store.matchedSegmentPath);
|
|
32
36
|
const missing = expected.filter((s) => !actual.includes(s));
|
|
33
37
|
if (missing.length > 0) console.warn(`[timber] getSegmentParams('${segmentPath}') called but current segment is '${store.matchedSegmentPath}'\n Missing params: ${missing.join(", ")}\n These will be undefined at runtime despite the type annotation.`);
|
|
34
38
|
}
|
|
35
|
-
return store.segmentParams;
|
|
39
|
+
return scopedParams(store.segmentParams);
|
|
36
40
|
}
|
|
37
41
|
function setSegmentParams(params) {
|
|
38
42
|
const store = requestContextAls.getStore();
|
|
@@ -81,7 +85,9 @@ function extractDynamicSegments(route) {
|
|
|
81
85
|
return segments;
|
|
82
86
|
}
|
|
83
87
|
function getRequestSearchString() {
|
|
84
|
-
|
|
88
|
+
const store = requestContextAls.getStore();
|
|
89
|
+
if (store) assertUnscopedRead("the raw search params");
|
|
90
|
+
return store?.searchString ?? "";
|
|
85
91
|
}
|
|
86
92
|
function runWithRequestContext(req, fn, { reactCacheScope, cookies, formState, actionError } = {}) {
|
|
87
93
|
const originalCopy = new Headers(req.headers);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":"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"}
|
|
@@ -10,11 +10,13 @@ import { resolveSlotProps } from "./slot-resolver.js";
|
|
|
10
10
|
import { consumedUrlParts } from "./chain-url-parts.js";
|
|
11
11
|
import { withPublishedParams } from "./publish-params.js";
|
|
12
12
|
import { wrapSegmentWithErrorBoundaries } from "./error-boundary-wrapper.js";
|
|
13
|
-
import { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths } from "../routing/segment-keys.js";
|
|
13
|
+
import { childrenOutletKey, computeSegmentKeys, computeSegmentTreePaths, layoutOutletKey, pageOutletKey } from "../routing/segment-keys.js";
|
|
14
|
+
import { documentOutletFor, pathParamNames } from "./segment-lifetime/document-outlet.js";
|
|
15
|
+
import { getActionErrorForRender, getSegmentParams } from "./request-context.js";
|
|
16
|
+
import { inReadScope, readScopeFor } from "./segment-lifetime/read-scope.js";
|
|
14
17
|
import { outletGate } from "./segment-hash/outlet.js";
|
|
15
18
|
import { METADATA_OUTLET_PATH } from "../shared/outlet-decision.js";
|
|
16
19
|
import { loadFallbackModule } from "./pipeline-helpers.js";
|
|
17
|
-
import { getActionErrorForRender } from "./request-context.js";
|
|
18
20
|
import { loadInterceptionGates } from "./interception-gates.js";
|
|
19
21
|
import { Fragment, createElement } from "../_react/react.js";
|
|
20
22
|
// src/server/route-element-builder.ts
|
|
@@ -51,11 +53,13 @@ function wrapAccessGate(element, opts, h) {
|
|
|
51
53
|
async function buildRouteElement(req, match, interception, render, metadataRouteHashes) {
|
|
52
54
|
const segments = match.segments;
|
|
53
55
|
const loadBoundaryModule = (file) => loadFallbackModule(file, req, segments);
|
|
54
|
-
const { metadataSources, layoutComponents, PageComponent, deferSuspenseFor, accessFns } = await loadRouteModules(segments, req.url);
|
|
56
|
+
const { metadataSources, layoutComponents, PageComponent: LoadedPage, deferSuspenseFor, accessFns, documentLifetimes } = await loadRouteModules(segments, req.url, render.defaultLayoutLifetime);
|
|
57
|
+
const mainParams = documentLifetimes.page !== void 0 || documentLifetimes.layouts.some(Boolean) ? getSegmentParams() : {};
|
|
55
58
|
const interceptionGates = await loadInterceptionGates(match);
|
|
56
59
|
const gateFor = (i) => i < (interceptionGates?.sharedCount ?? 0) ? void 0 : accessFns[i];
|
|
57
60
|
const segmentKeys = computeSegmentKeys(segments);
|
|
58
61
|
const segmentTreePaths = computeSegmentTreePaths(segments);
|
|
62
|
+
const PageComponent = documentLifetimes.page && !isClientReference(LoadedPage) ? inReadScope(LoadedPage, readScopeFor(pageOutletKey(segmentTreePaths[segments.length - 1]), documentLifetimes.page, pathParamNames(segments, segments.length - 1))) : LoadedPage;
|
|
59
63
|
const denyPageChains = new Map();
|
|
60
64
|
for (let i = 0; i < segments.length; i++) {
|
|
61
65
|
const chain = await buildDenyPageChain(segments, i, segmentKeys, req);
|
|
@@ -84,6 +88,17 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
84
88
|
};
|
|
85
89
|
element = h(TracedPage, {});
|
|
86
90
|
}
|
|
91
|
+
let pageOutlet;
|
|
92
|
+
if (documentLifetimes.page) {
|
|
93
|
+
const segmentPath = pageOutletKey(segmentTreePaths[leafIndex]);
|
|
94
|
+
pageOutlet = {
|
|
95
|
+
segmentPath,
|
|
96
|
+
content: element,
|
|
97
|
+
nested: [],
|
|
98
|
+
document: await documentOutletFor(render, segmentPath, documentLifetimes.page, pathParamNames(segments, leafIndex), mainParams)
|
|
99
|
+
};
|
|
100
|
+
element = outletGate(pageOutlet, render);
|
|
101
|
+
}
|
|
87
102
|
const metadataOutlet = {
|
|
88
103
|
segmentPath: METADATA_OUTLET_PATH,
|
|
89
104
|
content: h(MetadataHead, {
|
|
@@ -96,7 +111,7 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
96
111
|
};
|
|
97
112
|
element = h(Fragment, null, outletGate(metadataOutlet, render), element);
|
|
98
113
|
const layoutBySegment = new Map(layoutComponents.map(({ component, segment }) => [segment, component]));
|
|
99
|
-
let unclaimedOutlets = [metadataOutlet];
|
|
114
|
+
let unclaimedOutlets = pageOutlet ? [metadataOutlet, pageOutlet] : [metadataOutlet];
|
|
100
115
|
for (let i = segments.length - 1; i >= 0; i--) {
|
|
101
116
|
const segment = segments[i];
|
|
102
117
|
const layoutComponent = layoutBySegment.get(segment);
|
|
@@ -110,6 +125,8 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
110
125
|
});
|
|
111
126
|
if (layoutComponent) {
|
|
112
127
|
const segmentId = segmentKeys[i];
|
|
128
|
+
const layoutLifetime = documentLifetimes.layouts[i];
|
|
129
|
+
const layoutOutletPath = layoutLifetime ? layoutOutletKey(segmentTreePaths[i]) : segmentId;
|
|
113
130
|
const childrenOutlet = {
|
|
114
131
|
segmentPath: childrenOutletKey(segmentId),
|
|
115
132
|
content: element,
|
|
@@ -134,7 +151,7 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
134
151
|
let layoutElement;
|
|
135
152
|
if (isClientReference(layoutComponent)) layoutElement = h(layoutComponent, layoutProps);
|
|
136
153
|
else {
|
|
137
|
-
const layoutComponentRef = layoutComponent;
|
|
154
|
+
const layoutComponentRef = layoutLifetime ? inReadScope(layoutComponent, readScopeFor(layoutOutletPath, layoutLifetime, pathParamNames(segments, i))) : layoutComponent;
|
|
138
155
|
const layoutDenyPages = denyPageChains.get(i);
|
|
139
156
|
const TracedLayout = async (props) => {
|
|
140
157
|
try {
|
|
@@ -157,14 +174,15 @@ async function buildRouteElement(req, match, interception, render, metadataRoute
|
|
|
157
174
|
});
|
|
158
175
|
}
|
|
159
176
|
const layoutOutlet = {
|
|
160
|
-
segmentPath:
|
|
177
|
+
segmentPath: layoutOutletPath,
|
|
161
178
|
content: h(clientComponents().SegmentProvider, {
|
|
162
179
|
segments: segmentPath,
|
|
163
180
|
segmentId,
|
|
164
181
|
parallelRouteKeys,
|
|
165
182
|
children: layoutElement
|
|
166
183
|
}),
|
|
167
|
-
nested: [childrenOutlet, ...slots.outlets]
|
|
184
|
+
nested: [childrenOutlet, ...slots.outlets],
|
|
185
|
+
document: await documentOutletFor(render, layoutOutletPath, layoutLifetime, pathParamNames(segments, i), mainParams, segmentPath.length)
|
|
168
186
|
};
|
|
169
187
|
element = outletGate(layoutOutlet, render);
|
|
170
188
|
unclaimedOutlets = [layoutOutlet];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"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"}
|