@timber-js/app 0.2.0-alpha.242 → 0.2.0-alpha.244
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-BkwgRwCl.js → actions-D_LiN5xG.js} +57 -39
- package/dist/_chunks/actions-D_LiN5xG.js.map +1 -0
- package/dist/_chunks/als-registry-C-iwbtvI.js.map +1 -1
- package/dist/_chunks/{cache-api-BGA7c5qJ.js → cache-api-D3HmgsFh.js} +4 -4
- package/dist/_chunks/{cache-api-BGA7c5qJ.js.map → cache-api-D3HmgsFh.js.map} +1 -1
- package/dist/_chunks/{chains-Cuwwjv6T.js → chains-BpvDwp08.js} +2 -2
- package/dist/_chunks/{chains-Cuwwjv6T.js.map → chains-BpvDwp08.js.map} +1 -1
- package/dist/_chunks/chains-CjlZZ5ad.js +1 -0
- package/dist/_chunks/{classify-Y8S9C0Na.js → classify-Bbb_lKjH.js} +2 -2
- package/dist/_chunks/{classify-Y8S9C0Na.js.map → classify-Bbb_lKjH.js.map} +1 -1
- package/dist/_chunks/{cli-check-KeE1QaIx.js → cli-check-BE9BnXwi.js} +6 -6
- package/dist/_chunks/cli-check-BE9BnXwi.js.map +1 -0
- package/dist/_chunks/{cli-schema-sync-DZEF31wd.js → cli-schema-sync-CWkGFlYu.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-DZEF31wd.js.map → cli-schema-sync-CWkGFlYu.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-_y5O6MIg.js → cli-schema-sync-Dyvdkv_I.js} +1 -1
- package/dist/_chunks/{client-dep-entries-DpiwvoDi.js → client-dep-entries-Dka67elj.js} +2 -2
- package/dist/_chunks/{client-dep-entries-DpiwvoDi.js.map → client-dep-entries-Dka67elj.js.map} +1 -1
- package/dist/_chunks/{convention-lint-0AEsPK2T.js → convention-lint-DkSDlsPH.js} +38 -10
- package/dist/_chunks/convention-lint-DkSDlsPH.js.map +1 -0
- package/dist/_chunks/{dev-server-DYDr8KIc.js → dev-server-BZxFJNih.js} +68 -11
- package/dist/_chunks/{dev-server-DYDr8KIc.js.map → dev-server-BZxFJNih.js.map} +1 -1
- package/dist/_chunks/dev-server-C72bB9Kg.js +1 -0
- package/dist/_chunks/error-boundary-wuNvAJ4n.js.map +1 -1
- package/dist/_chunks/{flight-source-node-KQsX_OhS.js → flight-source-node-BeF00Wo_.js} +2 -2
- package/dist/_chunks/{flight-source-node-KQsX_OhS.js.map → flight-source-node-BeF00Wo_.js.map} +1 -1
- package/dist/_chunks/{interception-CtNt9jPt.js → interception-D1dCGNmQ.js} +6 -6
- package/dist/_chunks/{interception-CtNt9jPt.js.map → interception-D1dCGNmQ.js.map} +1 -1
- package/dist/_chunks/{json-lossy-check-BVDALqMf.js → json-lossy-check-DpXneTBm.js} +2 -2
- package/dist/_chunks/{json-lossy-check-BVDALqMf.js.map → json-lossy-check-DpXneTBm.js.map} +1 -1
- package/dist/_chunks/{key-headers-uIig1_mU.js → key-headers-CVpa6fpW.js} +6 -2
- package/dist/_chunks/key-headers-CVpa6fpW.js.map +1 -0
- package/dist/_chunks/{live-graph-VhzO7Ol9.js → live-graph-DXhz6A_X.js} +4 -4
- package/dist/_chunks/{live-graph-VhzO7Ol9.js.map → live-graph-DXhz6A_X.js.map} +1 -1
- package/dist/_chunks/{logger-C4m8rfMy.js → logger-D1sWX2I0.js} +17 -2
- package/dist/_chunks/logger-D1sWX2I0.js.map +1 -0
- package/dist/_chunks/{node-response-8Vz29cGS.js → node-response-Cp62CtH1.js} +2 -2
- package/dist/_chunks/{node-response-8Vz29cGS.js.map → node-response-Cp62CtH1.js.map} +1 -1
- package/dist/_chunks/{poison-scan-Dpl3ibG-.js → poison-scan-DdkJoHvP.js} +2 -2
- package/dist/_chunks/{poison-scan-Dpl3ibG-.js.map → poison-scan-DdkJoHvP.js.map} +1 -1
- package/dist/_chunks/{scanner-CCEHN9Jg.js → scanner-B6V2RqqF.js} +20 -3
- package/dist/_chunks/scanner-B6V2RqqF.js.map +1 -0
- package/dist/_chunks/{sizeof-CIF7fwSJ.js → sizeof-BKA6qOZq.js} +2 -2
- package/dist/_chunks/{sizeof-CIF7fwSJ.js.map → sizeof-BKA6qOZq.js.map} +1 -1
- package/dist/_chunks/{walkers-BbotBhNG.js → walkers-BAZoAlfI.js} +3 -3
- package/dist/_chunks/{walkers-BbotBhNG.js.map → walkers-BAZoAlfI.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/cli-check.d.ts +3 -3
- package/dist/cli-check.d.ts.map +1 -1
- package/dist/cli.js +3 -3
- package/dist/client/document-withdrawal.d.ts +2 -0
- package/dist/client/document-withdrawal.d.ts.map +1 -0
- package/dist/client/outlet-content-cache.d.ts +13 -1
- package/dist/client/outlet-content-cache.d.ts.map +1 -1
- package/dist/client/outlet-scope-context.d.ts +5 -0
- package/dist/client/outlet-scope-context.d.ts.map +1 -1
- package/dist/client/segment-outlet.d.ts.map +1 -1
- package/dist/config-types.d.ts +43 -21
- package/dist/config-types.d.ts.map +1 -1
- package/dist/config-validation.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -9
- package/dist/index.js.map +1 -1
- package/dist/native/rsc/manifest.json +2 -0
- package/dist/native/rsc/server/als-registry.js.map +1 -1
- package/dist/native/rsc/server/cookie-context.js +7 -7
- package/dist/native/rsc/server/cookie-context.js.map +1 -1
- package/dist/native/rsc/server/deny-boundary.js +2 -1
- package/dist/native/rsc/server/deny-boundary.js.map +1 -1
- package/dist/native/rsc/server/dev-overlay-report.js +13 -0
- package/dist/native/rsc/server/dev-overlay-report.js.map +1 -0
- package/dist/native/rsc/server/logger.js +6 -1
- package/dist/native/rsc/server/logger.js.map +1 -1
- package/dist/native/rsc/server/pipeline-interception.js +4 -1
- package/dist/native/rsc/server/pipeline-interception.js.map +1 -1
- package/dist/native/rsc/server/pipeline.js.map +1 -1
- package/dist/native/rsc/server/request-context.js +4 -4
- package/dist/native/rsc/server/request-context.js.map +1 -1
- package/dist/native/rsc/server/route-element-builder.js +1 -1
- package/dist/native/rsc/server/route-element-builder.js.map +1 -1
- package/dist/native/rsc/server/route-module-loader.js +5 -4
- package/dist/native/rsc/server/route-module-loader.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js +1 -1
- package/dist/native/rsc/server/rsc-entry/render-route.js.map +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js +1 -1
- package/dist/native/rsc/server/rsc-entry/revalidate-renderer.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js +2 -1
- package/dist/native/rsc/server/segment-lifetime/outlet-gate.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-rule.js +31 -20
- package/dist/native/rsc/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/read-scope.js +48 -7
- package/dist/native/rsc/server/segment-lifetime/read-scope.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/segment-key.js +13 -8
- package/dist/native/rsc/server/segment-lifetime/segment-key.js.map +1 -1
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js +5 -4
- package/dist/native/rsc/server/segment-lifetime/slot-outlets.js.map +1 -1
- package/dist/native/rsc/server/slot-resolver.js +5 -4
- package/dist/native/rsc/server/slot-resolver.js.map +1 -1
- package/dist/native/rsc/server/slot-subtree-contain.js +2 -1
- package/dist/native/rsc/server/slot-subtree-contain.js.map +1 -1
- package/dist/native/rsc/server/subtree-walk.js +14 -5
- package/dist/native/rsc/server/subtree-walk.js.map +1 -1
- package/dist/native/rsc/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/rsc/shared/key-headers.js +4 -1
- package/dist/native/rsc/shared/key-headers.js.map +1 -1
- package/dist/native/rsc/shared/layout-defaults.js +19 -0
- package/dist/native/rsc/shared/layout-defaults.js.map +1 -0
- package/dist/native/ssr/client/document-withdrawal.js +17 -0
- package/dist/native/ssr/client/document-withdrawal.js.map +1 -0
- package/dist/native/ssr/client/outlet-content-cache.js +6 -1
- package/dist/native/ssr/client/outlet-content-cache.js.map +1 -1
- package/dist/native/ssr/client/outlet-scope-context.js.map +1 -1
- package/dist/native/ssr/client/segment-outlet.js +11 -2
- package/dist/native/ssr/client/segment-outlet.js.map +1 -1
- package/dist/native/ssr/manifest.json +6 -0
- package/dist/native/ssr/server/als-registry.js.map +1 -1
- package/dist/native/ssr/server/cookie-context.js +7 -7
- package/dist/native/ssr/server/cookie-context.js.map +1 -1
- package/dist/native/ssr/server/deny-boundary.js +2 -1
- package/dist/native/ssr/server/deny-boundary.js.map +1 -1
- package/dist/native/ssr/server/dev-overlay-report.js +6 -0
- package/dist/native/ssr/server/dev-overlay-report.js.map +1 -0
- package/dist/native/ssr/server/logger.js +6 -1
- package/dist/native/ssr/server/logger.js.map +1 -1
- package/dist/native/ssr/server/pipeline-interception.js +4 -1
- package/dist/native/ssr/server/pipeline-interception.js.map +1 -1
- package/dist/native/ssr/server/pipeline.js.map +1 -1
- package/dist/native/ssr/server/request-context.js +4 -4
- package/dist/native/ssr/server/request-context.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js +12 -0
- package/dist/native/ssr/server/segment-lifetime/outlet-gate.js.map +1 -0
- package/dist/native/ssr/server/segment-lifetime/read-rule.js +31 -20
- package/dist/native/ssr/server/segment-lifetime/read-rule.js.map +1 -1
- package/dist/native/ssr/server/segment-lifetime/read-scope.js +16 -0
- package/dist/native/ssr/server/segment-lifetime/read-scope.js.map +1 -0
- package/dist/native/ssr/server/subtree-walk.js +149 -0
- package/dist/native/ssr/server/subtree-walk.js.map +1 -0
- package/dist/native/ssr/server/utils/element-type.js +21 -9
- package/dist/native/ssr/server/utils/element-type.js.map +1 -1
- package/dist/native/ssr/server/vite-handoff-rsc.js.map +1 -1
- package/dist/native/ssr/shared/key-headers.js +4 -1
- package/dist/native/ssr/shared/key-headers.js.map +1 -1
- package/dist/native/ssr/shared/layout-defaults.js +9 -0
- package/dist/native/ssr/shared/layout-defaults.js.map +1 -0
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/routing/convention-lint.d.ts +2 -2
- package/dist/routing/convention-lint.d.ts.map +1 -1
- package/dist/routing/index.js +3 -3
- package/dist/routing/route-options-lint.d.ts +2 -2
- package/dist/routing/route-options-lint.d.ts.map +1 -1
- package/dist/routing/slot-placement.d.ts +23 -4
- package/dist/routing/slot-placement.d.ts.map +1 -1
- package/dist/server/als-registry.d.ts +18 -0
- package/dist/server/als-registry.d.ts.map +1 -1
- package/dist/server/deny-boundary.d.ts.map +1 -1
- package/dist/server/dev-overlay-report.d.ts +13 -0
- package/dist/server/dev-overlay-report.d.ts.map +1 -0
- package/dist/server/index.js +2 -2
- package/dist/server/internal.js +97 -8
- package/dist/server/internal.js.map +1 -1
- package/dist/server/logger.d.ts +10 -0
- package/dist/server/logger.d.ts.map +1 -1
- package/dist/server/pipeline-interception.d.ts.map +1 -1
- package/dist/server/pipeline.d.ts +13 -1
- package/dist/server/pipeline.d.ts.map +1 -1
- package/dist/server/route-module-loader.d.ts +4 -3
- package/dist/server/route-module-loader.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 +3 -3
- package/dist/server/rsc-entry/render-route.d.ts.map +1 -1
- package/dist/server/rsc-entry/revalidate-renderer.d.ts +3 -3
- package/dist/server/rsc-entry/revalidate-renderer.d.ts.map +1 -1
- package/dist/server/segment-lifetime/outlet-gate.d.ts +5 -5
- package/dist/server/segment-lifetime/outlet-gate.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-rule.d.ts +14 -18
- package/dist/server/segment-lifetime/read-rule.d.ts.map +1 -1
- package/dist/server/segment-lifetime/read-scope.d.ts +47 -6
- package/dist/server/segment-lifetime/read-scope.d.ts.map +1 -1
- package/dist/server/segment-lifetime/segment-key.d.ts +21 -18
- package/dist/server/segment-lifetime/segment-key.d.ts.map +1 -1
- package/dist/server/segment-lifetime/slot-outlets.d.ts +3 -4
- package/dist/server/segment-lifetime/slot-outlets.d.ts.map +1 -1
- package/dist/server/slot-resolver.d.ts.map +1 -1
- package/dist/server/slot-subtree-contain.d.ts.map +1 -1
- package/dist/server/subtree-walk.d.ts +17 -3
- package/dist/server/subtree-walk.d.ts.map +1 -1
- package/dist/server/types.d.ts +4 -3
- package/dist/server/types.d.ts.map +1 -1
- package/dist/server/vite-handoff-rsc.d.ts +2 -0
- package/dist/server/vite-handoff-rsc.d.ts.map +1 -1
- package/dist/shared/key-headers.d.ts +2 -0
- package/dist/shared/key-headers.d.ts.map +1 -1
- package/dist/shared/layout-defaults.d.ts +30 -0
- package/dist/shared/layout-defaults.d.ts.map +1 -0
- package/docs/api/30-api-server.mdx +1 -1
- package/docs/api/34-api-config.mdx +20 -3
- package/package.json +1 -1
- package/src/cli-check.ts +6 -6
- package/src/client/document-withdrawal.tsx +41 -0
- package/src/client/outlet-content-cache.ts +18 -2
- package/src/client/outlet-scope-context.ts +5 -0
- package/src/client/segment-outlet.tsx +9 -3
- package/src/config-types.ts +44 -21
- package/src/config-validation.ts +96 -20
- package/src/index.ts +1 -1
- package/src/plugins/entries.ts +6 -3
- package/src/plugins/routing.ts +1 -1
- package/src/routing/convention-lint.ts +5 -3
- package/src/routing/interception.ts +5 -5
- package/src/routing/route-options-lint.ts +6 -6
- package/src/routing/slot-placement.ts +41 -4
- package/src/server/als-registry.ts +14 -0
- package/src/server/cookie-context.ts +7 -7
- package/src/server/deny-boundary.ts +4 -1
- package/src/server/dev-overlay-report.ts +22 -0
- package/src/server/logger.ts +13 -0
- package/src/server/pipeline-interception.ts +11 -2
- package/src/server/pipeline.ts +13 -1
- package/src/server/request-context.ts +6 -6
- package/src/server/route-element-builder.ts +3 -3
- package/src/server/route-module-loader.ts +7 -6
- package/src/server/rsc-entry/index.ts +14 -8
- package/src/server/rsc-entry/render-route.ts +4 -4
- package/src/server/rsc-entry/revalidate-renderer.ts +4 -4
- package/src/server/segment-lifetime/outlet-gate.ts +6 -6
- package/src/server/segment-lifetime/read-rule.ts +67 -33
- package/src/server/segment-lifetime/read-scope.ts +128 -14
- package/src/server/segment-lifetime/segment-key.ts +32 -24
- package/src/server/segment-lifetime/slot-outlets.ts +8 -12
- package/src/server/slot-resolver.ts +22 -10
- package/src/server/slot-subtree-contain.ts +2 -1
- package/src/server/subtree-walk.ts +34 -9
- package/src/server/types.ts +4 -3
- package/src/server/vite-handoff-rsc.ts +2 -0
- package/src/shared/key-headers.ts +5 -0
- package/src/shared/layout-defaults.ts +43 -0
- package/dist/_chunks/actions-BkwgRwCl.js.map +0 -1
- package/dist/_chunks/chains-LGjBHfSN.js +0 -1
- package/dist/_chunks/cli-check-KeE1QaIx.js.map +0 -1
- package/dist/_chunks/convention-lint-0AEsPK2T.js.map +0 -1
- package/dist/_chunks/dev-server-CboXr8zX.js +0 -1
- package/dist/_chunks/key-headers-uIig1_mU.js.map +0 -1
- package/dist/_chunks/logger-C4m8rfMy.js.map +0 -1
- package/dist/_chunks/scanner-CCEHN9Jg.js.map +0 -1
|
@@ -98,6 +98,7 @@
|
|
|
98
98
|
"server/default-status-page.ts": "server/default-status-page.js",
|
|
99
99
|
"server/deny-boundary.ts": "server/deny-boundary.js",
|
|
100
100
|
"server/deny-renderer.ts": "server/deny-renderer.js",
|
|
101
|
+
"server/dev-overlay-report.ts": "server/dev-overlay-report.js",
|
|
101
102
|
"server/early-hints-sender.ts": "server/early-hints-sender.js",
|
|
102
103
|
"server/early-hints.ts": "server/early-hints.js",
|
|
103
104
|
"server/error-boundary-wrapper.ts": "server/error-boundary-wrapper.js",
|
|
@@ -223,6 +224,7 @@
|
|
|
223
224
|
"shared/href-validation.ts": "shared/href-validation.js",
|
|
224
225
|
"shared/href.ts": "shared/href.js",
|
|
225
226
|
"shared/key-headers.ts": "shared/key-headers.js",
|
|
227
|
+
"shared/layout-defaults.ts": "shared/layout-defaults.js",
|
|
226
228
|
"shared/merge-search-params.ts": "shared/merge-search-params.js",
|
|
227
229
|
"shared/outlet-decision.ts": "shared/outlet-decision.js",
|
|
228
230
|
"shared/param-value.ts": "shared/param-value.js",
|
|
@@ -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;
|
|
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;AA2CA,IAAa,uBAAuB,eAClC,OAAO,IAAI,gCAAgC,CAC7C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { checkCookieRead, checkUnscopedRead } from "./segment-lifetime/read-rule.js";
|
|
2
2
|
import { COOKIE_READ_THROUGH } from "../shared/cookie-read-through.js";
|
|
3
3
|
import { requestContextAls } from "./als-registry.js";
|
|
4
4
|
import { isDebug } from "./debug.js";
|
|
@@ -13,22 +13,22 @@ function getCookieJar() {
|
|
|
13
13
|
const map = store.parsedCookies;
|
|
14
14
|
return {
|
|
15
15
|
get(name) {
|
|
16
|
-
|
|
16
|
+
checkCookieRead(name);
|
|
17
17
|
noteCookieReadForReactCache(name);
|
|
18
18
|
return map.get(name);
|
|
19
19
|
},
|
|
20
20
|
[COOKIE_READ_THROUGH](name, codec) {
|
|
21
|
-
|
|
21
|
+
checkCookieRead(name, codec);
|
|
22
22
|
noteCookieReadForReactCache(name);
|
|
23
23
|
return map.get(name);
|
|
24
24
|
},
|
|
25
25
|
has(name) {
|
|
26
|
-
|
|
26
|
+
checkCookieRead(name);
|
|
27
27
|
noteCookieReadForReactCache(name);
|
|
28
28
|
return map.has(name);
|
|
29
29
|
},
|
|
30
30
|
getAll() {
|
|
31
|
-
|
|
31
|
+
checkUnscopedRead("every cookie");
|
|
32
32
|
noteCookieReadForReactCache("*");
|
|
33
33
|
return Array.from(map.entries()).map(([name, value]) => ({
|
|
34
34
|
name,
|
|
@@ -36,7 +36,7 @@ function getCookieJar() {
|
|
|
36
36
|
}));
|
|
37
37
|
},
|
|
38
38
|
get size() {
|
|
39
|
-
|
|
39
|
+
checkUnscopedRead("the number of cookies");
|
|
40
40
|
noteCookieReadForReactCache("*");
|
|
41
41
|
return map.size;
|
|
42
42
|
},
|
|
@@ -114,7 +114,7 @@ function getCookieJar() {
|
|
|
114
114
|
warnIfCachedCookieIsWritten("*");
|
|
115
115
|
},
|
|
116
116
|
toString() {
|
|
117
|
-
|
|
117
|
+
checkUnscopedRead("every cookie");
|
|
118
118
|
noteCookieReadForReactCache("*");
|
|
119
119
|
return Array.from(map.entries()).map(([name, value]) => `${name}=${encodeURIComponent(value)}`).join("; ");
|
|
120
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie-context.js","names":[],"sources":["../../../../src/server/cookie-context.ts"],"mappings":";;;;;;;;AA8DA,SAAgB,eAA+B;CAC7C,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,uJAEF;CAIF,IAAI,CAAC,MAAM,eACT,MAAM,gBAAgB,kBAAkB,MAAM,YAAY;CAG5D,MAAM,MAAM,MAAM;CAClB,OAAO;EAIL,IAAI,MAAkC;GACpC,
|
|
1
|
+
{"version":3,"file":"cookie-context.js","names":[],"sources":["../../../../src/server/cookie-context.ts"],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { requestContextAls } from "./als-registry.js";
|
|
|
3
3
|
import { isDenySignal } from "./signal-identity.js";
|
|
4
4
|
import { loadFallbackModule } from "./pipeline-helpers.js";
|
|
5
5
|
import { withSpan } from "./tracing.js";
|
|
6
|
+
import { fallbackAfter } from "./segment-lifetime/read-scope.js";
|
|
6
7
|
import { isValidElementType } from "./utils/element-type.js";
|
|
7
8
|
import { createElement } from "../_react/react.js";
|
|
8
9
|
// src/server/deny-boundary.ts
|
|
@@ -124,7 +125,7 @@ function handleCaughtDeny(chain, error, selfKey) {
|
|
|
124
125
|
const placement = chain ? placeDenyPage(chain, error.status, error.data, selfKey) : null;
|
|
125
126
|
if (placement?.kind === "render") {
|
|
126
127
|
setDenyStatus(error.status);
|
|
127
|
-
return placement.element;
|
|
128
|
+
return fallbackAfter(error, placement.element);
|
|
128
129
|
}
|
|
129
130
|
if (placement?.kind === "hoist") {
|
|
130
131
|
setDenyStatus(error.status);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deny-boundary.js","names":[],"sources":["../../../../src/server/deny-boundary.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"deny-boundary.js","names":[],"sources":["../../../../src/server/deny-boundary.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
// src/server/dev-overlay-report.ts
|
|
2
|
+
var reporter;
|
|
3
|
+
function setDevOverlayReporter(report) {
|
|
4
|
+
reporter = report;
|
|
5
|
+
}
|
|
6
|
+
function reportToDevOverlay(error) {
|
|
7
|
+
if (!reporter) return false;
|
|
8
|
+
reporter(error);
|
|
9
|
+
return true;
|
|
10
|
+
}
|
|
11
|
+
export { reportToDevOverlay, setDevOverlayReporter };
|
|
12
|
+
|
|
13
|
+
//# sourceMappingURL=dev-overlay-report.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-overlay-report.js","names":[],"sources":["../../../../src/server/dev-overlay-report.ts"],"mappings":";AASA,IAAI;AAGJ,SAAgB,sBAAsB,QAAoD;CACxF,WAAW;AACb;AAGA,SAAgB,mBAAmB,OAAuB;CACxD,IAAI,CAAC,UAAU,OAAO;CACtB,SAAS,KAAK;CACd,OAAO;AACT"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { generateTraceId, getTraceStore } from "./tracing.js";
|
|
2
2
|
import { createDefaultLogger } from "./default-logger.js";
|
|
3
3
|
import { isDevMode } from "./debug.js";
|
|
4
|
+
import { reportToDevOverlay } from "./dev-overlay-report.js";
|
|
4
5
|
import { isControlFlowSignal } from "./signal-identity.js";
|
|
5
6
|
// src/server/logger.ts
|
|
6
7
|
var _logger = createDefaultLogger();
|
|
@@ -24,6 +25,10 @@ function logCsrfRejected(detail, data) {
|
|
|
24
25
|
fields.trace_id ??= generateTraceId();
|
|
25
26
|
_logger.warn(`CSRF origin check failed: ${detail}`, fields);
|
|
26
27
|
}
|
|
28
|
+
function logDocumentReadOutsideKey(error, data) {
|
|
29
|
+
if (reportToDevOverlay(error)) return;
|
|
30
|
+
_logger.warn(error.message, withTraceContext(data));
|
|
31
|
+
}
|
|
27
32
|
function logRequestCompleted(data) {
|
|
28
33
|
_logger.info("request completed", withTraceContext(data));
|
|
29
34
|
}
|
|
@@ -92,6 +97,6 @@ function swallow(err, reason, opts) {
|
|
|
92
97
|
_logger[level](`swallowed: ${reason}`, withTraceContext({ error: err }));
|
|
93
98
|
} catch {}
|
|
94
99
|
}
|
|
95
|
-
export { getLogger, logActionError, logActionRejected, logCacheMiss, logCacheReadFailed, logCsrfRejected, logKeyDisciplineViolation, logLossyCacheValue, logMiddlewareError, logMiddlewareShortCircuit, logProxyError, logRenderError, logRequestCompleted, logRequestReceived, logRouteError, logRouteSetupError, logSkippedModule, logSlowRequest, logSwrRefetchFailed, logWaitUntilRejected, logWaitUntilUnsupported, setLogger, swallow };
|
|
100
|
+
export { getLogger, logActionError, logActionRejected, logCacheMiss, logCacheReadFailed, logCsrfRejected, logDocumentReadOutsideKey, logKeyDisciplineViolation, logLossyCacheValue, logMiddlewareError, logMiddlewareShortCircuit, logProxyError, logRenderError, logRequestCompleted, logRequestReceived, logRouteError, logRouteSetupError, logSkippedModule, logSlowRequest, logSwrRefetchFailed, logWaitUntilRejected, logWaitUntilUnsupported, setLogger, swallow };
|
|
96
101
|
|
|
97
102
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","names":[],"sources":["../../../../src/server/logger.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","names":[],"sources":["../../../../src/server/logger.ts"],"mappings":"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"}
|
|
@@ -64,7 +64,10 @@ function resolveInterceptedRoute(config, req, canonicalPathname, canonicalMatch)
|
|
|
64
64
|
const sourceMatch = config.matchRoute(rewrite.interceptingPrefix);
|
|
65
65
|
if (sourceMatch !== null && computeSegmentTreePaths(sourceMatch.segments).includes(rewrite.interceptingScope)) {
|
|
66
66
|
match = sourceMatch;
|
|
67
|
-
interception = {
|
|
67
|
+
interception = {
|
|
68
|
+
targetPathname: canonicalPathname,
|
|
69
|
+
interceptingScope: rewrite.interceptingScope
|
|
70
|
+
};
|
|
68
71
|
}
|
|
69
72
|
}
|
|
70
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline-interception.js","names":[],"sources":["../../../../src/server/pipeline-interception.ts"],"mappings":";;;;;;;;AAoFA,SAAgB,sBACd,gBACA,qBACA,UAC4B;CAK5B,MAAM,aAAa,SAAS,QAAQ,YAClC,uBAAuB,gBAAgB,QAAQ,kBAAkB,CACnE;CACA,IAAI,WAAW,WAAW,GAAG,OAAO;CAIpC,MAAM,SAAS,oBAAoB;CACnC,IAAI,CAAC,QAAQ,OAAO;CAMpB,KAAK,MAAM,SAAS,QAClB,KAAK,MAAM,WAAW,YACpB,IAAI,MAAM,IAAI,QAAQ,iBAAiB,GAAG,OAAO;CAGrD,OAAO;AACT;AAQA,SAAgB,uBAAuB,UAAkB,SAA0B;CACjF,MAAM,YAAY,aAAa,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG;CACrE,MAAM,eAAe,YAAY,MAAM,CAAC,IAAI,QAAQ,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG;CAEtE,IAAI,KAAK;CACT,KAAK,IAAI,IAAI,GAAG,IAAI,aAAa,QAAQ,KAAK;EAC5C,MAAM,MAAM,mBAAmB,aAAa,EAAE;EAE9C,QAAQ,IAAI,MAAZ;GACE,KAAK,aACH,OAAO,KAAK,UAAU;GACxB,KAAK,sBACH,OAAO;GACT,KAAK,WAAW;IACd,IAAI,MAAM,UAAU,QAAQ,OAAO;IACnC,MAAM,SAAS,IAAI,UAAU;IAC7B,MAAM,SAAS,IAAI,UAAU;IAC7B,MAAM,WAAW,UAAU;IAC3B,IAAI,UAAU,QACZ;SACE,SAAS,UAAU,OAAO,SAAS,OAAO,UACzC,UAAU,CAAC,SAAS,WAAW,MAAM,KACrC,UAAU,CAAC,SAAS,SAAS,MAAM,GAEpC,OAAO;IACT;IAEF;IACA;GACF;GACA,KAAK;IACH,IAAI,MAAM,UAAU,UAAU,UAAU,QAAQ,IAAI,OAAO,OAAO;IAClE;IACA;EACJ;CACF;CAEA,OAAO,OAAO,UAAU;AAC1B;AA4BA,SAAgB,wBACd,QACA,KACA,mBACA,gBACe;CACf,MAAM,qBAAqB,OAAO,sBAAsB;CACxD,IAAI,QAAQ;CACZ,IAAI;CAQJ,IAAI,aAAa,GAAG,KAAK,OAAO,sBAAsB,QAAQ;EAC5D,MAAM,eAAe,IAAI,QAAQ,IAAI,cAAc;EACnD,MAAM,qBAAqB,eACvB,2BAA2B,cAAc,kBAAkB,IAC3D;EACJ,IAAI,oBAAoB;GAgCtB,MAAM,4BAA4B;IAChC,MAAM,UAAU,IAAI,IAAI,qBAAqB,GAAG,CAAC,EAAE,aAAa,CAAC,CAAC;IAClE,MAAM,cAAc,OAAO,WAAW,kBAAkB;IAExD,MAAM,SAAS,CAAC,SAAS,IADH,IAAI,cAAc,wBAAwB,YAAY,QAAQ,IAAI,CAAC,CAChE,CAAS,CAAC,CAAC,QAAQ,UAAU,MAAM,OAAO,CAAC;IAGpE,OAAO,OAAO,SAAS,IAAI,SAAS;GACtC;GACA,MAAM,UAAU,sBACd,mBACA,qBACA,OAAO,oBACT;GACA,IAAI,SAAS,SAAS,YAAY;IAWhC,MAAM,mBAAmB,OAAO,wBAC9B,mBACA,QAAQ,iBACV;IACA,IAAI,kBAAkB,QAAQ;GAChC,OAAO,IAAI,SAAS;IAClB,MAAM,cAAc,OAAO,WAAW,QAAQ,kBAAkB;
|
|
1
|
+
{"version":3,"file":"pipeline-interception.js","names":[],"sources":["../../../../src/server/pipeline-interception.ts"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","names":[],"sources":["../../../../src/server/pipeline.ts"],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"pipeline.js","names":[],"sources":["../../../../src/server/pipeline.ts"],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ 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 {
|
|
7
|
+
import { checkSearchParamsRead, checkUnscopedRead, currentReadScope, keyedHeaders, scopedParams } from "./segment-lifetime/read-rule.js";
|
|
8
8
|
// src/server/request-context.ts
|
|
9
9
|
function getHeaders() {
|
|
10
10
|
const store = requestContextAls.getStore();
|
|
@@ -18,8 +18,8 @@ function getHeader(name) {
|
|
|
18
18
|
function getSearchParams(reader) {
|
|
19
19
|
const store = requestContextAls.getStore();
|
|
20
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)
|
|
22
|
-
else
|
|
21
|
+
if (reader) checkSearchParamsRead(reader);
|
|
22
|
+
else checkUnscopedRead("the raw search params");
|
|
23
23
|
return store.searchParams;
|
|
24
24
|
}
|
|
25
25
|
_setGetSearchParamsFn(getSearchParams);
|
|
@@ -86,7 +86,7 @@ function extractDynamicSegments(route) {
|
|
|
86
86
|
}
|
|
87
87
|
function getRequestSearchString() {
|
|
88
88
|
const store = requestContextAls.getStore();
|
|
89
|
-
if (store)
|
|
89
|
+
if (store) checkUnscopedRead("the raw search params");
|
|
90
90
|
return store?.searchString ?? "";
|
|
91
91
|
}
|
|
92
92
|
function runWithRequestContext(req, fn, { reactCacheScope, cookies, formState, actionError } = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":";;;;;;;;AAuDA,SAAgB,aAA8B;CAC5C,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,qJAEF;CAIF,MAAM,QAAQ,iBAAiB;CAC/B,OAAO,QAAQ,aAAa,MAAM,SAAS,KAAK,IAAI,MAAM;AAC5D;AAUA,SAAgB,UAAU,MAAkC;CAE1D,OADgB,WACT,CAAA,CAAQ,IAAI,IAAI,KAAK;AAC9B;AAWA,SAAgB,gBAAgB,QAA8C;CAC5E,MAAM,QAAQ,kBAAkB,SAAS;CACzC,IAAI,CAAC,OACH,MAAM,IAAI,MACR,0JAEF;CAIF,IAAI,QAAQ,
|
|
1
|
+
{"version":3,"file":"request-context.js","names":[],"sources":["../../../../src/server/request-context.ts"],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ function wrapAccessGate(element, opts, h) {
|
|
|
53
53
|
async function buildRouteElement(req, match, interception, render, metadataRouteHashes) {
|
|
54
54
|
const segments = match.segments;
|
|
55
55
|
const loadBoundaryModule = (file) => loadFallbackModule(file, req, segments);
|
|
56
|
-
const { metadataSources, layoutComponents, PageComponent: LoadedPage, deferSuspenseFor, accessFns, documentLifetimes } = await loadRouteModules(segments, req.url, render.
|
|
56
|
+
const { metadataSources, layoutComponents, PageComponent: LoadedPage, deferSuspenseFor, accessFns, documentLifetimes } = await loadRouteModules(segments, req.url, render.layoutDefaults);
|
|
57
57
|
const mainParams = documentLifetimes.page !== void 0 || documentLifetimes.layouts.some(Boolean) ? getSegmentParams() : {};
|
|
58
58
|
const interceptionGates = await loadInterceptionGates(match);
|
|
59
59
|
const gateFor = (i) => i < (interceptionGates?.sharedCount ?? 0) ? void 0 : accessFns[i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAqEA,SAAgB,yBACd,UACA,OACA,OACU;CACV,MAAM,QAAQ,iBAAiB,UAAU,OAAO,KAAK;CACrD,OAAO,MAAM,WAAW,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,GAAG,KAAK;AAClD;AAMA,IAAa,uBAAb,cAA0C,MAAM;CAC9C,YAAY,SAAiB;EAC3B,MAAM,OAAO;EACb,KAAK,OAAO;CACd;AACF;AA0CA,SAAS,uBACP,SACA,SACA,GACoB;CACpB,KAAK,MAAM,QAAQ,SACjB,UAAU,EAAE,mBAAmB;EAC7B,gBAAgB,KAAK;EACrB,aAAa,KAAK;EAClB,QAAQ,KAAK;EACb,cAAc,KAAK;EACnB,UAAU;CACZ,CAAC;CAEH,OAAO;AACT;AAGA,SAAS,eACP,SACA,MAOA,GACoB;CACpB,OAAO,EAAE,YAAY;EACnB,UAAU,KAAK;EACf,aAAa,KAAK,QAAQ;EAC1B,YAAY,KAAK;EACjB,cAAc,KAAK;EACnB,GAAI,KAAK,YAAY,EAAE,WAAW,KAAK,UAAU,IAAI,CAAC;EACtD,UAAU;CACZ,CAAC;AACH;AAmBA,eAAsB,kBACpB,KACA,OACA,cACA,QACA,qBAC6B;CAC7B,MAAM,WAAW,MAAM;CAGvB,MAAM,sBAAsB,SAAyB,mBAAmB,MAAM,KAAK,QAAQ;CAQ3F,MAAM,EACJ,iBACA,kBACA,eAAe,YACf,kBACA,WACA,sBACE,MAAM,iBAAiB,UAAU,IAAI,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"route-element-builder.js","names":[],"sources":["../../../../src/server/route-element-builder.ts"],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { NO_LAYOUT_DEFAULTS } from "../shared/layout-defaults.js";
|
|
1
2
|
import { loadModule } from "./safe-load.js";
|
|
2
3
|
import { ROUTE_OPTIONS_EXPORT } from "../shared/route-options-export.js";
|
|
3
4
|
import { NoPageComponentError } from "./route-element-builder.js";
|
|
4
|
-
import {
|
|
5
|
+
import { layoutDefaultsAt, readDocumentLifetime } from "./segment-lifetime/segment-key.js";
|
|
5
6
|
// src/server/route-module-loader.ts
|
|
6
7
|
function rejectLegacyGenerateMetadata(mod, filePath) {
|
|
7
8
|
if ("generateMetadata" in mod) throw new Error(`${filePath}: "generateMetadata" is not a valid export. Export an async function named "metadata" instead.\n\n // Before\n export async function generateMetadata({ params }) { ... }\n\n // After\n export async function metadata() { ... }`);
|
|
@@ -22,7 +23,7 @@ function collectModuleExports(mod, segment, segmentIndex, isPage, metadataSource
|
|
|
22
23
|
});
|
|
23
24
|
return extractDeferSuspenseFor(mod, isPage, currentDefer);
|
|
24
25
|
}
|
|
25
|
-
async function loadRouteModules(segments, requestUrl,
|
|
26
|
+
async function loadRouteModules(segments, requestUrl, layoutDefaults) {
|
|
26
27
|
const metadataSources = [];
|
|
27
28
|
const layoutComponents = [];
|
|
28
29
|
const accessFns = [];
|
|
@@ -34,7 +35,7 @@ async function loadRouteModules(segments, requestUrl, defaultLayoutLifetime) {
|
|
|
34
35
|
const isLeaf = i === segments.length - 1;
|
|
35
36
|
if (segment.layout) {
|
|
36
37
|
const mod = await loadModule(segment.layout);
|
|
37
|
-
documentLifetimes.layouts[i] = readDocumentLifetime(mod, "layout",
|
|
38
|
+
documentLifetimes.layouts[i] = readDocumentLifetime(mod, "layout", layoutDefaultsAt(segments.slice(0, i + 1), layoutDefaults));
|
|
38
39
|
if (mod.default) layoutComponents.push({
|
|
39
40
|
component: mod.default,
|
|
40
41
|
segment
|
|
@@ -44,7 +45,7 @@ async function loadRouteModules(segments, requestUrl, defaultLayoutLifetime) {
|
|
|
44
45
|
if (isLeaf && segment.page) {
|
|
45
46
|
const mod = await loadModule(segment.page);
|
|
46
47
|
if (mod.default) PageComponent = mod.default;
|
|
47
|
-
documentLifetimes.page = readDocumentLifetime(mod, "page",
|
|
48
|
+
documentLifetimes.page = readDocumentLifetime(mod, "page", NO_LAYOUT_DEFAULTS);
|
|
48
49
|
deferSuspenseFor = collectModuleExports(mod, segment, i, true, metadataSources, deferSuspenseFor);
|
|
49
50
|
}
|
|
50
51
|
if (segment.access) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-module-loader.js","names":[],"sources":["../../../../src/server/route-module-loader.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-module-loader.js","names":[],"sources":["../../../../src/server/route-module-loader.ts"],"mappings":";;;;;;AAgDA,SAAS,6BAA6B,KAA8B,UAAwB;CAC1F,IAAI,sBAAsB,KACxB,MAAM,IAAI,MACR,GAAG,SAAS,sOAMd;AAEJ;AASA,SAAS,wBACP,KACA,QACA,SACQ;CACR,MAAM,UAAU,IAAI,qBAAqB,SAAS,SAAS;CAC3D,IAAI,OAAO,YAAY,YAAY,YAAY,QAAQ,EAAE,sBAAsB,UAC7E,OAAO;CAET,MAAM,QAAQ,QAAQ;CACtB,OAAO,OAAO,UAAU,YAAY,QAAQ,UAAU,QAAQ;AAChE;AAMA,SAAS,qBACP,KACA,SACA,cACA,QACA,iBACA,cACQ;CAER,6BAA6B,MADX,SAAS,QAAQ,MAAM,WAAW,QAAQ,QAAQ,aAAa,QAAQ,OAC/C;CAC1C,IAAI,IAAI,UACN,gBAAgB,KAAK;EACnB,gBAAgB,IAAI;EACpB,aAAa,QAAQ,eAAe,QAAQ;EAC5C;EACA;CACF,CAAC;CAEH,OAAO,wBAAwB,KAAK,QAAQ,YAAY;AAC1D;AAQA,eAAsB,iBACpB,UACA,YAEA,gBAC6B;CAC7B,MAAM,kBAAoC,CAAC;CAC3C,MAAM,mBAA2C,CAAC;CAClD,MAAM,YAA6B,CAAC;CACpC,IAAI,gBAA0D;CAC9D,IAAI,mBAAmB;CACvB,MAAM,oBAA6D,EAAE,SAAS,CAAC,EAAE;CAEjF,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EACxC,MAAM,UAAU,SAAS;EACzB,MAAM,SAAS,MAAM,SAAS,SAAS;EAEvC,IAAI,QAAQ,QAAQ;GAClB,MAAM,MAAM,MAAM,WAAW,QAAQ,MAAM;GAC3C,kBAAkB,QAAQ,KAAK,qBAC7B,KACA,UACA,iBAAiB,SAAS,MAAM,GAAG,IAAI,CAAC,GAAG,cAAc,CAC3D;GACA,IAAI,IAAI,SACN,iBAAiB,KAAK;IACpB,WAAW,IAAI;IACf;GACF,CAAC;GAEH,mBAAmB,qBACjB,KACA,SACA,GACA,OACA,iBACA,gBACF;EACF;EAEA,IAAI,UAAU,QAAQ,MAAM;GAC1B,MAAM,MAAM,MAAM,WAAW,QAAQ,IAAI;GACzC,IAAI,IAAI,SACN,gBAAgB,IAAI;GAEtB,kBAAkB,OAAO,qBAAqB,KAAK,QAAQ,kBAAkB;GAC7E,mBAAmB,qBACjB,KACA,SACA,GACA,MACA,iBACA,gBACF;EACF;EAEA,IAAI,QAAQ,QAAQ;GAClB,MAAM,YAAY,MAAM,WAAW,QAAQ,MAAM;GACjD,UAAU,KAAK,UAAU;EAC3B;CACF;CAEA,IAAI,CAAC,eAAe;EAClB,MAAM,cAAc,SACjB,KACE,GAAG,MACF,MAAM,EAAE,IAAI,EAAE,YAAY,UAAU,EAAE,OAAO,QAAQ,KAAK,YAAY,EAAE,SAAS,QAAQ,KAAK,cAAc,EAAE,UAAU,UAAU,EAAE,GAAG,MAAM,SAAS,SAAS,IAAI,YAAY,IACnL,CAAC,CACA,KAAK,IAAI;EACZ,MAAM,IAAI,qBACR,sCAAsC,IAAI,IAAI,UAAU,CAAC,CAAC,SAAS,uBAAuB,aAC5F;CACF;CAEA,OAAO;EACL;EACA;EACA;EACA;EACA;EACA;CACF;AACF"}
|
|
@@ -23,7 +23,7 @@ async function renderRoute(req, match, responseHeaders, deps, interception) {
|
|
|
23
23
|
client: clientState?.documents ?? null,
|
|
24
24
|
signer
|
|
25
25
|
} : null,
|
|
26
|
-
|
|
26
|
+
layoutDefaults: deps.layoutDefaults
|
|
27
27
|
};
|
|
28
28
|
let routeResult;
|
|
29
29
|
const _buildStart = performance.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":";;;;;;;;;;;;;AAmFA,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;CAOtD,MAAM,cAAc,aAAa,GAAG,IAAI,qBAAqB,GAAG,IAAI;CACpE,MAAM,SAAS,mBAAmB,OAAO,KAAK;CAC9C,MAAM,gBAA+B;EACnC,WAAW,SAAS;GAAE,QAAQ,aAAa,aAAa;GAAM;EAAO,IAAI;EACzE,
|
|
1
|
+
{"version":3,"file":"render-route.js","names":[],"sources":["../../../../../src/server/rsc-entry/render-route.ts"],"mappings":";;;;;;;;;;;;;AAmFA,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;CAOtD,MAAM,cAAc,aAAa,GAAG,IAAI,qBAAqB,GAAG,IAAI;CACpE,MAAM,SAAS,mBAAmB,OAAO,KAAK;CAC9C,MAAM,gBAA+B;EACnC,WAAW,SAAS;GAAE,QAAQ,aAAa,aAAa;GAAM;EAAO,IAAI;EACzE,gBAAgB,KAAK;CACvB;CAOA,IAAI;CACJ,MAAM,cAAc,YAAY,IAAI;CACpC,IAAI;EACF,cAAc,MAAM,kBAClB,KACA,OACA,cACA,eACA,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,YAAY,gBAAgB,SAAS,KAAK,KAAK,iBAAiB,aAAa;CAEhG,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"}
|
|
@@ -122,7 +122,7 @@ function createRevalidateRendererFactory(deps) {
|
|
|
122
122
|
client: null,
|
|
123
123
|
signer: deps.keyDigestSigner
|
|
124
124
|
} : null,
|
|
125
|
-
|
|
125
|
+
layoutDefaults: deps.layoutDefaults
|
|
126
126
|
}, deps.buildManifest.metadataRouteHashes)).payload,
|
|
127
127
|
reactCacheScope
|
|
128
128
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"revalidate-renderer.js","names":[],"sources":["../../../../../src/server/rsc-entry/revalidate-renderer.ts"],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { clientComponents } from "../vite-handoff-rsc.js";
|
|
2
|
+
import { NO_LAYOUT_DEFAULTS } from "../../shared/layout-defaults.js";
|
|
2
3
|
import { createElement } from "../../_react/react.js";
|
|
3
4
|
// src/server/segment-lifetime/outlet-gate.ts
|
|
4
5
|
var LIVE_ONLY_RENDER = {
|
|
5
6
|
documents: null,
|
|
6
|
-
|
|
7
|
+
layoutDefaults: NO_LAYOUT_DEFAULTS
|
|
7
8
|
};
|
|
8
9
|
function outletGate(spec) {
|
|
9
10
|
function OutletGate() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet-gate.js","names":[],"sources":["../../../../../src/server/segment-lifetime/outlet-gate.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"outlet-gate.js","names":[],"sources":["../../../../../src/server/segment-lifetime/outlet-gate.ts"],"mappings":";;;;AA8CA,IAAa,mBAAkC;CAC7C,WAAW;CACX,gBAAgB;AAClB;AAUA,SAAgB,WAAW,MAAgC;CACzD,SAAS,aAA2B;EAClC,MAAM,EAAE,kBAAkB,iBAAiB;EAC3C,OAAO,cAAc,eAAe;GAAE,aAAa,KAAK;GAAa,UAAU,OAAO,IAAI;EAAE,CAAC;CAC/F;CACA,aAAa,IAAI,UAAU;CAC3B,OAAO,cAAc,UAAU;AACjC;AAGA,IAAM,eAAe,IAAI,QAAgB;AAQzC,SAAgB,oBAAoB,MAAwB;CAC1D,IAAI,OAAO,SAAS,YAAY,SAAS,QAAQ,EAAE,UAAU,OAAO,OAAO;CAC3E,MAAM,OAAQ,KAA2B;CACzC,OAAO,OAAO,SAAS,cAAc,aAAa,IAAI,IAAI;AAC5D;AAEA,SAAS,OAAO,MAAkC;CAChD,IAAI,CAAC,KAAK,UAAU,OAAO,EAAE,UAAU,KAAK,QAAQ;CACpD,IAAI,YAAY,KAAK,UAAU,OAAO;EAAE,UAAU,KAAK;EAAS,QAAQ,KAAK,SAAS;CAAO;CAC7F,OAAO,aAAa,MAAM,KAAK,SAAS,IAAI;AAC9C;AAUA,SAAS,aAAa,MAAkB,QAAgC;CACtE,MAAM,UAA0C,CAAC;CACjD,KAAK,MAAM,UAAU,KAAK,QAAQ,QAAQ,OAAO,eAAe,OAAO,MAAM;CAC7E,OAAO;EAAE,MAAM;EAAM;EAAQ;CAAQ;AACvC"}
|
|
@@ -1,52 +1,63 @@
|
|
|
1
1
|
import { documentReadScopeAls } from "../als-registry.js";
|
|
2
2
|
import { isUnkeyableHeader } from "../../shared/key-headers.js";
|
|
3
|
+
import { logDocumentReadOutsideKey } from "../logger.js";
|
|
3
4
|
// src/server/segment-lifetime/read-rule.ts
|
|
4
5
|
function currentReadScope() {
|
|
5
6
|
return documentReadScopeAls.getStore();
|
|
6
7
|
}
|
|
8
|
+
function refuseRead(scope, what, part, fixOverride) {
|
|
9
|
+
scope.call.read = true;
|
|
10
|
+
const active = currentReadScope();
|
|
11
|
+
if (active) active.call.read = true;
|
|
12
|
+
if (scope.reported.done) return;
|
|
13
|
+
scope.reported.done = true;
|
|
14
|
+
logDocumentReadOutsideKey(readOutsideKey(scope, what, part, fixOverride), { segment: scope.segmentPath });
|
|
15
|
+
}
|
|
7
16
|
function readOutsideKey(scope, what, part, fixOverride) {
|
|
8
|
-
const fix = fixOverride ?? (part ? `Add it to key.${part}, or declare lifetime: 'request'.` : "A 'document' segment cannot depend on it; declare lifetime: 'request'.");
|
|
9
|
-
return new Error(`[timber] ${scope.segmentPath} is lifetime: 'document' (declared, or from
|
|
17
|
+
const fix = fixOverride ?? (part ? `Add it to key.${part}, or declare lifetime: 'request'.` + (part === "headers" ? " A declared key.headers replaces layoutDefaults.key.headers, so list those too." : "") : "A 'document' segment cannot depend on it; declare lifetime: 'request'.");
|
|
18
|
+
return new Error(`[timber] ${scope.segmentPath} is lifetime: 'document' (declared, or from layoutDefaults) and read ${what}, which is not in its key. ${fix} The segment is skipped without rendering while its key is unchanged, so the read would freeze at its first value; until it is fixed, it renders as lifetime: 'request' for this client instead. See design/53-segment-lifetime.md §"What a 'document' segment may read".`);
|
|
10
19
|
}
|
|
11
20
|
function keyedHeaders(headers, scope) {
|
|
12
21
|
const keyed = (name) => {
|
|
13
22
|
if (scope.headers.has(name.toLowerCase())) return name;
|
|
14
23
|
const what = `the header "${name}"`;
|
|
15
|
-
if (name.toLowerCase() === "cookie")
|
|
16
|
-
if (isUnkeyableHeader(name))
|
|
17
|
-
|
|
24
|
+
if (name.toLowerCase() === "cookie") refuseRead(scope, what, "cookies", "Read cookies through a cookie definition in key.cookies.");
|
|
25
|
+
else if (isUnkeyableHeader(name)) refuseRead(scope, what, void 0, "A key may not name a credential; declare lifetime: 'request'.");
|
|
26
|
+
else refuseRead(scope, what, "headers");
|
|
27
|
+
return name;
|
|
18
28
|
};
|
|
19
29
|
const all = () => {
|
|
20
|
-
|
|
30
|
+
refuseRead(scope, "every request header", void 0, "Read each header you need with getHeaders().get(name) and add it to key.headers, or declare lifetime: 'request'.");
|
|
31
|
+
return headers;
|
|
21
32
|
};
|
|
22
33
|
return {
|
|
23
34
|
get: (name) => headers.get(keyed(name)),
|
|
24
35
|
has: (name) => headers.has(keyed(name)),
|
|
25
|
-
entries: all,
|
|
26
|
-
keys: all,
|
|
27
|
-
values: all,
|
|
28
|
-
forEach: all,
|
|
29
|
-
[Symbol.iterator]: all
|
|
36
|
+
entries: () => all().entries(),
|
|
37
|
+
keys: () => all().keys(),
|
|
38
|
+
values: () => all().values(),
|
|
39
|
+
forEach: (callback, thisArg) => all().forEach(callback, thisArg),
|
|
40
|
+
[Symbol.iterator]: () => all()[Symbol.iterator]()
|
|
30
41
|
};
|
|
31
42
|
}
|
|
32
|
-
function
|
|
43
|
+
function checkUnscopedRead(what) {
|
|
33
44
|
const scope = currentReadScope();
|
|
34
|
-
if (scope)
|
|
45
|
+
if (scope) refuseRead(scope, what);
|
|
35
46
|
}
|
|
36
|
-
function
|
|
47
|
+
function checkSearchParamsRead(reader) {
|
|
37
48
|
const scope = currentReadScope();
|
|
38
49
|
if (!scope) return;
|
|
39
50
|
const outside = Object.keys(reader.codecs).filter((field) => {
|
|
40
51
|
const keyed = scope.searchParams.get(field);
|
|
41
52
|
return !keyed || keyed.codec !== reader.codecs[field] || keyed.urlKey !== (reader.urlKeys[field] ?? field);
|
|
42
53
|
});
|
|
43
|
-
if (outside.length > 0)
|
|
54
|
+
if (outside.length > 0) refuseRead(scope, `the search params ${outside.join(", ")}`, "searchParams");
|
|
44
55
|
}
|
|
45
|
-
function
|
|
56
|
+
function checkCookieRead(name, codec) {
|
|
46
57
|
const scope = currentReadScope();
|
|
47
58
|
if (!scope) return;
|
|
48
|
-
if (!scope.cookies.has(name))
|
|
49
|
-
if (codec === void 0 || scope.cookies.get(name) !== codec)
|
|
59
|
+
if (!scope.cookies.has(name)) refuseRead(scope, `the cookie "${name}"`, "cookies");
|
|
60
|
+
else if (codec === void 0 || scope.cookies.get(name) !== codec) refuseRead(scope, `the raw value of the cookie "${name}" (read it through the definition in its key)`, "cookies");
|
|
50
61
|
}
|
|
51
62
|
var OBJECT_PROBES = new Set([
|
|
52
63
|
"then",
|
|
@@ -65,7 +76,7 @@ function scopedParams(params) {
|
|
|
65
76
|
const target = Object.assign(Object.create(Object.getPrototypeOf(params)), params);
|
|
66
77
|
return new Proxy(target, {
|
|
67
78
|
get(target, name, receiver) {
|
|
68
|
-
if (refused(name))
|
|
79
|
+
if (refused(name)) refuseRead(scope, `the segment param "${String(name)}"`, "segmentParams");
|
|
69
80
|
return Reflect.get(target, name, receiver);
|
|
70
81
|
},
|
|
71
82
|
has: (target, name) => allowed(name) && Reflect.has(target, name),
|
|
@@ -73,6 +84,6 @@ function scopedParams(params) {
|
|
|
73
84
|
getOwnPropertyDescriptor: (target, name) => allowed(name) ? Reflect.getOwnPropertyDescriptor(target, name) : void 0
|
|
74
85
|
});
|
|
75
86
|
}
|
|
76
|
-
export {
|
|
87
|
+
export { checkCookieRead, checkSearchParamsRead, checkUnscopedRead, currentReadScope, keyedHeaders, scopedParams };
|
|
77
88
|
|
|
78
89
|
//# sourceMappingURL=read-rule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-rule.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-rule.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-rule.js","names":[],"sources":["../../../../../src/server/segment-lifetime/read-rule.ts"],"mappings":"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"}
|