@timber-js/app 0.2.0-alpha.239 → 0.2.0-alpha.240
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-Top9GftB.js → actions-DIgnvDrG.js} +4 -4
- package/dist/_chunks/{actions-Top9GftB.js.map → actions-DIgnvDrG.js.map} +1 -1
- package/dist/_chunks/{als-registry-DpygwCp0.js → als-registry-PPYstxK0.js} +2 -1
- package/dist/_chunks/{als-registry-DpygwCp0.js.map → als-registry-PPYstxK0.js.map} +1 -1
- package/dist/_chunks/{cache-api-Bo8c7XVF.js → cache-api-uWQwuxWb.js} +5 -5
- package/dist/_chunks/{cache-api-Bo8c7XVF.js.map → cache-api-uWQwuxWb.js.map} +1 -1
- package/dist/_chunks/{chains-DMoHX4yH.js → chains-C7CExrUI.js} +2 -2
- package/dist/_chunks/{chains-DMoHX4yH.js.map → chains-C7CExrUI.js.map} +1 -1
- package/dist/_chunks/chains-CSslTUdI.js +1 -0
- package/dist/_chunks/{classify-BwyAd-dZ.js → classify-Cj9EeZoL.js} +2 -2
- package/dist/_chunks/{classify-BwyAd-dZ.js.map → classify-Cj9EeZoL.js.map} +1 -1
- package/dist/_chunks/{cli-check-DQAD9MLo.js → cli-check-C3QOAru7.js} +3 -3
- package/dist/_chunks/{cli-check-DQAD9MLo.js.map → cli-check-C3QOAru7.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-C_xNLqBj.js → cli-schema-sync-BRxZz66D.js} +1 -1
- package/dist/_chunks/{cli-schema-sync-CmGls3dc.js → cli-schema-sync-DQUS_o3V.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-CmGls3dc.js.map → cli-schema-sync-DQUS_o3V.js.map} +1 -1
- package/dist/_chunks/{client-dep-entries-C5BTQtFS.js → client-dep-entries-ZETBdLgv.js} +2 -2
- package/dist/_chunks/{client-dep-entries-C5BTQtFS.js.map → client-dep-entries-ZETBdLgv.js.map} +1 -1
- package/dist/_chunks/{convention-lint-GQA6WTRo.js → convention-lint-BoVISNS6.js} +3 -3
- package/dist/_chunks/{convention-lint-GQA6WTRo.js.map → convention-lint-BoVISNS6.js.map} +1 -1
- package/dist/_chunks/dev-server-B8roKA3Q.js +1 -0
- package/dist/_chunks/{dev-server-Cr3_Fu5A.js → dev-server-C5R6jx8Q.js} +2 -2
- package/dist/_chunks/{dev-server-Cr3_Fu5A.js.map → dev-server-C5R6jx8Q.js.map} +1 -1
- package/dist/_chunks/{dev-span-RsVeYYc_.js → dev-span-0aG7Q_Ph.js} +3 -7
- package/dist/_chunks/dev-span-0aG7Q_Ph.js.map +1 -0
- package/dist/_chunks/{error-boundary-Bh-egWUI.js → error-boundary-DB51f9ih.js} +98 -419
- package/dist/_chunks/error-boundary-DB51f9ih.js.map +1 -0
- package/dist/_chunks/{flight-source-node-BsrlUjMO.js → flight-source-node-D9cHBhjP.js} +7 -4
- package/dist/_chunks/flight-source-node-D9cHBhjP.js.map +1 -0
- package/dist/_chunks/{json-lossy-check-D47R9Fp5.js → json-lossy-check-Y1GxqVX_.js} +2 -2
- package/dist/_chunks/{json-lossy-check-D47R9Fp5.js.map → json-lossy-check-Y1GxqVX_.js.map} +1 -1
- package/dist/_chunks/{live-graph-HcLScfiV.js → live-graph-BDQWvnMm.js} +4 -4
- package/dist/_chunks/{live-graph-HcLScfiV.js.map → live-graph-BDQWvnMm.js.map} +1 -1
- package/dist/_chunks/{logger-DDLtp5e-.js → logger-DmRR9tmZ.js} +2 -2
- package/dist/_chunks/{logger-DDLtp5e-.js.map → logger-DmRR9tmZ.js.map} +1 -1
- package/dist/_chunks/metadata-routes-MXNjWOt5.js.map +1 -1
- package/dist/_chunks/{node-response-omewa8e6.js → node-response-yp8zdyRp.js} +2 -2
- package/dist/_chunks/{node-response-omewa8e6.js.map → node-response-yp8zdyRp.js.map} +1 -1
- package/dist/_chunks/plugin-context-BtaQcMuh.js.map +1 -1
- package/dist/_chunks/{poison-scan-DONdiCGX.js → poison-scan-WQgUydF_.js} +2 -2
- package/dist/_chunks/{poison-scan-DONdiCGX.js.map → poison-scan-WQgUydF_.js.map} +1 -1
- package/dist/_chunks/{scanner-DSAJjH0x.js → scanner-C9Lrf77z.js} +3 -2
- package/dist/_chunks/{scanner-DSAJjH0x.js.map → scanner-C9Lrf77z.js.map} +1 -1
- package/dist/_chunks/{sizeof-DVhEVN_y.js → sizeof-BISkSaU0.js} +2 -2
- package/dist/_chunks/{sizeof-DVhEVN_y.js.map → sizeof-BISkSaU0.js.map} +1 -1
- package/dist/_chunks/{walkers-96YopJds.js → walkers-Bxv4v7tX.js} +3 -3
- package/dist/_chunks/{walkers-96YopJds.js.map → walkers-Bxv4v7tX.js.map} +1 -1
- package/dist/adapters/cloudflare-kv-cache.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.js +3 -3
- package/dist/client/browser-entry/action-dispatch.d.ts.map +1 -1
- package/dist/client/browser-entry/hydrate.d.ts +1 -1
- package/dist/client/browser-entry/router-init.d.ts.map +1 -1
- package/dist/client/error-boundary.d.ts +1 -0
- package/dist/client/error-boundary.d.ts.map +1 -1
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/history.d.ts +4 -5
- package/dist/client/history.d.ts.map +1 -1
- package/dist/client/index.js +6 -7
- package/dist/client/index.js.map +1 -1
- package/dist/client/internal.d.ts +1 -1
- package/dist/client/internal.d.ts.map +1 -1
- package/dist/client/internal.js +194 -55
- package/dist/client/internal.js.map +1 -1
- package/dist/client/navigation-commit.d.ts +6 -25
- package/dist/client/navigation-commit.d.ts.map +1 -1
- package/dist/client/outlet-content-cache.d.ts +59 -0
- package/dist/client/outlet-content-cache.d.ts.map +1 -0
- package/dist/client/outlet-scope-context.d.ts +30 -0
- package/dist/client/outlet-scope-context.d.ts.map +1 -0
- package/dist/client/params-context.d.ts +10 -11
- package/dist/client/params-context.d.ts.map +1 -1
- package/dist/client/router-pipeline.d.ts +5 -5
- package/dist/client/router-pipeline.d.ts.map +1 -1
- package/dist/client/router-types.d.ts +10 -24
- package/dist/client/router-types.d.ts.map +1 -1
- package/dist/client/router.d.ts.map +1 -1
- package/dist/client/rsc-fetch.d.ts +4 -17
- package/dist/client/rsc-fetch.d.ts.map +1 -1
- package/dist/client/segment-cache.d.ts +15 -103
- package/dist/client/segment-cache.d.ts.map +1 -1
- package/dist/client/segment-outlet.d.ts +28 -52
- package/dist/client/segment-outlet.d.ts.map +1 -1
- package/dist/client/stale-segment.d.ts +39 -0
- package/dist/client/stale-segment.d.ts.map +1 -0
- package/dist/client/use-segment-params.d.ts +1 -1
- package/dist/config-types.d.ts +7 -6
- package/dist/config-types.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -732
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/manifest.json +6 -4
- package/dist/native/rsc/routing/segment-keys.js +3 -11
- package/dist/native/rsc/routing/segment-keys.js.map +1 -1
- package/dist/native/rsc/server/access-gate.js +3 -7
- package/dist/native/rsc/server/access-gate.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/build-manifest.js.map +1 -1
- package/dist/native/rsc/server/chain-url-parts.js +1 -6
- package/dist/native/rsc/server/chain-url-parts.js.map +1 -1
- package/dist/native/rsc/server/client-state-tree.js +33 -0
- package/dist/native/rsc/server/client-state-tree.js.map +1 -0
- package/dist/native/rsc/server/flight-source-node.js +5 -2
- package/dist/native/rsc/server/flight-source-node.js.map +1 -1
- package/dist/native/rsc/server/flight-source.js +46 -7
- package/dist/native/rsc/server/flight-source.js.map +1 -1
- package/dist/native/rsc/server/pipeline-interception.js +1 -1
- package/dist/native/rsc/server/publish-params.js.map +1 -1
- package/dist/native/rsc/server/route-element-builder.js +43 -61
- package/dist/native/rsc/server/route-element-builder.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/helpers.js +5 -28
- package/dist/native/rsc/server/rsc-entry/helpers.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +33 -7
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +2 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/rsc-payload.js +2 -5
- package/dist/native/rsc/server/rsc-entry/rsc-payload.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/rsc-stream.js +44 -40
- package/dist/native/rsc/server/rsc-entry/rsc-stream.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/ssr-renderer.js +1 -1
- package/dist/native/rsc/server/rsc-entry/ssr-renderer.js.map +1 -1
- package/dist/native/rsc/server/segment-hash/capture.js +107 -0
- package/dist/native/rsc/server/segment-hash/capture.js.map +1 -0
- package/dist/native/rsc/server/segment-hash/outlet.js +81 -0
- package/dist/native/rsc/server/segment-hash/outlet.js.map +1 -0
- package/dist/native/rsc/server/segment-hash/stream-tap.js +139 -0
- package/dist/native/rsc/server/segment-hash/stream-tap.js.map +1 -0
- package/dist/native/rsc/server/segment-hash/value-hash.js +171 -0
- package/dist/native/rsc/server/segment-hash/value-hash.js.map +1 -0
- package/dist/native/rsc/server/slot-resolver.js +20 -124
- package/dist/native/rsc/server/slot-resolver.js.map +1 -1
- package/dist/native/rsc/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/rsc/shared/outlet-decision.js +5 -0
- package/dist/native/rsc/shared/outlet-decision.js.map +1 -0
- package/dist/native/ssr/client/error-boundary.js +16 -3
- package/dist/native/ssr/client/error-boundary.js.map +1 -1
- package/dist/native/ssr/client/navigation-commit.js +1 -5
- package/dist/native/ssr/client/navigation-commit.js.map +1 -1
- package/dist/native/ssr/client/outlet-content-cache.js +53 -0
- package/dist/native/ssr/client/outlet-content-cache.js.map +1 -0
- package/dist/native/ssr/client/outlet-scope-context.js +12 -0
- package/dist/native/ssr/client/outlet-scope-context.js.map +1 -0
- package/dist/native/ssr/client/params-context.js.map +1 -1
- package/dist/native/ssr/client/rsc-fetch.js +1 -12
- package/dist/native/ssr/client/rsc-fetch.js.map +1 -1
- package/dist/native/ssr/client/segment-outlet.js +34 -13
- package/dist/native/ssr/client/segment-outlet.js.map +1 -1
- package/dist/native/ssr/client/stale-segment.js +29 -0
- package/dist/native/ssr/client/stale-segment.js.map +1 -0
- package/dist/native/ssr/manifest.json +5 -4
- package/dist/native/ssr/routing/segment-keys.js +5 -1
- package/dist/native/ssr/routing/segment-keys.js.map +1 -1
- package/dist/native/ssr/server/access-gate.js +3 -7
- package/dist/native/ssr/server/access-gate.js.map +1 -1
- package/dist/native/ssr/server/als-registry.js +1 -0
- package/dist/native/ssr/server/als-registry.js.map +1 -1
- package/dist/native/ssr/server/build-manifest.js.map +1 -1
- package/dist/native/ssr/server/client-state-tree.js +33 -0
- package/dist/native/ssr/server/client-state-tree.js.map +1 -0
- package/dist/native/ssr/server/flight-source-node.js +5 -2
- package/dist/native/ssr/server/flight-source-node.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/pipeline-interception.js +1 -1
- package/dist/native/ssr/server/segment-hash/value-hash.js +162 -0
- package/dist/native/ssr/server/segment-hash/value-hash.js.map +1 -0
- package/dist/native/ssr/server/ssr-wrappers.js.map +1 -1
- package/dist/native/ssr/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/ssr/shared/payload-root.js.map +1 -1
- package/dist/plugin-context.d.ts +0 -16
- package/dist/plugin-context.d.ts.map +1 -1
- package/dist/plugins/build-manifest.d.ts.map +1 -1
- package/dist/routing/index.js +2 -2
- package/dist/routing/segment-keys.d.ts +8 -21
- package/dist/routing/segment-keys.d.ts.map +1 -1
- package/dist/server/access-gate.d.ts +0 -14
- package/dist/server/access-gate.d.ts.map +1 -1
- package/dist/server/als-registry.d.ts +16 -0
- package/dist/server/als-registry.d.ts.map +1 -1
- package/dist/server/build-manifest.d.ts +1 -10
- package/dist/server/build-manifest.d.ts.map +1 -1
- package/dist/server/chain-url-parts.d.ts +3 -13
- package/dist/server/chain-url-parts.d.ts.map +1 -1
- package/dist/server/client-state-tree.d.ts +31 -0
- package/dist/server/client-state-tree.d.ts.map +1 -0
- package/dist/server/flight-source-node.d.ts +6 -1
- package/dist/server/flight-source-node.d.ts.map +1 -1
- package/dist/server/flight-source.d.ts +27 -0
- package/dist/server/flight-source.d.ts.map +1 -1
- package/dist/server/index.js +2 -2
- package/dist/server/internal.js +48 -47
- package/dist/server/internal.js.map +1 -1
- package/dist/server/publish-params.d.ts +5 -4
- package/dist/server/publish-params.d.ts.map +1 -1
- package/dist/server/route-element-builder.d.ts +4 -19
- package/dist/server/route-element-builder.d.ts.map +1 -1
- package/dist/server/rsc-entry/helpers.d.ts +7 -13
- package/dist/server/rsc-entry/helpers.d.ts.map +1 -1
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- package/dist/server/rsc-entry/revalidate-renderer.d.ts.map +1 -1
- package/dist/server/rsc-entry/rsc-payload.d.ts +1 -2
- package/dist/server/rsc-entry/rsc-payload.d.ts.map +1 -1
- package/dist/server/rsc-entry/rsc-stream.d.ts +11 -2
- package/dist/server/rsc-entry/rsc-stream.d.ts.map +1 -1
- package/dist/server/rsc-entry/ssr-renderer.d.ts +0 -2
- package/dist/server/rsc-entry/ssr-renderer.d.ts.map +1 -1
- package/dist/server/segment-hash/capture.d.ts +77 -0
- package/dist/server/segment-hash/capture.d.ts.map +1 -0
- package/dist/server/segment-hash/outlet.d.ts +65 -0
- package/dist/server/segment-hash/outlet.d.ts.map +1 -0
- package/dist/server/segment-hash/stream-tap.d.ts +49 -0
- package/dist/server/segment-hash/stream-tap.d.ts.map +1 -0
- package/dist/server/segment-hash/value-hash.d.ts +70 -0
- package/dist/server/segment-hash/value-hash.d.ts.map +1 -0
- package/dist/server/slot-resolver.d.ts +13 -78
- package/dist/server/slot-resolver.d.ts.map +1 -1
- package/dist/server/ssr-wrappers.d.ts +7 -9
- package/dist/server/ssr-wrappers.d.ts.map +1 -1
- package/dist/server/vite-handoff-rsc.d.ts +10 -1
- package/dist/server/vite-handoff-rsc.d.ts.map +1 -1
- package/dist/shared/outlet-decision.d.ts +48 -0
- package/dist/shared/outlet-decision.d.ts.map +1 -0
- package/dist/shared/payload-root.d.ts +5 -8
- package/dist/shared/payload-root.d.ts.map +1 -1
- package/dist/shared/segment-info.d.ts +13 -28
- package/dist/shared/segment-info.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/client/browser-entry/action-dispatch.ts +1 -15
- package/src/client/browser-entry/hydrate.ts +3 -3
- package/src/client/browser-entry/router-init.ts +28 -47
- package/src/client/error-boundary.tsx +49 -9
- package/src/client/history.ts +4 -5
- package/src/client/internal.ts +1 -1
- package/src/client/navigation-commit.ts +25 -83
- package/src/client/outlet-content-cache.ts +119 -0
- package/src/client/outlet-scope-context.ts +42 -0
- package/src/client/params-context.ts +11 -12
- package/src/client/router-pipeline.ts +10 -74
- package/src/client/router-types.ts +11 -26
- package/src/client/router.ts +7 -22
- package/src/client/rsc-fetch.ts +5 -30
- package/src/client/segment-cache.ts +19 -264
- package/src/client/segment-outlet.tsx +80 -72
- package/src/client/stale-segment.ts +60 -0
- package/src/client/use-segment-params.ts +1 -1
- package/src/config-types.ts +7 -6
- package/src/index.ts +0 -2
- package/src/plugin-context.ts +0 -16
- package/src/plugins/build-manifest.ts +1 -22
- package/src/routing/scanner.ts +12 -0
- package/src/routing/segment-keys.ts +9 -35
- package/src/rsc-runtime/vendor-types.d.ts +8 -0
- package/src/server/access-gate.tsx +3 -32
- package/src/server/als-registry.ts +23 -0
- package/src/server/build-manifest.ts +1 -11
- package/src/server/chain-url-parts.ts +3 -21
- package/src/server/client-state-tree.ts +75 -0
- package/src/server/flight-source-node.ts +7 -2
- package/src/server/flight-source.ts +102 -9
- package/src/server/pipeline-interception.ts +1 -1
- package/src/server/publish-params.ts +5 -4
- package/src/server/route-element-builder.ts +77 -206
- package/src/server/rsc-entry/helpers.ts +11 -65
- package/src/server/rsc-entry/render-route.ts +54 -28
- package/src/server/rsc-entry/revalidate-renderer.ts +2 -1
- package/src/server/rsc-entry/rsc-payload.ts +11 -39
- package/src/server/rsc-entry/rsc-stream.ts +123 -101
- package/src/server/rsc-entry/ssr-renderer.ts +1 -3
- package/src/server/segment-hash/capture.ts +232 -0
- package/src/server/segment-hash/outlet.ts +185 -0
- package/src/server/segment-hash/stream-tap.ts +244 -0
- package/src/server/segment-hash/value-hash.ts +338 -0
- package/src/server/slot-resolver.ts +37 -323
- package/src/server/ssr-wrappers.tsx +7 -9
- package/src/server/vite-handoff-rsc.ts +12 -1
- package/src/shared/outlet-decision.ts +54 -0
- package/src/shared/payload-root.ts +5 -8
- package/src/shared/segment-info.ts +13 -28
- package/dist/_chunks/chains-CmzbpG-6.js +0 -1
- package/dist/_chunks/dev-server--4_Ogy_6.js +0 -1
- package/dist/_chunks/dev-span-RsVeYYc_.js.map +0 -1
- package/dist/_chunks/error-boundary-Bh-egWUI.js.map +0 -1
- package/dist/_chunks/flight-source-node-BsrlUjMO.js.map +0 -1
- package/dist/client/segment-update-context.d.ts +0 -15
- package/dist/client/segment-update-context.d.ts.map +0 -1
- package/dist/client/slot-content-cache-context.d.ts +0 -35
- package/dist/client/slot-content-cache-context.d.ts.map +0 -1
- package/dist/native/rsc/server/request-dep.js +0 -12
- package/dist/native/rsc/server/request-dep.js.map +0 -1
- package/dist/native/rsc/server/route-element-helpers.js +0 -20
- package/dist/native/rsc/server/route-element-helpers.js.map +0 -1
- package/dist/native/rsc/server/skippable-prefix.js +0 -72
- package/dist/native/rsc/server/skippable-prefix.js.map +0 -1
- package/dist/native/rsc/server/state-tree-diff.js +0 -35
- package/dist/native/rsc/server/state-tree-diff.js.map +0 -1
- package/dist/native/ssr/client/segment-cache.js +0 -119
- package/dist/native/ssr/client/segment-cache.js.map +0 -1
- package/dist/native/ssr/client/segment-update-context.js +0 -9
- package/dist/native/ssr/client/segment-update-context.js.map +0 -1
- package/dist/native/ssr/client/slot-content-cache-context.js +0 -8
- package/dist/native/ssr/client/slot-content-cache-context.js.map +0 -1
- package/dist/native/ssr/server/state-tree-diff.js +0 -23
- package/dist/native/ssr/server/state-tree-diff.js.map +0 -1
- package/dist/plugins/request-dep/analysis.d.ts +0 -106
- package/dist/plugins/request-dep/analysis.d.ts.map +0 -1
- package/dist/plugins/request-dep/index.d.ts +0 -75
- package/dist/plugins/request-dep/index.d.ts.map +0 -1
- package/dist/plugins/request-dep/origin.d.ts +0 -61
- package/dist/plugins/request-dep/origin.d.ts.map +0 -1
- package/dist/server/request-dep.d.ts +0 -15
- package/dist/server/request-dep.d.ts.map +0 -1
- package/dist/server/route-element-helpers.d.ts +0 -12
- package/dist/server/route-element-helpers.d.ts.map +0 -1
- package/dist/server/skippable-prefix.d.ts +0 -29
- package/dist/server/skippable-prefix.d.ts.map +0 -1
- package/dist/server/state-tree-diff.d.ts +0 -78
- package/dist/server/state-tree-diff.d.ts.map +0 -1
- package/src/client/segment-update-context.ts +0 -23
- package/src/client/slot-content-cache-context.ts +0 -43
- package/src/plugins/request-dep/analysis.ts +0 -447
- package/src/plugins/request-dep/index.ts +0 -376
- package/src/plugins/request-dep/origin.ts +0 -310
- package/src/server/request-dep.ts +0 -37
- package/src/server/route-element-helpers.ts +0 -37
- package/src/server/skippable-prefix.ts +0 -172
- package/src/server/state-tree-diff.ts +0 -132
|
@@ -2,7 +2,10 @@ import { buildCssLinkTags, buildFontPreloadTags, buildModulepreloadTags, collect
|
|
|
2
2
|
import { DenySignal } from "../primitives.js";
|
|
3
3
|
import { NoPageComponentError, buildRouteElement } from "../route-element-builder.js";
|
|
4
4
|
import { recordTiming } from "../server-timing.js";
|
|
5
|
-
import { parseClientStateTree } from "../state-tree
|
|
5
|
+
import { parseClientStateTree } from "../client-state-tree.js";
|
|
6
|
+
import { isOutletType } from "../segment-hash/outlet.js";
|
|
7
|
+
import { createFromReadableStream } from "../vite-handoff-rsc.js";
|
|
8
|
+
import { createSegmentHashTap } from "../segment-hash/stream-tap.js";
|
|
6
9
|
import { handleApiRoute } from "./api-handler.js";
|
|
7
10
|
import { isRscRequest } from "../../shared/rsc-media-type.js";
|
|
8
11
|
import { buildRscPayloadResponse } from "./rsc-payload.js";
|
|
@@ -16,11 +19,29 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
16
19
|
const segments = match.segments;
|
|
17
20
|
const leaf = segments[segments.length - 1];
|
|
18
21
|
if (leaf.route && !leaf.page) return handleApiRoute(req, segments, responseHeaders);
|
|
19
|
-
const
|
|
22
|
+
const hashing = deps.clientSegmentCache && !clientJsDisabled;
|
|
23
|
+
const tap = hashing ? createSegmentHashTap({
|
|
24
|
+
timeoutMs: deps.renderTimeoutMs,
|
|
25
|
+
isOutlet: isOutletType,
|
|
26
|
+
decode: (stream) => createFromReadableStream(stream)
|
|
27
|
+
}) : null;
|
|
28
|
+
const relayedDigests = new Set();
|
|
29
|
+
let mainOnError = null;
|
|
30
|
+
const segmentHashRender = {
|
|
31
|
+
clientHashes: hashing && isRscRequest(req) ? parseClientStateTree(req)?.hashes ?? null : null,
|
|
32
|
+
tap,
|
|
33
|
+
captureTimeoutMs: deps.renderTimeoutMs,
|
|
34
|
+
signal: req.signal,
|
|
35
|
+
onCaptureError(error) {
|
|
36
|
+
const digest = mainOnError?.(error);
|
|
37
|
+
if (typeof digest === "string") relayedDigests.add(digest);
|
|
38
|
+
return digest;
|
|
39
|
+
}
|
|
40
|
+
};
|
|
20
41
|
let routeResult;
|
|
21
42
|
const _buildStart = performance.now();
|
|
22
43
|
try {
|
|
23
|
-
routeResult = await buildRouteElement(req, match, interception,
|
|
44
|
+
routeResult = await buildRouteElement(req, match, interception, segmentHashRender, buildManifest.metadataRouteHashes);
|
|
24
45
|
} catch (error) {
|
|
25
46
|
if (error instanceof NoPageComponentError) {
|
|
26
47
|
if (process.env.NODE_ENV !== "production") console.warn(`[timber] ${error.message}`);
|
|
@@ -34,7 +55,7 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
34
55
|
dur: Math.round(_buildEnd - _buildStart),
|
|
35
56
|
desc: "build element tree"
|
|
36
57
|
});
|
|
37
|
-
const { payload, layoutComponents, deferSuspenseFor,
|
|
58
|
+
const { payload, layoutComponents, deferSuspenseFor, leafDenyChain } = routeResult;
|
|
38
59
|
let headHtml = "";
|
|
39
60
|
const fontEntries = collectRouteFonts(segments, buildManifest);
|
|
40
61
|
if (fontEntries.length > 0) headHtml += buildFontPreloadTags(fontEntries);
|
|
@@ -45,13 +66,19 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
45
66
|
if (preloadUrls.length > 0) headHtml += buildModulepreloadTags(preloadUrls);
|
|
46
67
|
}
|
|
47
68
|
const _rscStart = performance.now();
|
|
48
|
-
const { rscStream, signals } = renderRscStream(payload, req, deps.renderTimeoutMs, leafDenyChain);
|
|
69
|
+
const { rscStream, signals, onError } = renderRscStream(payload, req, deps.renderTimeoutMs, leafDenyChain, tap ?? void 0, relayedDigests);
|
|
70
|
+
if (tap) {
|
|
71
|
+
mainOnError = onError;
|
|
72
|
+
tap.onEnd(() => {
|
|
73
|
+
mainOnError = null;
|
|
74
|
+
});
|
|
75
|
+
}
|
|
49
76
|
recordTiming({
|
|
50
77
|
name: "rsc-init",
|
|
51
78
|
dur: Math.round(performance.now() - _rscStart),
|
|
52
79
|
desc: "RSC stream init"
|
|
53
80
|
});
|
|
54
|
-
if (isRscRequest(req)) return buildRscPayloadResponse(rscStream, signals, segments, layoutComponents, responseHeaders
|
|
81
|
+
if (isRscRequest(req)) return buildRscPayloadResponse(rscStream, signals, segments, layoutComponents, responseHeaders);
|
|
55
82
|
const pendingFormState = getFormStateForSsr();
|
|
56
83
|
const formState = pendingFormState ? await encodeFormState(pendingFormState, deps.renderTimeoutMs, req.signal) : null;
|
|
57
84
|
return renderSsrResponse({
|
|
@@ -67,7 +94,6 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
67
94
|
headHtml,
|
|
68
95
|
deferSuspenseFor,
|
|
69
96
|
globalError,
|
|
70
|
-
slotSkipInfo,
|
|
71
97
|
formState
|
|
72
98
|
});
|
|
73
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":";;;;;;;;;;;;;;;;AA4EA,eAAsB,YACpB,KACA,OACA,iBACA,MACA,cACmB;CACnB,MAAM,EAAE,iBAAiB,kBAAkB,eAAe,gBAAgB;CAC1E,MAAM,WAAW,MAAM;CACvB,MAAM,OAAO,SAAS,SAAS,SAAS;CAKxC,IAAI,KAAK,SAAS,CAAC,KAAK,MACtB,OAAO,eAAe,KAAK,UAAU,eAAe;CAQtD,MAAM,UAAU,KAAK,sBAAsB,CAAC;CAC5C,MAAM,MAAM,UACR,qBAAqB;EACnB,WAAW,KAAK;EAChB,UAAU;EACV,SAAS,WAAW,yBAAyB,MAAM;CACrD,CAAC,IACD;CAKJ,MAAM,iBAAiB,IAAI,IAAY;CACvC,IAAI,cAA0D;CAC9D,MAAM,oBAAuC;EAC3C,cAAc,WAAW,aAAa,GAAG,IAAK,qBAAqB,GAAG,CAAC,EAAE,UAAU,OAAQ;EAC3F;EACA,kBAAkB,KAAK;EACvB,QAAQ,IAAI;EACZ,eAAe,OAAO;GACpB,MAAM,SAAS,cAAc,KAAK;GAClC,IAAI,OAAO,WAAW,UAAU,eAAe,IAAI,MAAM;GACzD,OAAO;EACT;CACF;CAOA,IAAI;CACJ,MAAM,cAAc,YAAY,IAAI;CACpC,IAAI;EACF,cAAc,MAAM,kBAClB,KACA,OACA,cACA,mBACA,cAAc,mBAChB;CACF,SAAS,OAAO;EAMd,IAAI,iBAAiB,sBAAsB;GACzC,IAAA,QAAA,IAAA,aAA6B,cAC3B,QAAQ,KAAK,YAAY,MAAM,SAAS;GAE1C,OAAO,KAAK,mBAAmB,IAAI,WAAW,GAAG,GAAG,KAAK,eAAe;EAC1E;EACA,MAAM;CACR;CAEA,MAAM,YAAY,YAAY,IAAI;CAClC,aAAa;EACX,MAAM;EACN,KAAK,KAAK,MAAM,YAAY,WAAW;EACvC,MAAM;CACR,CAAC;CAED,MAAM,EAAE,SAAS,kBAAkB,kBAAkB,kBAAkB;CASvE,IAAI,WAAW;CAcf,MAAM,cAAc,kBAAkB,UAAU,aAAa;CAC7D,IAAI,YAAY,SAAS,GACvB,YAAY,qBAAqB,WAAW;CAQ9C,MAAM,UAAU,gBAAgB,UAAU,aAAa;CACvD,IAAI,QAAQ,SAAS,GACnB,YAAY,iBAAiB,OAAO;CAItC,IAAI,CAAC,kBAAkB;EACrB,MAAM,cAAc,2BAA2B,UAAU,aAAa;EACtE,IAAI,YAAY,SAAS,GACvB,YAAY,uBAAuB,WAAW;CAElD;CAQA,MAAM,YAAY,YAAY,IAAI;CAClC,MAAM,EAAE,WAAW,SAAS,YAAY,gBACtC,SACA,KACA,KAAK,iBACL,eACA,OAAO,QACP,cACF;CAIA,IAAI,KAAK;EACP,cAAc;EACd,IAAI,YAAY;GACd,cAAc;EAChB,CAAC;CACH;CAEA,aAAa;EACX,MAAM;EACN,KAAK,KAAK,MAAM,YAAY,IAAI,IAAI,SAAS;EAC7C,MAAM;CACR,CAAC;CAKD,IAAI,aAAa,GAAG,GAClB,OAAO,wBAAwB,WAAW,SAAS,UAAU,kBAAkB,eAAe;CAShG,MAAM,mBAAmB,mBAAmB;CAC5C,MAAM,YAAY,mBACd,MAAM,gBAAgB,kBAAkB,KAAK,iBAAiB,IAAI,MAAM,IACxE;CAGJ,OAAO,kBAAkB;EACvB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;CACF,CAAC;AACH"}
|
|
@@ -9,6 +9,7 @@ import { buildRouteElement } from "../route-element-builder.js";
|
|
|
9
9
|
import { createReactCacheScope } from "../react-cache-scope.js";
|
|
10
10
|
import { RevalidationDropped } from "../actions.js";
|
|
11
11
|
import { runMiddlewareForAction } from "./action-middleware-runner.js";
|
|
12
|
+
import { NO_SEGMENT_HASHING } from "../segment-hash/outlet.js";
|
|
12
13
|
import { RSC_CONTENT_TYPE } from "../../shared/rsc-media-type.js";
|
|
13
14
|
import { stringifyCookie } from "cookie";
|
|
14
15
|
// src/server/rsc-entry/revalidate-renderer.ts
|
|
@@ -117,7 +118,7 @@ function createRevalidateRendererFactory(deps) {
|
|
|
117
118
|
setSegmentParams(match.segmentParams);
|
|
118
119
|
if (overlay) applyRequestHeaderOverlay(overlay);
|
|
119
120
|
return {
|
|
120
|
-
payload: (await buildRouteElement(revalidateReq, match, void 0,
|
|
121
|
+
payload: (await buildRouteElement(revalidateReq, match, void 0, NO_SEGMENT_HASHING, deps.buildManifest.metadataRouteHashes)).payload,
|
|
121
122
|
reactCacheScope
|
|
122
123
|
};
|
|
123
124
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { rscErrorEnvelope } from "../rsc-error-envelope.js";
|
|
|
5
5
|
import { cancelFlightSource, flightResponse, peekFlight } from "../flight-source.js";
|
|
6
6
|
// src/server/rsc-entry/rsc-payload.ts
|
|
7
7
|
var FIRST_CHUNK_CEILING_MS = 50;
|
|
8
|
-
async function buildRscPayloadResponse(rscStream, signals, segments, layoutComponents, responseHeaders
|
|
8
|
+
async function buildRscPayloadResponse(rscStream, signals, segments, layoutComponents, responseHeaders) {
|
|
9
9
|
const peek = peekFlight(rscStream);
|
|
10
10
|
const source = peek.source;
|
|
11
11
|
let first;
|
|
@@ -41,10 +41,7 @@ async function buildRscPayloadResponse(rscStream, signals, segments, layoutCompo
|
|
|
41
41
|
body = null;
|
|
42
42
|
}
|
|
43
43
|
responseHeaders.set("content-type", `${RSC_CONTENT_TYPE}; charset=utf-8`);
|
|
44
|
-
|
|
45
|
-
const segmentInfo = buildSegmentInfo(segments, layoutComponents, slotSkipInfo, skippedSegments, resolvedDenyIndex);
|
|
46
|
-
responseHeaders.set("X-Timber-Segments", JSON.stringify(segmentInfo));
|
|
47
|
-
if (skippedSegments && skippedSegments.length > 0) responseHeaders.set("X-Timber-Skipped-Segments", JSON.stringify(skippedSegments));
|
|
44
|
+
responseHeaders.set("X-Timber-Segments", JSON.stringify(buildSegmentInfo(segments, layoutComponents, getFirstDeniedSegmentIndex())));
|
|
48
45
|
const init = {
|
|
49
46
|
status: 200,
|
|
50
47
|
headers: responseHeaders
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rsc-payload.js","names":[],"sources":["../../../../../src/server/rsc-entry/rsc-payload.ts"],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"rsc-payload.js","names":[],"sources":["../../../../../src/server/rsc-entry/rsc-payload.ts"],"mappings":";;;;;;AA6CA,IAAM,yBAAyB;AA2B/B,eAAsB,wBACpB,WACA,SACA,UACA,kBACA,iBACmB;CAwBnB,MAAM,OAAO,WAAW,SAAS;CACjC,MAAM,SAAS,KAAK;CAEpB,IAAI;CACJ,IAAI;EACF,QAAQ,MAAM,QAAQ,KAAK,CACzB,KAAK,MAAM,WAAW,MAAe,GACrC,QAAQ,SAAS,WAAW,QAAiB,CAC/C,CAAC;CACH,SAAS,YAAY;EAKnB,mBAAmB,MAAM;EACzB,OAAO,iBAAiB,KAAK,eAAe;CAC9C;CAeA,IAAI,UAAU,UAAU,CAAC,QAAQ,kBAAkB,CAAC,QAAQ,YAC1D,MAAM,IAAI,SAAe,MAAM,WAAW,GAAG,CAAC,CAAC;CAQjD,IAAI,QAAQ,gBAAgB;EAC1B,mBAAmB,MAAM;EACzB,MAAM,QAAQ;CAChB;CAaA,IAAI,QAAQ,cAAc;EACxB,mBAAmB,MAAM;EACzB,MAAM,QAAQ;CAChB;CAMA,IAAI;CACJ,IAAI,UAAU,QACZ,OAAO;MACF,IAAI,QAAQ,YAAY,QAAQ;EAMrC,MAAM,YAAY,OAAO,qBAAqB;EAC9C,IAAI;EAwBJ,IAAI,MAvBgB,QAAQ,KAAK,CAC/B,KAAK,OACL,IAAI,SAA2B,YAAY;GACzC,UAAU,iBAAiB,QAAQ,SAAS,GAAG,sBAAsB;EACvE,CAAC,CACH,CAAC,CAAC,CAAC,cAAc,aAAa,OAAO,CAAC,MAkBxB,WAAW;GACvB,mBAAmB,MAAM;GACzB,OAAO,iBAAiB,QAAQ,WAAW,QAAQ,eAAe;EACpE;EACA,OAAO;CACT,OAAO;EACL,mBAAmB,MAAM;EACzB,OAAO;CACT;CAEA,gBAAgB,IAAI,gBAAgB,GAAG,iBAAiB,gBAAgB;CAaxE,gBAAgB,IACd,qBACA,KAAK,UAAU,iBAAiB,UAAU,kBAAkB,2BAA2B,CAAC,CAAC,CAC3F;CASA,MAAM,OAAO;EAAE,QAAQ;EAAK,SAAS;CAAgB;CACrD,OAAO,OAAO,eAAe,MAAM,IAAI,IAAI,IAAI,SAAS,MAAM,IAAI;AACpE"}
|
|
@@ -12,37 +12,34 @@ import { createSignalRecorder } from "./render-signals.js";
|
|
|
12
12
|
import { isDebug } from "../debug.js";
|
|
13
13
|
import { randomUUID } from "node:crypto";
|
|
14
14
|
// src/server/rsc-entry/rsc-stream.ts
|
|
15
|
-
function renderRscStream(payload, req, renderTimeoutMs, leafDenyChain) {
|
|
15
|
+
function renderRscStream(payload, req, renderTimeoutMs, leafDenyChain, tap, relayedDigests) {
|
|
16
16
|
const recorder = createSignalRecorder();
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
if (isDebug() && error instanceof Error && error.message.includes("Invalid hook call")) console.error(`[timber] A React hook was called during RSC rendering. This usually means a 'use client' component is being executed as a server component instead of being serialized as a client reference.
|
|
17
|
+
const onError = (error) => {
|
|
18
|
+
if (typeof error === "object" && error !== null && "digest" in error && typeof error.digest === "string" && relayedDigests?.has(error.digest)) return error.digest;
|
|
19
|
+
if (isAbortError(error) || req.signal?.aborted) return;
|
|
20
|
+
if (isDenySignal(error)) {
|
|
21
|
+
if (!error.owners && leafDenyChain && !error._leaveSpa) {
|
|
22
|
+
const entries = matchDenyEntries(leafDenyChain, error.status);
|
|
23
|
+
if (entries.length > 0) error.owners = entries.map((e) => e.ownerKey);
|
|
24
|
+
}
|
|
25
|
+
recorder.deny(error);
|
|
26
|
+
return JSON.stringify({
|
|
27
|
+
type: "deny",
|
|
28
|
+
status: error.status,
|
|
29
|
+
data: error.data,
|
|
30
|
+
owners: error.owners,
|
|
31
|
+
leaveSpa: error._leaveSpa
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
if (isRedirectSignal(error)) {
|
|
35
|
+
recorder.redirect(error);
|
|
36
|
+
return JSON.stringify({
|
|
37
|
+
type: "redirect",
|
|
38
|
+
location: error.location,
|
|
39
|
+
status: error.status
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
if (isDebug() && error instanceof Error && error.message.includes("Invalid hook call")) console.error(`[timber] A React hook was called during RSC rendering. This usually means a 'use client' component is being executed as a server component instead of being serialized as a client reference.
|
|
46
43
|
|
|
47
44
|
Common causes:
|
|
48
45
|
1. The 'use client' directive is not the FIRST statement in the file (before any imports)
|
|
@@ -50,17 +47,24 @@ Common causes:
|
|
|
50
47
|
3. @vitejs/plugin-rsc is not loaded or is misconfigured
|
|
51
48
|
|
|
52
49
|
Request: ${req.method} ${new URL(req.url).pathname}`);
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
50
|
+
if (error instanceof Error) checkAndWarnRscPropError(error, new URL(req.url).pathname);
|
|
51
|
+
recorder.unhandledError();
|
|
52
|
+
const actionError = getActionErrorForRender();
|
|
53
|
+
const errorId = actionError && actionError.error === error ? actionError.errorId : reportedErrorId(error, req);
|
|
54
|
+
return encodeErrorDigest({
|
|
55
|
+
message: clientErrorMessage(error),
|
|
56
|
+
errorId
|
|
57
|
+
});
|
|
58
|
+
};
|
|
59
|
+
return {
|
|
60
|
+
rscStream: renderFlight(payload, {
|
|
61
|
+
signal: req.signal,
|
|
62
|
+
timeoutMs: renderTimeoutMs,
|
|
63
|
+
tap,
|
|
64
|
+
onError
|
|
62
65
|
}),
|
|
63
|
-
signals: recorder.signals
|
|
66
|
+
signals: recorder.signals,
|
|
67
|
+
onError
|
|
64
68
|
};
|
|
65
69
|
}
|
|
66
70
|
function reportedErrorId(error, req) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rsc-stream.js","names":[],"sources":["../../../../../src/server/rsc-entry/rsc-stream.ts"],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"rsc-stream.js","names":[],"sources":["../../../../../src/server/rsc-entry/rsc-stream.ts"],"mappings":";;;;;;;;;;;;;;AAoDA,SAAgB,gBACd,SACA,KACA,iBACA,eACA,KAOA,gBACiB;CACjB,MAAM,WAAW,qBAAqB;CAEtC,MAAM,WAAW,UAAkC;EACjD,IACE,OAAO,UAAU,YACjB,UAAU,QACV,YAAY,SACZ,OAAO,MAAM,WAAW,YACxB,gBAAgB,IAAI,MAAM,MAAM,GAEhC,OAAO,MAAM;EAIf,IAAI,aAAa,KAAK,KAAK,IAAI,QAAQ,SAAS;EAChD,IAAI,aAAa,KAAK,GAAG;GAWvB,IAAI,CAAC,MAAM,UAAU,iBAAiB,CAAC,MAAM,WAAW;IACtD,MAAM,UAAU,iBAAiB,eAAe,MAAM,MAAM;IAC5D,IAAI,QAAQ,SAAS,GACnB,MAAM,SAAS,QAAQ,KAAK,MAAM,EAAE,QAAQ;GAEhD;GACA,SAAS,KAAK,KAAK;GACnB,OAAO,KAAK,UAAU;IACpB,MAAM;IACN,QAAQ,MAAM;IACd,MAAM,MAAM;IACZ,QAAQ,MAAM;IACd,UAAU,MAAM;GAClB,CAAC;EACH;EACA,IAAI,iBAAiB,KAAK,GAAG;GAC3B,SAAS,SAAS,KAAK;GACvB,OAAO,KAAK,UAAU;IACpB,MAAM;IACN,UAAU,MAAM;IAChB,QAAQ,MAAM;GAChB,CAAC;EACH;EAQA,IAAI,QAAQ,KAAK,iBAAiB,SAAS,MAAM,QAAQ,SAAS,mBAAmB,GACnF,QAAQ,MACN;;;;;;;WAOc,IAAI,OAAO,GAAG,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,UAC/C;EAMF,IAAI,iBAAiB,OACnB,yBAAyB,OAAO,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,QAAQ;EAU3D,SAAS,eAAe;EAqBxB,MAAM,cAAc,wBAAwB;EAC5C,MAAM,UACJ,eAAe,YAAY,UAAU,QACjC,YAAY,UACZ,gBAAgB,OAAO,GAAG;EAChC,OAAO,kBAAkB;GAAE,SAAS,mBAAmB,KAAK;GAAG;EAAQ,CAAC;CAC1E;CASA,OAAO;EAAE,WAPS,aAAa,SAAS;GACtC,QAAQ,IAAI;GACZ,WAAW;GACX;GACA;EACF,CAES;EAAW,SAAS,SAAS;EAAS;CAAQ;AACzD;AAGA,SAAS,gBAAgB,OAAgB,KAAsB;CAC7D,MAAM,UAAU,WAAW;CAC3B,kBAAkB,OAAO,KAAK,EAAE,QAAQ,CAAC;CACzC,OAAO;AACT"}
|
|
@@ -34,7 +34,7 @@ async function renderSsrResponse(opts) {
|
|
|
34
34
|
statusCode: 200,
|
|
35
35
|
responseHeaders,
|
|
36
36
|
headHtml: headHtml + clientBootstrap.preloadLinks + (clientJsDisabled ? "" : flightInitScript(nonce)),
|
|
37
|
-
getHeadSegmentScript: clientJsDisabled ? void 0 : () => `<script${nonceAttr(nonce)}>self.__timber_segments=${htmlEscapeJsonString(JSON.stringify(buildSegmentInfo(segments, layoutComponents,
|
|
37
|
+
getHeadSegmentScript: clientJsDisabled ? void 0 : () => `<script${nonceAttr(nonce)}>self.__timber_segments=${htmlEscapeJsonString(JSON.stringify(buildSegmentInfo(segments, layoutComponents, getFirstDeniedSegmentIndex())))}<\/script>`,
|
|
38
38
|
bootstrapScriptContent: clientBootstrap.bootstrapScriptContent,
|
|
39
39
|
nonce,
|
|
40
40
|
rscStream: clientJsDisabled ? void 0 : inlineStream,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssr-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/ssr-renderer.ts"],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ssr-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/ssr-renderer.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { segmentCaptureAls } from "../als-registry.js";
|
|
2
|
+
import { flightChunkBytes, openFlightReader } from "../flight-source.js";
|
|
3
|
+
import { withTimeout } from "../render-timeout.js";
|
|
4
|
+
import { createFromReadableStream, renderFlight } from "../vite-handoff-rsc.js";
|
|
5
|
+
import { hashValue } from "./value-hash.js";
|
|
6
|
+
import { createHash } from "node:crypto";
|
|
7
|
+
import { createElement } from "../../_react/react.js";
|
|
8
|
+
// src/server/segment-hash/capture.ts
|
|
9
|
+
function captureHoleMarker(segmentPath) {
|
|
10
|
+
return segmentCaptureAls.getStore()?.hole(segmentPath);
|
|
11
|
+
}
|
|
12
|
+
function captureIdPrefix(segmentPath) {
|
|
13
|
+
return "s" + createHash("sha256").update(segmentPath).digest("base64url").slice(0, 8) + "-";
|
|
14
|
+
}
|
|
15
|
+
function lazyDecision(decide) {
|
|
16
|
+
let decided;
|
|
17
|
+
return { then(onFulfilled, onRejected) {
|
|
18
|
+
decided ??= Promise.resolve(decide()).then((d) => {
|
|
19
|
+
if (d === void 0) throw new Error("[timber] a capture hole has no segment to decide");
|
|
20
|
+
return d;
|
|
21
|
+
});
|
|
22
|
+
return decided.then(onFulfilled, onRejected);
|
|
23
|
+
} };
|
|
24
|
+
}
|
|
25
|
+
async function captureSegment(content, options) {
|
|
26
|
+
const temporaryReferences = new WeakMap();
|
|
27
|
+
const holePaths = new Map();
|
|
28
|
+
const source = segmentCaptureAls.run({ hole(segmentPath) {
|
|
29
|
+
const id = String(holePaths.size);
|
|
30
|
+
const marker = { captureHole: true };
|
|
31
|
+
holePaths.set(id, segmentPath);
|
|
32
|
+
temporaryReferences.set(marker, id);
|
|
33
|
+
return marker;
|
|
34
|
+
} }, () => renderFlight(content, {
|
|
35
|
+
signal: options.signal,
|
|
36
|
+
timeoutMs: options.timeoutMs,
|
|
37
|
+
onError: options.onError,
|
|
38
|
+
temporaryReferences,
|
|
39
|
+
identifierPrefix: captureIdPrefix(options.segmentPath)
|
|
40
|
+
}));
|
|
41
|
+
const reader = openFlightReader(source);
|
|
42
|
+
let ended = false;
|
|
43
|
+
const unsubscribe = options.onRenderEnd?.(() => {
|
|
44
|
+
ended = true;
|
|
45
|
+
reader.cancel();
|
|
46
|
+
});
|
|
47
|
+
const deadline = Date.now() + options.timeoutMs;
|
|
48
|
+
const bytes = new ReadableStream({
|
|
49
|
+
async pull(controller) {
|
|
50
|
+
try {
|
|
51
|
+
const result = await withTimeout(reader.read(), Math.max(0, deadline - Date.now()), "segment capture");
|
|
52
|
+
if (result.done) {
|
|
53
|
+
unsubscribe?.();
|
|
54
|
+
controller.close();
|
|
55
|
+
} else controller.enqueue(flightChunkBytes(result.value));
|
|
56
|
+
} catch (error) {
|
|
57
|
+
unsubscribe?.();
|
|
58
|
+
reader.cancel();
|
|
59
|
+
controller.error(error);
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
cancel() {
|
|
63
|
+
unsubscribe?.();
|
|
64
|
+
reader.cancel();
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
const decisions = new Map();
|
|
68
|
+
const root = createFromReadableStream(bytes, { temporaryReferences: { get(key) {
|
|
69
|
+
const id = key.slice(1);
|
|
70
|
+
const path = holePaths.get(id);
|
|
71
|
+
if (path === void 0) return void 0;
|
|
72
|
+
let decision = decisions.get(id);
|
|
73
|
+
if (!decision) {
|
|
74
|
+
decision = lazyDecision(() => options.decideHole(path));
|
|
75
|
+
decisions.set(id, decision);
|
|
76
|
+
}
|
|
77
|
+
return decision;
|
|
78
|
+
} } });
|
|
79
|
+
let decoded;
|
|
80
|
+
try {
|
|
81
|
+
decoded = await root;
|
|
82
|
+
} catch {
|
|
83
|
+
const DecodedCaptureRoot = async () => await root;
|
|
84
|
+
return {
|
|
85
|
+
kind: "live",
|
|
86
|
+
content: createElement(DecodedCaptureRoot)
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
for (;;) {
|
|
90
|
+
const outcome = hashValue(decoded, { isOutlet: options.isOutlet });
|
|
91
|
+
if (outcome.status === "complete") return {
|
|
92
|
+
kind: "complete",
|
|
93
|
+
hash: outcome.hash,
|
|
94
|
+
holes: new Set(holePaths.values()),
|
|
95
|
+
content: decoded,
|
|
96
|
+
discard: () => reader.cancel()
|
|
97
|
+
};
|
|
98
|
+
if (outcome.status === "unhashable" || outcome.streaming || ended) return {
|
|
99
|
+
kind: "live",
|
|
100
|
+
content: decoded
|
|
101
|
+
};
|
|
102
|
+
await Promise.allSettled(outcome.waitFor.map((t) => Promise.resolve(t)));
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
export { captureHoleMarker, captureSegment };
|
|
106
|
+
|
|
107
|
+
//# sourceMappingURL=capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"capture.js","names":[],"sources":["../../../../../src/server/segment-hash/capture.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { clientComponents } from "../vite-handoff-rsc.js";
|
|
2
|
+
import { stripReferenceCacheTag } from "./value-hash.js";
|
|
3
|
+
import { captureHoleMarker, captureSegment } from "./capture.js";
|
|
4
|
+
import { createElement } from "../../_react/react.js";
|
|
5
|
+
// src/server/segment-hash/outlet.ts
|
|
6
|
+
var NO_SEGMENT_HASHING = {
|
|
7
|
+
clientHashes: null,
|
|
8
|
+
tap: null,
|
|
9
|
+
captureTimeoutMs: 0
|
|
10
|
+
};
|
|
11
|
+
function isOutletType(type) {
|
|
12
|
+
if (typeof type !== "function" && (typeof type !== "object" || type === null)) return false;
|
|
13
|
+
const id = type.$$id;
|
|
14
|
+
const outlet = clientComponents().SegmentOutlet.$$id;
|
|
15
|
+
return typeof id === "string" && typeof outlet === "string" && stripReferenceCacheTag(id) === stripReferenceCacheTag(outlet);
|
|
16
|
+
}
|
|
17
|
+
function outletGate(spec, render) {
|
|
18
|
+
function OutletGate() {
|
|
19
|
+
const { SegmentOutlet } = clientComponents();
|
|
20
|
+
const marker = captureHoleMarker(spec.segmentPath);
|
|
21
|
+
if (marker) return createElement(SegmentOutlet, {
|
|
22
|
+
segmentPath: spec.segmentPath,
|
|
23
|
+
decision: marker
|
|
24
|
+
});
|
|
25
|
+
return createElement(SegmentOutlet, {
|
|
26
|
+
segmentPath: spec.segmentPath,
|
|
27
|
+
decision: decide(spec, render)
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
return createElement(OutletGate);
|
|
31
|
+
}
|
|
32
|
+
function decide(spec, render) {
|
|
33
|
+
const clientHash = render.clientHashes?.get(spec.segmentPath);
|
|
34
|
+
if (clientHash === void 0) return live(spec, render, spec.content);
|
|
35
|
+
return detached(compare(spec, render, clientHash));
|
|
36
|
+
}
|
|
37
|
+
function detached(source) {
|
|
38
|
+
return new Promise((resolve, reject) => {
|
|
39
|
+
source.then(resolve, reject);
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
function compare(spec, render, clientHash) {
|
|
43
|
+
return captureSegment(spec.content, {
|
|
44
|
+
segmentPath: spec.segmentPath,
|
|
45
|
+
timeoutMs: render.captureTimeoutMs,
|
|
46
|
+
signal: render.signal,
|
|
47
|
+
onRenderEnd: render.tap?.onEnd,
|
|
48
|
+
onError: render.onCaptureError,
|
|
49
|
+
isOutlet: isOutletType,
|
|
50
|
+
decideHole: (path) => decideNested(spec, path, render)
|
|
51
|
+
}).then((capture) => {
|
|
52
|
+
if (capture.kind === "complete" && capture.hash === clientHash) {
|
|
53
|
+
capture.discard();
|
|
54
|
+
return skip(spec, render, capture);
|
|
55
|
+
}
|
|
56
|
+
return live(spec, render, capture.content);
|
|
57
|
+
}, () => live(spec, render, spec.content));
|
|
58
|
+
}
|
|
59
|
+
function decideNested(spec, path, render) {
|
|
60
|
+
const nested = spec.nested.find((n) => n.segmentPath === path);
|
|
61
|
+
return nested ? decide(nested, render) : void 0;
|
|
62
|
+
}
|
|
63
|
+
function live(spec, render, children) {
|
|
64
|
+
if (!render.tap) return { children };
|
|
65
|
+
return {
|
|
66
|
+
hash: render.tap.advertise(spec.segmentPath),
|
|
67
|
+
children
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
function skip(spec, render, capture) {
|
|
71
|
+
const outlets = {};
|
|
72
|
+
for (const nested of spec.nested) if (capture.holes.has(nested.segmentPath)) outlets[nested.segmentPath] = decide(nested, render);
|
|
73
|
+
return {
|
|
74
|
+
skip: true,
|
|
75
|
+
hash: capture.hash,
|
|
76
|
+
outlets
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
export { NO_SEGMENT_HASHING, isOutletType, outletGate };
|
|
80
|
+
|
|
81
|
+
//# sourceMappingURL=outlet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"outlet.js","names":[],"sources":["../../../../../src/server/segment-hash/outlet.ts"],"mappings":";;;;;AAsDA,IAAa,qBAAwC;CACnD,cAAc;CACd,KAAK;CACL,kBAAkB;AACpB;AAQA,SAAgB,aAAa,MAAwB;CACnD,IAAI,OAAO,SAAS,eAAe,OAAO,SAAS,YAAY,SAAS,OAAO,OAAO;CACtF,MAAM,KAAM,KAA4B;CACxC,MAAM,SAAU,iBAAiB,CAAC,CAAC,cAAqC;CACxE,OACE,OAAO,OAAO,YACd,OAAO,WAAW,YAClB,uBAAuB,EAAE,MAAM,uBAAuB,MAAM;AAEhE;AAWA,SAAgB,WAAW,MAAkB,QAAyC;CACpF,SAAS,aAA2B;EAClC,MAAM,EAAE,kBAAkB,iBAAiB;EAC3C,MAAM,SAAS,kBAAkB,KAAK,WAAW;EACjD,IAAI,QACF,OAAO,cAAc,eAAe;GAAE,aAAa,KAAK;GAAa,UAAU;EAAO,CAAC;EACzF,OAAO,cAAc,eAAe;GAClC,aAAa,KAAK;GAClB,UAAU,OAAO,MAAM,MAAM;EAC/B,CAAC;CACH;CACA,OAAO,cAAc,UAAU;AACjC;AAEA,SAAS,OAAO,MAAkB,QAAgD;CAChF,MAAM,aAAa,OAAO,cAAc,IAAI,KAAK,WAAW;CAC5D,IAAI,eAAe,QAAW,OAAO,KAAK,MAAM,QAAQ,KAAK,OAAO;CACpE,OAAO,SAAS,QAAQ,MAAM,QAAQ,UAAU,CAAC;AACnD;AAaA,SAAS,SAAY,QAAgC;CACnD,OAAO,IAAI,SAAY,SAAS,WAAW;EACzC,OAAO,KAAK,SAAS,MAAM;CAC7B,CAAC;AACH;AAEA,SAAS,QACP,MACA,QACA,YACyB;CACzB,OAAO,eAAe,KAAK,SAAS;EAClC,aAAa,KAAK;EAClB,WAAW,OAAO;EAClB,QAAQ,OAAO;EACf,aAAa,OAAO,KAAK;EACzB,SAAS,OAAO;EAChB,UAAU;EACV,aAAa,SAAS,aAAa,MAAM,MAAM,MAAM;CACvD,CAAC,CAAC,CAAC,MACA,YAAY;EACX,IAAI,QAAQ,SAAS,cAAc,QAAQ,SAAS,YAAY;GAC9D,QAAQ,QAAQ;GAChB,OAAO,KAAK,MAAM,QAAQ,OAAO;EACnC;EAEA,OAAO,KAAK,MAAM,QAAQ,QAAQ,OAAO;CAC3C,SAGM,KAAK,MAAM,QAAQ,KAAK,OAAO,CACvC;AACF;AAGA,SAAS,aACP,MACA,MACA,QACiC;CACjC,MAAM,SAAS,KAAK,OAAO,MAAM,MAAM,EAAE,gBAAgB,IAAI;CAG7D,OAAO,SAAS,OAAO,QAAQ,MAAM,IAAI;AAC3C;AAEA,SAAS,KAAK,MAAkB,QAA2B,UAAqC;CAC9F,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,SAAS;CACnC,OAAO;EAAE,MAAM,OAAO,IAAI,UAAU,KAAK,WAAW;EAAG;CAAS;AAClE;AAQA,SAAS,KACP,MACA,QACA,SACgB;CAChB,MAAM,UAA+C,CAAC;CACtD,KAAK,MAAM,UAAU,KAAK,QACxB,IAAI,QAAQ,MAAM,IAAI,OAAO,WAAW,GAAG,QAAQ,OAAO,eAAe,OAAO,QAAQ,MAAM;CAEhG,OAAO;EAAE,MAAM;EAAM,MAAM,QAAQ;EAAM;CAAQ;AACnD"}
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { hashSettledValue } from "./value-hash.js";
|
|
2
|
+
// src/server/segment-hash/stream-tap.ts
|
|
3
|
+
var LAZY = Symbol.for("react.lazy");
|
|
4
|
+
var ELEMENT = new Set([Symbol.for("react.transitional.element"), Symbol.for("react.element")]);
|
|
5
|
+
function isThenable(value) {
|
|
6
|
+
return typeof value === "object" && value !== null && typeof value.then === "function";
|
|
7
|
+
}
|
|
8
|
+
async function settled(value) {
|
|
9
|
+
try {
|
|
10
|
+
return await value;
|
|
11
|
+
} catch {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
function createSegmentHashTap(options) {
|
|
16
|
+
const pending = new Map();
|
|
17
|
+
const computed = new Map();
|
|
18
|
+
const ambiguous = new Set();
|
|
19
|
+
const onEnd = new Set();
|
|
20
|
+
const state = { aborted: false };
|
|
21
|
+
let explored = false;
|
|
22
|
+
let timer;
|
|
23
|
+
let controller = null;
|
|
24
|
+
const stream = new ReadableStream({ start(c) {
|
|
25
|
+
controller = c;
|
|
26
|
+
} });
|
|
27
|
+
function settle(path, hash) {
|
|
28
|
+
const resolve = pending.get(path);
|
|
29
|
+
if (!resolve) return;
|
|
30
|
+
pending.delete(path);
|
|
31
|
+
resolve(hash);
|
|
32
|
+
if (pending.size === 0 && timer !== void 0) {
|
|
33
|
+
clearTimeout(timer);
|
|
34
|
+
timer = void 0;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
function deliver(path) {
|
|
38
|
+
const hash = computed.get(path);
|
|
39
|
+
if (!hash || !pending.has(path)) return;
|
|
40
|
+
hash.then((h) => settle(path, ambiguous.has(path) ? null : h), () => settle(path, null));
|
|
41
|
+
}
|
|
42
|
+
const visited = new WeakSet();
|
|
43
|
+
async function explore(value) {
|
|
44
|
+
if (state.aborted || value === null || typeof value !== "object") return;
|
|
45
|
+
if (visited.has(value)) return;
|
|
46
|
+
visited.add(value);
|
|
47
|
+
const tagged = value;
|
|
48
|
+
if (tagged.$$typeof === LAZY) {
|
|
49
|
+
if (isThenable(tagged._payload)) await explore(await settled(tagged._payload));
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
if (tagged.$$typeof !== void 0 && ELEMENT.has(tagged.$$typeof)) {
|
|
53
|
+
const { props } = value;
|
|
54
|
+
let type = value.type;
|
|
55
|
+
const lazyType = type;
|
|
56
|
+
if (lazyType && typeof lazyType === "object" && lazyType.$$typeof === LAZY) type = isThenable(lazyType._payload) ? await settled(lazyType._payload) : void 0;
|
|
57
|
+
if (options.isOutlet(type) && props) {
|
|
58
|
+
await outlet(props.segmentPath, props.decision);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
await explore(props);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if (isThenable(value)) {
|
|
65
|
+
await explore(await settled(value));
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const children = Array.isArray(value) ? value : value instanceof Map ? [...value.keys(), ...value.values()] : value instanceof Set ? [...value] : Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null ? Object.values(value) : [];
|
|
69
|
+
await Promise.all(children.map(explore));
|
|
70
|
+
}
|
|
71
|
+
async function outlet(segmentPath, decisionValue) {
|
|
72
|
+
if (typeof segmentPath !== "string") return;
|
|
73
|
+
const decision = isThenable(decisionValue) ? await settled(decisionValue) : decisionValue;
|
|
74
|
+
if (!decision || typeof decision !== "object") return;
|
|
75
|
+
const d = decision;
|
|
76
|
+
if (d.skip === true) {
|
|
77
|
+
const outlets = d.outlets && typeof d.outlets === "object" ? d.outlets : {};
|
|
78
|
+
await Promise.all(Object.entries(outlets).map(([path, nested]) => outlet(path, nested)));
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
if (computed.has(segmentPath)) ambiguous.add(segmentPath);
|
|
82
|
+
computed.set(segmentPath, hashSettledValue(d.children, { isOutlet: options.isOutlet }, state));
|
|
83
|
+
deliver(segmentPath);
|
|
84
|
+
await explore(d.children);
|
|
85
|
+
}
|
|
86
|
+
function exploredAll() {
|
|
87
|
+
explored = true;
|
|
88
|
+
for (const path of [...pending.keys()]) if (!computed.has(path)) settle(path, null);
|
|
89
|
+
}
|
|
90
|
+
new Promise((resolve) => resolve(options.decode(stream))).then((root) => explore(root)).then(exploredAll).catch(() => end());
|
|
91
|
+
function end() {
|
|
92
|
+
if (state.aborted) return;
|
|
93
|
+
state.aborted = true;
|
|
94
|
+
for (const cancel of [...onEnd]) cancel();
|
|
95
|
+
onEnd.clear();
|
|
96
|
+
if (timer !== void 0) clearTimeout(timer);
|
|
97
|
+
timer = void 0;
|
|
98
|
+
try {
|
|
99
|
+
controller?.close();
|
|
100
|
+
} catch {}
|
|
101
|
+
controller = null;
|
|
102
|
+
for (const path of [...pending.keys()]) settle(path, null);
|
|
103
|
+
computed.clear();
|
|
104
|
+
}
|
|
105
|
+
return {
|
|
106
|
+
advertise(segmentPath) {
|
|
107
|
+
if (state.aborted) return Promise.resolve(null);
|
|
108
|
+
if (pending.has(segmentPath)) {
|
|
109
|
+
ambiguous.add(segmentPath);
|
|
110
|
+
settle(segmentPath, null);
|
|
111
|
+
return Promise.resolve(null);
|
|
112
|
+
}
|
|
113
|
+
if (explored && !computed.has(segmentPath)) return Promise.resolve(null);
|
|
114
|
+
const promise = new Promise((resolve) => pending.set(segmentPath, resolve));
|
|
115
|
+
timer ??= setTimeout(end, options.timeoutMs);
|
|
116
|
+
deliver(segmentPath);
|
|
117
|
+
return promise;
|
|
118
|
+
},
|
|
119
|
+
observe(chunk) {
|
|
120
|
+
try {
|
|
121
|
+
controller?.enqueue(chunk);
|
|
122
|
+
} catch {
|
|
123
|
+
end();
|
|
124
|
+
}
|
|
125
|
+
},
|
|
126
|
+
end,
|
|
127
|
+
onEnd(cancel) {
|
|
128
|
+
if (state.aborted) {
|
|
129
|
+
cancel();
|
|
130
|
+
return () => {};
|
|
131
|
+
}
|
|
132
|
+
onEnd.add(cancel);
|
|
133
|
+
return () => onEnd.delete(cancel);
|
|
134
|
+
}
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
export { createSegmentHashTap };
|
|
138
|
+
|
|
139
|
+
//# sourceMappingURL=stream-tap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-tap.js","names":[],"sources":["../../../../../src/server/segment-hash/stream-tap.ts"],"mappings":"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"}
|