@timber-js/app 0.2.0-alpha.220 → 0.2.0-alpha.222
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_chunks/{actions-BwkmAYXq.js → actions-vBHr2vqd.js} +3 -3
- package/dist/_chunks/{actions-BwkmAYXq.js.map → actions-vBHr2vqd.js.map} +1 -1
- package/dist/_chunks/{cache-api-LA3sBpUS.js → cache-api-DdcDLpBj.js} +72 -145
- package/dist/_chunks/cache-api-DdcDLpBj.js.map +1 -0
- package/dist/_chunks/chains-B8TCLved.js +1 -0
- package/dist/_chunks/{chains-e_Buf9vg.js → chains-BchW_AtW.js} +2 -2
- package/dist/_chunks/{chains-e_Buf9vg.js.map → chains-BchW_AtW.js.map} +1 -1
- package/dist/_chunks/{classify-2Yp3xJY1.js → classify-IqzMpxMs.js} +2 -2
- package/dist/_chunks/{classify-2Yp3xJY1.js.map → classify-IqzMpxMs.js.map} +1 -1
- package/dist/_chunks/{cli-check-DDwCkeDY.js → cli-check-DQne_YhU.js} +3 -3
- package/dist/_chunks/{cli-check-DDwCkeDY.js.map → cli-check-DQne_YhU.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-BdIebmk3.js → cli-schema-sync-BS-RFGE2.js} +2 -2
- package/dist/_chunks/{cli-schema-sync-BdIebmk3.js.map → cli-schema-sync-BS-RFGE2.js.map} +1 -1
- package/dist/_chunks/{cli-schema-sync-CLNfXQDK.js → cli-schema-sync-v872sHms.js} +1 -1
- package/dist/_chunks/{client-dep-entries-BOkpKjj1.js → client-dep-entries-BJyP9SIu.js} +2 -2
- package/dist/_chunks/{client-dep-entries-BOkpKjj1.js.map → client-dep-entries-BJyP9SIu.js.map} +1 -1
- package/dist/_chunks/{convention-lint-ByKJ6aqD.js → convention-lint-VwzrtjIt.js} +3 -3
- package/dist/_chunks/{convention-lint-ByKJ6aqD.js.map → convention-lint-VwzrtjIt.js.map} +1 -1
- package/dist/_chunks/{dev-server-DnODXuNM.js → dev-server-BNr5drEO.js} +57 -8
- package/dist/_chunks/dev-server-BNr5drEO.js.map +1 -0
- package/dist/_chunks/dev-server-CUg7Mqh_.js +1 -0
- package/dist/_chunks/dev-store-BOa304m_.js +283 -0
- package/dist/_chunks/dev-store-BOa304m_.js.map +1 -0
- package/dist/_chunks/{error-boundary-xxxLtXt6.js → error-boundary-Bc8QPZuq.js} +71 -21
- package/dist/_chunks/error-boundary-Bc8QPZuq.js.map +1 -0
- package/dist/_chunks/{flight-source-node-0dE-t3kq.js → flight-source-node-BdHUOUqg.js} +6 -7
- package/dist/_chunks/flight-source-node-BdHUOUqg.js.map +1 -0
- package/dist/_chunks/global-context-B9PFncvb.js +48 -0
- package/dist/_chunks/global-context-B9PFncvb.js.map +1 -0
- package/dist/_chunks/{json-lossy-check-C8zBY2uZ.js → json-lossy-check-C3Sht92C.js} +2 -2
- package/dist/_chunks/{json-lossy-check-C8zBY2uZ.js.map → json-lossy-check-C3Sht92C.js.map} +1 -1
- package/dist/_chunks/{live-graph-tSWrv8eH.js → live-graph-DEu_GWbc.js} +4 -4
- package/dist/_chunks/{live-graph-tSWrv8eH.js.map → live-graph-DEu_GWbc.js.map} +1 -1
- package/dist/_chunks/{logger-CbLdcy-W.js → logger-CI_hThfy.js} +10 -2
- package/dist/_chunks/{logger-CbLdcy-W.js.map → logger-CI_hThfy.js.map} +1 -1
- package/dist/_chunks/{node-response-Dibufw_b.js → node-response-bF0bKoig.js} +49 -3
- package/dist/_chunks/node-response-bF0bKoig.js.map +1 -0
- package/dist/_chunks/{poison-scan-C4FgMxFl.js → poison-scan-DTWIfNgD.js} +2 -2
- package/dist/_chunks/{poison-scan-C4FgMxFl.js.map → poison-scan-DTWIfNgD.js.map} +1 -1
- package/dist/_chunks/{purge-store-Byr8XOjU.js → purge-store-WZaxu-3m.js} +2 -2
- package/dist/_chunks/purge-store-WZaxu-3m.js.map +1 -0
- package/dist/_chunks/{render-timeout-DOf_BBcO.js → render-timeout-Ln_u7fX-.js} +19 -11
- package/dist/_chunks/render-timeout-Ln_u7fX-.js.map +1 -0
- package/dist/_chunks/{resolve-schema-CBR6Lm4i.js → resolve-schema-CkAInout.js} +2 -2
- package/dist/_chunks/{resolve-schema-CBR6Lm4i.js.map → resolve-schema-CkAInout.js.map} +1 -1
- package/dist/_chunks/{scanner-Cb3fSjAC.js → scanner-C8fdKvKG.js} +2 -2
- package/dist/_chunks/{scanner-Cb3fSjAC.js.map → scanner-C8fdKvKG.js.map} +1 -1
- package/dist/_chunks/{schema-bridge-C83xa9lT.js → schema-bridge-DpOmvZlI.js} +60 -23
- package/dist/_chunks/schema-bridge-DpOmvZlI.js.map +1 -0
- package/dist/_chunks/{segment-context-xtPUGfdq.js → segment-context-D3DNxKFq.js} +4 -8
- package/dist/_chunks/segment-context-D3DNxKFq.js.map +1 -0
- package/dist/_chunks/{sizeof-QPE5nd3u.js → sizeof-CO3dk0V1.js} +2 -2
- package/dist/_chunks/{sizeof-QPE5nd3u.js.map → sizeof-CO3dk0V1.js.map} +1 -1
- package/dist/_chunks/{walkers-qu8TpiLh.js → walkers-BqzxnwGC.js} +3 -3
- package/dist/_chunks/{walkers-qu8TpiLh.js.map → walkers-BqzxnwGC.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/cache-api.d.ts.map +1 -1
- package/dist/cache/guarded-read.d.ts +29 -0
- package/dist/cache/guarded-read.d.ts.map +1 -0
- package/dist/cache/handler-store.d.ts +13 -1
- package/dist/cache/handler-store.d.ts.map +1 -1
- package/dist/cache/index.js +3 -2
- package/dist/cache/invalidation-epoch.d.ts +7 -0
- package/dist/cache/invalidation-epoch.d.ts.map +1 -1
- package/dist/cache/stores/memory.js +1 -1
- package/dist/cache/timber-cache.d.ts.map +1 -1
- package/dist/cdn/index.js +1 -1
- package/dist/cdn/purge-store.d.ts +10 -1
- package/dist/cdn/purge-store.d.ts.map +1 -1
- package/dist/cli.js +3 -3
- package/dist/client/browser-entry/router-init.d.ts.map +1 -1
- package/dist/client/error-boundary.js +1 -1
- package/dist/client/global-context.d.ts +21 -1
- package/dist/client/global-context.d.ts.map +1 -1
- package/dist/client/index.js +9 -27
- package/dist/client/index.js.map +1 -1
- package/dist/client/internal.js +38 -65
- package/dist/client/internal.js.map +1 -1
- package/dist/client/link.d.ts.map +1 -1
- package/dist/client/navigation-context.d.ts.map +1 -1
- package/dist/client/navigation-transition.d.ts +68 -14
- package/dist/client/navigation-transition.d.ts.map +1 -1
- package/dist/client/params-context.d.ts.map +1 -1
- package/dist/client/router-effects.d.ts +35 -31
- package/dist/client/router-effects.d.ts.map +1 -1
- package/dist/client/router-pipeline.d.ts +2 -6
- package/dist/client/router-pipeline.d.ts.map +1 -1
- package/dist/client/router-types.d.ts +10 -30
- package/dist/client/router-types.d.ts.map +1 -1
- package/dist/client/router.d.ts.map +1 -1
- package/dist/client/slot-context.d.ts +2 -2
- package/dist/client/slot-context.d.ts.map +1 -1
- package/dist/codec.js +1 -1
- package/dist/cookies/index.js +1 -1
- package/dist/dev-tools/logs.d.ts +2 -2
- package/dist/dev-tools/logs.d.ts.map +1 -1
- package/dist/index.js +149 -56
- package/dist/index.js.map +1 -1
- package/dist/params/index.js +1 -1
- package/dist/plugins/dev-server.d.ts +1 -1
- package/dist/plugins/dev-server.d.ts.map +1 -1
- package/dist/plugins/dev-store-clear.d.ts +28 -0
- package/dist/plugins/dev-store-clear.d.ts.map +1 -0
- package/dist/plugins/entries.d.ts +5 -0
- package/dist/plugins/entries.d.ts.map +1 -1
- package/dist/plugins/orphaned-modules.d.ts +57 -0
- package/dist/plugins/orphaned-modules.d.ts.map +1 -0
- package/dist/plugins/prebuilt.d.ts +6 -6
- package/dist/plugins/prerender-sugar.d.ts.map +1 -1
- package/dist/plugins/routing.d.ts +1 -1
- package/dist/plugins/routing.d.ts.map +1 -1
- package/dist/routing/index.js +2 -2
- package/dist/rsc-runtime/dev-reference-cache.d.ts +47 -0
- package/dist/rsc-runtime/dev-reference-cache.d.ts.map +1 -0
- package/dist/rsc-runtime/rsc.d.ts +0 -15
- package/dist/rsc-runtime/rsc.d.ts.map +1 -1
- package/dist/rsc-runtime/ssr.d.ts +0 -11
- package/dist/rsc-runtime/ssr.d.ts.map +1 -1
- package/dist/schema-bridge.d.ts +28 -19
- package/dist/schema-bridge.d.ts.map +1 -1
- package/dist/search-params/define.d.ts +1 -1
- package/dist/search-params/define.d.ts.map +1 -1
- package/dist/search-params/index.js +7 -8
- package/dist/search-params/index.js.map +1 -1
- package/dist/search-params/wrappers.d.ts +3 -3
- package/dist/server/abort-scope.d.ts +27 -0
- package/dist/server/abort-scope.d.ts.map +1 -0
- package/dist/server/flight-source-node.d.ts.map +1 -1
- package/dist/server/index.js +2 -2
- package/dist/server/instrumentation.d.ts +2 -1
- package/dist/server/instrumentation.d.ts.map +1 -1
- package/dist/server/internal.d.ts +1 -1
- package/dist/server/internal.d.ts.map +1 -1
- package/dist/server/internal.js +350 -151
- package/dist/server/internal.js.map +1 -1
- package/dist/server/logger.d.ts +9 -0
- package/dist/server/logger.d.ts.map +1 -1
- package/dist/server/pipeline-helpers.d.ts.map +1 -1
- package/dist/server/pipeline.d.ts +10 -7
- package/dist/server/pipeline.d.ts.map +1 -1
- package/dist/server/prebuilt/cache-key.d.ts +26 -0
- package/dist/server/prebuilt/cache-key.d.ts.map +1 -1
- package/dist/server/prebuilt/capture-render.d.ts +9 -4
- package/dist/server/prebuilt/capture-render.d.ts.map +1 -1
- package/dist/server/prebuilt/capture-routes.d.ts +1 -1
- package/dist/server/prebuilt/dev-store.d.ts +103 -0
- package/dist/server/prebuilt/dev-store.d.ts.map +1 -0
- package/dist/server/prebuilt/overlay.d.ts +14 -3
- package/dist/server/prebuilt/overlay.d.ts.map +1 -1
- package/dist/server/prebuilt/payload-source.d.ts +8 -0
- package/dist/server/prebuilt/payload-source.d.ts.map +1 -1
- package/dist/server/prebuilt/slots.d.ts +5 -6
- package/dist/server/prebuilt/slots.d.ts.map +1 -1
- package/dist/server/prebuilt-builder.d.ts.map +1 -1
- package/dist/server/prebuilt-runtime.d.ts +5 -10
- package/dist/server/prebuilt-runtime.d.ts.map +1 -1
- package/dist/server/render-timeout.d.ts.map +1 -1
- package/dist/server/rsc-entry/action-dispatcher.d.ts.map +1 -1
- package/dist/server/rsc-entry/index.d.ts.map +1 -1
- package/dist/server/ssr-render.d.ts.map +1 -1
- package/docs/api/32-api-cache.mdx +2 -0
- package/docs/api/33-api-search-params.mdx +3 -1
- package/docs/learn/06-typed-params.mdx +2 -2
- package/docs/learn/10-caching.mdx +12 -0
- package/docs/learn/11-middleware.mdx +2 -0
- package/package.json +1 -1
- package/src/cache/cache-api.ts +7 -1
- package/src/cache/guarded-read.ts +44 -0
- package/src/cache/handler-store.ts +38 -1
- package/src/cache/invalidation-epoch.ts +18 -6
- package/src/cache/timber-cache.ts +9 -3
- package/src/cdn/purge-store.ts +29 -1
- package/src/client/browser-entry/action-dispatch.ts +5 -5
- package/src/client/browser-entry/router-init.ts +2 -4
- package/src/client/global-context.ts +42 -14
- package/src/client/link.tsx +14 -18
- package/src/client/navigation-context.ts +4 -11
- package/src/client/navigation-transition.ts +86 -33
- package/src/client/params-context.ts +5 -17
- package/src/client/router-effects.ts +70 -45
- package/src/client/router-lifecycle.ts +1 -1
- package/src/client/router-pipeline.ts +52 -65
- package/src/client/router-types.ts +11 -31
- package/src/client/router.ts +98 -104
- package/src/client/segment-update-context.ts +1 -1
- package/src/client/slot-content-cache-context.ts +1 -1
- package/src/client/slot-context.ts +6 -17
- package/src/dev-tools/logs.ts +76 -50
- package/src/plugins/dev-server.ts +58 -9
- package/src/plugins/dev-store-clear.ts +47 -0
- package/src/plugins/entries.ts +6 -0
- package/src/plugins/orphaned-modules.ts +78 -0
- package/src/plugins/prebuilt.ts +17 -17
- package/src/plugins/prerender-sugar.ts +38 -6
- package/src/plugins/routing.ts +23 -1
- package/src/rsc-runtime/dev-reference-cache.ts +115 -0
- package/src/rsc-runtime/rsc.ts +10 -0
- package/src/rsc-runtime/ssr.ts +10 -0
- package/src/rsc-runtime/vendor-types.d.ts +8 -0
- package/src/schema-bridge.ts +93 -38
- package/src/search-params/define.ts +5 -6
- package/src/search-params/wrappers.ts +3 -3
- package/src/server/abort-scope.ts +49 -0
- package/src/server/action-handler.ts +18 -2
- package/src/server/flight-source-node.ts +5 -4
- package/src/server/instrumentation.ts +32 -8
- package/src/server/internal.ts +1 -6
- package/src/server/logger.ts +9 -0
- package/src/server/pipeline-helpers.ts +5 -3
- package/src/server/pipeline.ts +31 -20
- package/src/server/prebuilt/cache-key.ts +41 -0
- package/src/server/prebuilt/capture-render.ts +10 -6
- package/src/server/prebuilt/capture-routes.ts +1 -1
- package/src/server/prebuilt/dev-store.ts +173 -0
- package/src/server/prebuilt/overlay.ts +21 -5
- package/src/server/prebuilt/payload-source.ts +19 -0
- package/src/server/prebuilt/slots.ts +5 -6
- package/src/server/prebuilt-builder.ts +3 -2
- package/src/server/prebuilt-runtime.ts +194 -177
- package/src/server/render-timeout.ts +12 -17
- package/src/server/rsc-entry/action-dispatcher.ts +3 -1
- package/src/server/rsc-entry/index.ts +47 -13
- package/src/server/ssr-render.ts +9 -11
- package/dist/_chunks/cache-api-LA3sBpUS.js.map +0 -1
- package/dist/_chunks/chains-CDK1AWZQ.js +0 -1
- package/dist/_chunks/dev-server-DkytOEG2.js +0 -1
- package/dist/_chunks/dev-server-DnODXuNM.js.map +0 -1
- package/dist/_chunks/error-boundary-xxxLtXt6.js.map +0 -1
- package/dist/_chunks/flight-source-node-0dE-t3kq.js.map +0 -1
- package/dist/_chunks/node-response-Dibufw_b.js.map +0 -1
- package/dist/_chunks/purge-store-Byr8XOjU.js.map +0 -1
- package/dist/_chunks/render-timeout-DOf_BBcO.js.map +0 -1
- package/dist/_chunks/schema-bridge-C83xa9lT.js.map +0 -1
- package/dist/_chunks/segment-context-xtPUGfdq.js.map +0 -1
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*
|
|
9
9
|
* See design/19-client-navigation.md §"Scroll Restoration"
|
|
10
10
|
*/
|
|
11
|
-
import type
|
|
11
|
+
import { type CommitOutcome, type NavigationHandle, type RenderOwner } from './navigation-transition.ts';
|
|
12
12
|
/** The subset of `RouterDeps` the post-paint scroll effects need. */
|
|
13
13
|
export interface ScrollEffectDeps {
|
|
14
14
|
scrollTo: (x: number, y: number) => void;
|
|
@@ -94,7 +94,7 @@ export interface NavigationRecoveryDeps {
|
|
|
94
94
|
* Follow a redirect to `url` — the router's own `navigate()`, carrying
|
|
95
95
|
* the interrupted navigation's {@link RedirectHop}.
|
|
96
96
|
*/
|
|
97
|
-
navigate: (url: string, hop: RedirectHop) =>
|
|
97
|
+
navigate: (url: string, hop: RedirectHop) => NavigationHandle;
|
|
98
98
|
}
|
|
99
99
|
/**
|
|
100
100
|
* What a redirect hop inherits from the navigation the redirect interrupted.
|
|
@@ -120,39 +120,41 @@ export interface RedirectHop {
|
|
|
120
120
|
* scroll position; the hop would otherwise default to scrolling to the top.
|
|
121
121
|
*/
|
|
122
122
|
scroll: boolean;
|
|
123
|
-
/**
|
|
124
|
-
* The interrupted navigation's `onCommit`, as {@link HeldCommit.settle}.
|
|
125
|
-
* A followed redirect is one logical navigation: the hop's commit is the
|
|
126
|
-
* one the caller is waiting for. `<Link>` holds `isPending` until it, and
|
|
127
|
-
* a `'failed'` from the interrupted render would release it on the hop's
|
|
128
|
-
* decode, ahead of a commit React is still holding (TIM-1571). Recovery
|
|
129
|
-
* delivers it itself on every path that does not follow the redirect.
|
|
130
|
-
*/
|
|
131
|
-
onCommit?: (outcome: CommitOutcome) => void;
|
|
132
|
-
/**
|
|
133
|
-
* The interrupted navigation's `onHandOff`: a server action redirect
|
|
134
|
-
* waits for the tree that is finally handed to React, which is the
|
|
135
|
-
* redirected one (TIM-1573).
|
|
136
|
-
*/
|
|
137
|
-
onHandOff?: () => void;
|
|
138
123
|
}
|
|
139
124
|
/**
|
|
140
|
-
*
|
|
125
|
+
* The endings a navigation reports beside its decode — the `handedOff` and
|
|
126
|
+
* `committed` of its {@link NavigationHandle} — fed by the renders it runs.
|
|
141
127
|
*
|
|
142
|
-
*
|
|
143
|
-
*
|
|
144
|
-
*
|
|
145
|
-
*
|
|
146
|
-
*
|
|
147
|
-
*
|
|
148
|
-
*
|
|
149
|
-
* `
|
|
128
|
+
* A followed redirect is one logical navigation, so its endings are the
|
|
129
|
+
* redirect hop's: the hop's commit is the one the caller is waiting for.
|
|
130
|
+
* `<Link>` holds `isPending` until it, and a `'failed'` from the
|
|
131
|
+
* interrupted render would release it on the hop's decode, ahead of a
|
|
132
|
+
* commit React is still holding (TIM-1571). A server action redirect waits
|
|
133
|
+
* for the tree that is finally handed to React, which is the redirected one
|
|
134
|
+
* (TIM-1573). So a render's `'failed'` is not this navigation's:
|
|
135
|
+
* `navigateTransition` settles it as soon as `perform` throws, before the
|
|
136
|
+
* router knows the failure is a redirect it will follow. Recovery decides,
|
|
137
|
+
* and either adopts the hop or settles the outcome itself.
|
|
150
138
|
*/
|
|
151
|
-
export interface
|
|
152
|
-
|
|
153
|
-
|
|
139
|
+
export interface NavigationEndings {
|
|
140
|
+
/** Report a render's endings — every outcome but `'failed'` at once. */
|
|
141
|
+
track(render: NavigationHandle): void;
|
|
142
|
+
/** Make a redirect hop's endings this navigation's. */
|
|
143
|
+
adopt(hop: NavigationHandle): void;
|
|
144
|
+
/** Settle `committed`. The first outcome wins. */
|
|
145
|
+
settle(outcome: CommitOutcome): void;
|
|
154
146
|
}
|
|
155
|
-
|
|
147
|
+
/**
|
|
148
|
+
* Run a navigation as a {@link NavigationHandle}. `run` is the navigation:
|
|
149
|
+
* its promise is the handle's decode, and it reports its renders' other
|
|
150
|
+
* endings into the {@link NavigationEndings} it is given.
|
|
151
|
+
*
|
|
152
|
+
* A navigation that ends without reporting — superseded, or failed, before
|
|
153
|
+
* any render — settles them as it ends: `committed` as `'failed'` if it
|
|
154
|
+
* rejected (an outcome already reported wins), and `handedOff` either way,
|
|
155
|
+
* so neither waits on a render that will not come.
|
|
156
|
+
*/
|
|
157
|
+
export declare function runAsHandle(run: (endings: NavigationEndings) => Promise<void>): NavigationHandle;
|
|
156
158
|
/**
|
|
157
159
|
* The URL a redirect hop navigates to. A redirect target without a fragment
|
|
158
160
|
* keeps the one the navigation asked for, as a browser does for a 3xx
|
|
@@ -184,7 +186,9 @@ export declare function redirectHopUrl(redirectUrl: string, requestedUrl: string
|
|
|
184
186
|
*/
|
|
185
187
|
export declare function createNavigationRecovery({ currentOwner, leaveSpaIfOwned, navigate, }: NavigationRecoveryDeps): (error: unknown, owner: RenderOwner, url: string, fromUrl: string,
|
|
186
188
|
/** What a redirect hop inherits from the navigation that failed. */
|
|
187
|
-
hop: RedirectHop
|
|
189
|
+
hop: RedirectHop,
|
|
190
|
+
/** The failed navigation's endings; a followed redirect's become them. */
|
|
191
|
+
endings: NavigationEndings) => Promise<boolean>;
|
|
188
192
|
/**
|
|
189
193
|
* Perform the full document load.
|
|
190
194
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-effects.d.ts","sourceRoot":"","sources":["../../src/client/router-effects.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"router-effects.d.ts","sourceRoot":"","sources":["../../src/client/router-effects.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ import type { StateTree } from '../shared/segment-info.ts';
|
|
|
18
18
|
import type { NavigationState } from './navigation-context.ts';
|
|
19
19
|
import { type NavigationCommitter } from './navigation-commit.ts';
|
|
20
20
|
import type { RouterDeps } from './router-types.ts';
|
|
21
|
-
import type {
|
|
21
|
+
import type { NavigationHandle, RenderOwner } from './navigation-transition.ts';
|
|
22
22
|
/** A fetched payload plus the state update that makes it the current page. */
|
|
23
23
|
export type NavigationPayload = FetchResult & {
|
|
24
24
|
navState: NavigationState;
|
|
@@ -45,11 +45,7 @@ export interface NavigationPipeline {
|
|
|
45
45
|
/** Hand a payload to React inside a transition. */
|
|
46
46
|
renderViaTransition: (url: string, owner: RenderOwner,
|
|
47
47
|
/** The view transition types the render adds (`NavigationRender`). */
|
|
48
|
-
types: readonly string[], perform: () => Promise<NavigationPayload
|
|
49
|
-
/** See `NavigationOptions.onCommit`. */
|
|
50
|
-
onCommit?: (outcome: CommitOutcome) => void,
|
|
51
|
-
/** See `NavigationOptions.onHandOff`. */
|
|
52
|
-
onHandOff?: () => void) => Promise<void>;
|
|
48
|
+
types: readonly string[], perform: () => Promise<NavigationPayload>) => NavigationHandle;
|
|
53
49
|
}
|
|
54
50
|
/**
|
|
55
51
|
* Normalize a departing URL to the pathname the server is told about.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-pipeline.d.ts","sourceRoot":"","sources":["../../src/client/router-pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAuB,KAAK,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"router-pipeline.d.ts","sourceRoot":"","sources":["../../src/client/router-pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAErE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAuB,KAAK,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAsBhF,8EAA8E;AAC9E,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,QAAQ,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB,CAAC;AAEF,0DAA0D;AAC1D,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,sBAAuB,SAAQ,IAAI,CAClD,mBAAmB,EACnB,mBAAmB,GAAG,kBAAkB,GAAG,0BAA0B,GAAG,qBAAqB,CAC9F;IACC,IAAI,EAAE,UAAU,CAAC;IACjB,aAAa,EAAE,aAAa,CAAC;IAC7B,8EAA8E;IAC9E,aAAa,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC5C,oEAAoE;IACpE,mBAAmB,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,kBAAkB;IACjC,2DAA2D;IAC3D,sBAAsB,EAAE,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,sBAAsB,KAC5B,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChC,mDAAmD;IACnD,mBAAmB,EAAE,CACnB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,WAAW;IAClB,sEAAsE;IACtE,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,OAAO,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,KACtC,gBAAgB,CAAC;CACvB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,WAAW,CAEb;AAoCD,wBAAgB,wBAAwB,CAAC,EACvC,IAAI,EACJ,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,mBAAmB,EACnB,aAAa,EACb,mBAAmB,GACpB,EAAE,sBAAsB,GAAG,kBAAkB,CA+Q7C"}
|
|
@@ -12,7 +12,7 @@ import type { NavigationState } from './navigation-context.ts';
|
|
|
12
12
|
import type { ParamsSource } from '../shared/payload-root.ts';
|
|
13
13
|
import type { SegmentInfo } from '../shared/segment-info.ts';
|
|
14
14
|
import type { SegmentCache, PrefetchCache } from './segment-cache.ts';
|
|
15
|
-
import type { TransitionResult,
|
|
15
|
+
import type { TransitionResult, NavigationHandle, RenderOwner } from './navigation-transition.ts';
|
|
16
16
|
import type { NavigationEpoch } from './router-lifecycle.ts';
|
|
17
17
|
/**
|
|
18
18
|
* The view transition type the router adds to a render it hands React —
|
|
@@ -38,8 +38,6 @@ export type NavigationTransitionType = 'navigation-forward' | 'navigation-back'
|
|
|
38
38
|
export type TraverseDirection = Extract<NavigationTransitionType, 'navigation-forward' | 'navigation-back' | 'navigation-traverse'>;
|
|
39
39
|
/** Options for `RouterInstance.refresh`. */
|
|
40
40
|
export interface RefreshOptions {
|
|
41
|
-
/** See `NavigationOptions.onCommit`. */
|
|
42
|
-
onCommit?: (outcome: CommitOutcome) => void;
|
|
43
41
|
/**
|
|
44
42
|
* Why the page is being re-fetched, as the view transition type the render
|
|
45
43
|
* adds: `refresh` (the default) when the user asked, `revalidate` when a
|
|
@@ -67,24 +65,6 @@ export interface NavigationOptions {
|
|
|
67
65
|
* follows a redirect, which keeps the types of the render it interrupted.
|
|
68
66
|
*/
|
|
69
67
|
_renderTypes?: readonly string[];
|
|
70
|
-
/**
|
|
71
|
-
* Runs exactly once, when React commits this navigation's tree — or when
|
|
72
|
-
* the navigation is abandoned (superseded or failed) and no such commit
|
|
73
|
-
* will come. The returned promise resolves on decode, which can be before
|
|
74
|
-
* OR after the commit; this is the hook for the other event. `<Link>`
|
|
75
|
-
* holds `isPending` until both have happened (TIM-1418). The outcome says
|
|
76
|
-
* which of the three it was.
|
|
77
|
-
*/
|
|
78
|
-
onCommit?: (outcome: CommitOutcome) => void;
|
|
79
|
-
/**
|
|
80
|
-
* @internal Runs once, synchronously after this navigation's tree is handed
|
|
81
|
-
* to React (its transition scheduled) and before React can commit it. Not
|
|
82
|
-
* at all if the navigation is superseded or fails first; the returned
|
|
83
|
-
* promise settles then. A server action that redirects settles its
|
|
84
|
-
* `useActionState` here, so React commits the action's result and the
|
|
85
|
-
* destination together (TIM-1573).
|
|
86
|
-
*/
|
|
87
|
-
onHandOff?: () => void;
|
|
88
68
|
}
|
|
89
69
|
/**
|
|
90
70
|
* Function that decodes an RSC Flight stream into the payload root.
|
|
@@ -138,11 +118,7 @@ export interface RouterDeps {
|
|
|
138
118
|
* which is the entire point of the client owning the provider
|
|
139
119
|
* (TIM-1297).
|
|
140
120
|
*/
|
|
141
|
-
params: ParamsSource, segmentUpdates?: Map<string, unknown>) => unknown) => Promise<TransitionResult<unknown
|
|
142
|
-
/** See `NavigationOptions.onCommit`; forwarded to `navigateTransition`. */
|
|
143
|
-
onCommit?: (outcome: CommitOutcome) => void,
|
|
144
|
-
/** See `NavigationOptions.onHandOff`; forwarded to `navigateTransition`. */
|
|
145
|
-
onHandOff?: () => void) => Promise<void>;
|
|
121
|
+
params: ParamsSource, segmentUpdates?: Map<string, unknown>) => unknown) => Promise<TransitionResult<unknown>>) => NavigationHandle;
|
|
146
122
|
/**
|
|
147
123
|
* Save scroll position via the Navigation API's per-entry state.
|
|
148
124
|
* When provided, used instead of history.replaceState for scroll storage.
|
|
@@ -174,10 +150,14 @@ export interface RouterDeps {
|
|
|
174
150
|
clientSegmentCache?: boolean;
|
|
175
151
|
}
|
|
176
152
|
export interface RouterInstance {
|
|
177
|
-
/**
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
153
|
+
/**
|
|
154
|
+
* Navigate to a new URL (forward navigation). Awaiting the handle waits for
|
|
155
|
+
* the payload to decode; its `committed` and `handedOff` are the other two
|
|
156
|
+
* endings (`NavigationHandle`).
|
|
157
|
+
*/
|
|
158
|
+
navigate(url: string, options?: NavigationOptions): NavigationHandle;
|
|
159
|
+
/** Full re-render of the current URL — no state tree sent. See `navigate`. */
|
|
160
|
+
refresh(options?: RefreshOptions): NavigationHandle;
|
|
181
161
|
/**
|
|
182
162
|
* Handle a traversal (back/forward button). scrollY is read from the
|
|
183
163
|
* destination entry's state. `direction` is the transition type the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-types.d.ts","sourceRoot":"","sources":["../../src/client/router-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"router-types.d.ts","sourceRoot":"","sources":["../../src/client/router-types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAClG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,wBAAwB,GAChC,oBAAoB,GACpB,iBAAiB,GACjB,qBAAqB,GACrB,SAAS,GACT,YAAY,CAAC;AAEjB,0EAA0E;AAC1E,MAAM,MAAM,iBAAiB,GAAG,OAAO,CACrC,wBAAwB,EACxB,oBAAoB,GAAG,iBAAiB,GAAG,qBAAqB,CACjE,CAAC;AAEF,4CAA4C;AAC5C,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC,wBAAwB,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC;CAC9E;AAED,MAAM,WAAW,iBAAiB;IAChC,kEAAkE;IAClE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,6EAA6E;IAC7E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC;;;;OAIG;IACH,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC;AAEtE;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,SAAS,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACnE,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,aAAa,EAAE,MAAM,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,MAAM,CAAC;IACzB,yDAAyD;IACzD,SAAS,EAAE,UAAU,CAAC;IACtB;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAC5C;;;;;;;;;;;;;;;OAeG;IACH,kBAAkB,EAAE,CAClB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,WAAW;IAClB,0EAA0E;IAC1E,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,OAAO,EAAE,CACP,WAAW,EAAE,CACX,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,eAAe;IACzB;;;;;;OAMG;IACH,MAAM,EAAE,YAAY,EACpB,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAClC,OAAO,KACT,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KACpC,gBAAgB,CAAC;IAEtB;;;OAGG;IACH,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAEtD;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IAEnC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAEzC;;;;;;;;;OASG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,gBAAgB,CAAC;IACrE,8EAA8E;IAC9E,OAAO,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,gBAAgB,CAAC;IACpD;;;;;OAKG;IACH,cAAc,CACZ,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,WAAW,EAC5B,SAAS,CAAC,EAAE,iBAAiB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,kDAAkD;IAClD,SAAS,IAAI,OAAO,CAAC;IACrB,4DAA4D;IAC5D,aAAa,IAAI,MAAM,GAAG,IAAI,CAAC;IAC/B,yCAAyC;IACzC,eAAe,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAClE,6DAA6D;IAC7D,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,KAAK,IAAI,eAAe,CAAC;IACzB;;;;;;OAMG;IACH,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC;IAChD;;;;;;;;;;;;;OAaG;IACH,iBAAiB,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5E;;;;;OAKG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACpC;;;;OAIG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;IACzC;;;;;;OAMG;IACH,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAC1D;;;;OAIG;IACH,cAAc,IAAI,IAAI,CAAC;IACvB;;;;;;OAMG;IACH,oBAAoB,IAAI,IAAI,CAAC;IAC7B;;;;;;;;OAQG;IACH,gBAAgB,IAAI,IAAI,CAAC;IACzB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,eAAe,CAAC;IAE9C,gEAAgE;IAChE,YAAY,EAAE,YAAY,CAAC;IAC3B,iEAAiE;IACjE,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,qEAAqE;AACrE,MAAM,WAAW,aAAa;IAC5B,0EAA0E;IAC1E,OAAO,EAAE,OAAO,CAAC;IACjB,sCAAsC;IACtC,MAAM,EAAE,YAAY,CAAC;IACrB,yEAAyE;IACzE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;CACnC;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,YAAY,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/client/router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/client/router.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAIV,UAAU,EACV,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAK3B;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAogB7D"}
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
*
|
|
26
26
|
* See design/45-cache-lifetimes.md §Slot Components.
|
|
27
27
|
*/
|
|
28
|
-
import
|
|
28
|
+
import { type ReactNode } from 'react';
|
|
29
29
|
export type SlotValues = Record<string, ReactNode>;
|
|
30
|
-
export declare const SlotContext:
|
|
30
|
+
export declare const SlotContext: import("react").Context<SlotValues | null>;
|
|
31
31
|
//# sourceMappingURL=slot-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slot-context.d.ts","sourceRoot":"","sources":["../../src/client/slot-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAIH,OAAO,
|
|
1
|
+
{"version":3,"file":"slot-context.d.ts","sourceRoot":"","sources":["../../src/client/slot-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAIH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEnD,eAAO,MAAM,WAAW,4CAGvB,CAAC"}
|
package/dist/codec.js
CHANGED
package/dist/cookies/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { i as assertValidCookieName, r as stringifySetCookie, t as parseCookie } from "../_chunks/dist-DtrJyBbw.js";
|
|
2
|
-
import { a as resolveCodecOrSchema } from "../_chunks/schema-bridge-
|
|
2
|
+
import { a as resolveCodecOrSchema } from "../_chunks/schema-bridge-DpOmvZlI.js";
|
|
3
3
|
import { t as getSsrData } from "../_chunks/ssr-data-nA3I70_n.js";
|
|
4
4
|
import * as React$1 from "react";
|
|
5
5
|
import { getCookieJar } from "@timber-js/app/server";
|
package/dist/dev-tools/logs.d.ts
CHANGED
|
@@ -53,8 +53,8 @@ export declare function isFrameworkInternalCaller(): boolean;
|
|
|
53
53
|
/**
|
|
54
54
|
* Create the timber-dev-logs Vite plugin.
|
|
55
55
|
*
|
|
56
|
-
* Patches console methods when the dev server starts and
|
|
57
|
-
* when
|
|
56
|
+
* Patches console methods when the dev server starts and stops forwarding
|
|
57
|
+
* to it when it closes. Only active during `vite dev`.
|
|
58
58
|
*/
|
|
59
59
|
export declare function timberDevLogs(_ctx: PluginContext): Plugin;
|
|
60
60
|
//# sourceMappingURL=logs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/dev-tools/logs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI1D;;;;;GAKG;AACH,eAAO,MAAM,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAMtF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAqDpE;AAID,iDAAiD;AACjD,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAIzE,8CAA8C;AAC9C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,cAAc,CAAC;IACtB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,gEAAgE;IAChE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAC;CACnB;AA2ID;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,IAAI,OAAO,CAsBnD;
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/dev-tools/logs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,MAAM,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI1D;;;;;GAKG;AACH,eAAO,MAAM,eAAe,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAMtF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAqDpE;AAID,iDAAiD;AACjD,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAIzE,8CAA8C;AAC9C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,cAAc,CAAC;IACtB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,gEAAgE;IAChE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAC;CACnB;AA2ID;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,IAAI,OAAO,CAsBnD;AAiGD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAiBzD"}
|
package/dist/index.js
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { a as formatMissingPeers, i as checkPeerDependencies, n as timberDevServer, o as reportConfigErrors, s as validateConfig } from "./_chunks/dev-server-
|
|
2
|
-
import { i as resolveRenderTimeoutMs } from "./_chunks/render-timeout-
|
|
1
|
+
import { a as formatMissingPeers, i as checkPeerDependencies, n as timberDevServer, o as reportConfigErrors, s as validateConfig } from "./_chunks/dev-server-BNr5drEO.js";
|
|
2
|
+
import { i as resolveRenderTimeoutMs } from "./_chunks/render-timeout-Ln_u7fX-.js";
|
|
3
3
|
import { t as writeFileAtomic } from "./_chunks/write-file-atomic-D1qWqHb4.js";
|
|
4
|
-
import { d as collectInterceptionRewrites, l as getPrerenderExport, n as scanRoutes } from "./_chunks/scanner-
|
|
5
|
-
import {
|
|
6
|
-
import { c as buildDirToRouteMap, n as formatConventionWarnings, o as flushCodegenWrites, r as lintConventions, s as writeRouteCodegen, t as checkAppDirExists } from "./_chunks/convention-lint-
|
|
4
|
+
import { d as collectInterceptionRewrites, l as getPrerenderExport, n as scanRoutes } from "./_chunks/scanner-C8fdKvKG.js";
|
|
5
|
+
import { y as swallow } from "./_chunks/logger-CI_hThfy.js";
|
|
6
|
+
import { c as buildDirToRouteMap, n as formatConventionWarnings, o as flushCodegenWrites, r as lintConventions, s as writeRouteCodegen, t as checkAppDirExists } from "./_chunks/convention-lint-VwzrtjIt.js";
|
|
7
7
|
import { a as contextAdapter, c as loadTimberConfigFile, d as resolveBuildDir, f as resolveClientJavascript, l as mergeFileConfig, m as createNoopTimer, o as createPluginContext, r as adapterConfig, u as resolveAppDir } from "./_chunks/plugin-context-DxMMvjUt.js";
|
|
8
8
|
import { i as withBasePath, n as normalizeBasePath, t as isRelativeBase } from "./_chunks/base-path-DaQrzbez.js";
|
|
9
|
-
import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-
|
|
9
|
+
import { r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-BqzxnwGC.js";
|
|
10
10
|
import { i as poisonPillSource, r as markerFor, t as EXPLICIT_MARKERS } from "./_chunks/poison-rules-DoEhbqaY.js";
|
|
11
11
|
import { n as rscPayloadPath, t as RSC_PAYLOAD_DIR } from "./_chunks/rsc-payload-path-dffcs4jp.js";
|
|
12
12
|
import { a as REDIRECTS_FILE, n as detectFsIdentity, o as RESERVED_OUTPUT_PATHS, r as fsKey, t as EXACT_FS_IDENTITY } from "./_chunks/fs-identity-BRKuL215.js";
|
|
13
13
|
import { t as EMPTY_BUILD_MANIFEST } from "./_chunks/build-manifest-DWppEdLB.js";
|
|
14
14
|
import { t as fnv1aHash } from "./_chunks/fast-hash-C-tVYrLb.js";
|
|
15
15
|
import { t as formatSize } from "./_chunks/format-BKclgVbk.js";
|
|
16
|
-
import { createLogger, esmExternalRequirePlugin, parseAst } from "vite";
|
|
16
|
+
import { createLogger, esmExternalRequirePlugin, isRunnableDevEnvironment, parseAst } from "vite";
|
|
17
17
|
import { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve, win32 } from "node:path";
|
|
18
18
|
import { builtinModules, createRequire } from "node:module";
|
|
19
19
|
import react from "@vitejs/plugin-react";
|
|
@@ -158,6 +158,11 @@ var ENTRY_FILE_MAP = {
|
|
|
158
158
|
* (see plugins/client-dep-entries.ts).
|
|
159
159
|
*/
|
|
160
160
|
var BROWSER_ENTRY_FILE = ENTRY_FILE_MAP[VIRTUAL_IDS.browserEntry];
|
|
161
|
+
/**
|
|
162
|
+
* The real file behind virtual:timber-rsc-entry, the RSC environment's HMR
|
|
163
|
+
* boundary (see plugins/orphaned-modules.ts).
|
|
164
|
+
*/
|
|
165
|
+
var RSC_ENTRY_FILE = ENTRY_FILE_MAP[VIRTUAL_IDS.rscEntry];
|
|
161
166
|
/** The \0-prefixed resolved ID for virtual:timber-config */
|
|
162
167
|
var RESOLVED_CONFIG_ID = `\0${VIRTUAL_IDS.config}`;
|
|
163
168
|
/** The \0-prefixed resolved ID for virtual:timber-instrumentation */
|
|
@@ -679,7 +684,37 @@ function generateSchemaModule(appDir) {
|
|
|
679
684
|
].join("\n");
|
|
680
685
|
}
|
|
681
686
|
//#endregion
|
|
687
|
+
//#region src/plugins/orphaned-modules.ts
|
|
688
|
+
/**
|
|
689
|
+
* The update's modules with each orphan replaced by the RSC entry (whose
|
|
690
|
+
* file is `entryFile`). `undefined` when there are no orphans, so Vite keeps
|
|
691
|
+
* the update as it is.
|
|
692
|
+
*/
|
|
693
|
+
function redirectOrphanedModules(environment, modules, entryFile) {
|
|
694
|
+
const entry = environment.moduleGraph.getModulesByFile(entryFile)?.values().next().value;
|
|
695
|
+
const orphans = modules.filter((mod) => mod !== entry && mod.importers.size === 0 && !mod.isSelfAccepting);
|
|
696
|
+
if (orphans.length === 0) return void 0;
|
|
697
|
+
const { moduleGraph, evaluatedModules } = environment;
|
|
698
|
+
for (const mod of orphans) {
|
|
699
|
+
moduleGraph.invalidateModule(mod);
|
|
700
|
+
const evaluated = mod.id ? evaluatedModules?.getModuleById(mod.id) : void 0;
|
|
701
|
+
if (evaluated) evaluatedModules?.invalidateModule(evaluated);
|
|
702
|
+
}
|
|
703
|
+
const rest = modules.filter((mod) => !orphans.includes(mod));
|
|
704
|
+
if (entry && !rest.includes(entry)) rest.push(entry);
|
|
705
|
+
return rest;
|
|
706
|
+
}
|
|
707
|
+
//#endregion
|
|
682
708
|
//#region src/plugins/routing.ts
|
|
709
|
+
/**
|
|
710
|
+
* timber-routing — Vite sub-plugin for route manifest generation.
|
|
711
|
+
*
|
|
712
|
+
* Bridges the route scanner with Vite's module graph. Scans app/ at startup,
|
|
713
|
+
* watches for file changes in dev, and serves the virtual:timber-route-manifest
|
|
714
|
+
* module that entry files consume.
|
|
715
|
+
*
|
|
716
|
+
* Design docs: 18-build-system.md §"Virtual Modules", 07-routing.md
|
|
717
|
+
*/
|
|
683
718
|
var VIRTUAL_MODULE_ID$1 = "virtual:timber-route-manifest";
|
|
684
719
|
var RESOLVED_VIRTUAL_ID$1 = `\0${VIRTUAL_MODULE_ID$1}`;
|
|
685
720
|
var SCHEMA_ID = "virtual:timber-schema";
|
|
@@ -748,6 +783,19 @@ function timberRouting(ctx) {
|
|
|
748
783
|
return {
|
|
749
784
|
name: "timber-routing",
|
|
750
785
|
/**
|
|
786
|
+
* Keep an update to an orphaned RSC module (a deleted route file created
|
|
787
|
+
* again, a server-reference module) from full-reloading the RSC module
|
|
788
|
+
* runner, which leaks a module generation. See plugins/orphaned-modules.ts.
|
|
789
|
+
*/
|
|
790
|
+
hotUpdate({ modules }) {
|
|
791
|
+
if (this.environment.name !== "rsc") return;
|
|
792
|
+
const environment = this.environment;
|
|
793
|
+
return redirectOrphanedModules({
|
|
794
|
+
moduleGraph: environment.moduleGraph,
|
|
795
|
+
evaluatedModules: isRunnableDevEnvironment(environment) ? environment.runner.evaluatedModules : void 0
|
|
796
|
+
}, modules, RSC_ENTRY_FILE);
|
|
797
|
+
},
|
|
798
|
+
/**
|
|
751
799
|
* Resolve the virtual module ID.
|
|
752
800
|
*
|
|
753
801
|
* Handles:
|
|
@@ -5684,46 +5732,69 @@ function isFrameworkInternalCaller() {
|
|
|
5684
5732
|
* 1. Calls the original console method (server terminal still works)
|
|
5685
5733
|
* 2. Serializes arguments for JSON transport
|
|
5686
5734
|
* 3. Sends via server.hot.send() — dropped if no clients connected
|
|
5735
|
+
*
|
|
5736
|
+
* The returned cleanup stops forwarding to `server`, and unwraps a method
|
|
5737
|
+
* only while this patch is still the outermost one. Vite's
|
|
5738
|
+
* `server.restart()` configures the new server, whose patch wraps this one,
|
|
5739
|
+
* before it closes this server. React's dev Flight server also wraps the
|
|
5740
|
+
* console when it loads. Restoring the method this patch found would drop
|
|
5741
|
+
* every wrapper installed since, the new server's included (TIM-1589). A
|
|
5742
|
+
* patch left inside another passes calls through once its server is closed.
|
|
5687
5743
|
*/
|
|
5688
5744
|
function patchConsole(server, projectRoot) {
|
|
5689
|
-
const
|
|
5690
|
-
|
|
5745
|
+
const target = {
|
|
5746
|
+
server,
|
|
5747
|
+
projectRoot
|
|
5748
|
+
};
|
|
5749
|
+
const installed = /* @__PURE__ */ new Map();
|
|
5691
5750
|
for (const level of LOG_LEVELS) {
|
|
5692
|
-
|
|
5693
|
-
|
|
5694
|
-
|
|
5695
|
-
|
|
5696
|
-
|
|
5697
|
-
|
|
5698
|
-
|
|
5699
|
-
try {
|
|
5700
|
-
prevConsole.get(level)(...args);
|
|
5701
|
-
if (isFrameworkInternalCaller()) return;
|
|
5702
|
-
try {
|
|
5703
|
-
const payload = {
|
|
5704
|
-
level,
|
|
5705
|
-
args: args.map((arg) => serializeArg(arg)),
|
|
5706
|
-
location: extractCallerLocation(projectRoot),
|
|
5707
|
-
timestamp: Date.now()
|
|
5708
|
-
};
|
|
5709
|
-
server.hot.send("timber:server-log", payload);
|
|
5710
|
-
} catch (e) {
|
|
5711
|
-
originalConsole.debug("[timber] server log forwarding failed:", e instanceof Error ? e.message : e);
|
|
5712
|
-
}
|
|
5713
|
-
} finally {
|
|
5714
|
-
patchingLevel.delete(level);
|
|
5715
|
-
}
|
|
5716
|
-
};
|
|
5751
|
+
const prev = console[level].bind(console);
|
|
5752
|
+
const method = createForwardingMethod(level, prev, target);
|
|
5753
|
+
console[level] = method;
|
|
5754
|
+
installed.set(level, {
|
|
5755
|
+
method,
|
|
5756
|
+
prev
|
|
5757
|
+
});
|
|
5717
5758
|
}
|
|
5718
5759
|
return () => {
|
|
5719
|
-
|
|
5760
|
+
target.server = null;
|
|
5761
|
+
for (const [level, { method, prev }] of installed) if (console[level] === method) console[level] = prev;
|
|
5762
|
+
};
|
|
5763
|
+
}
|
|
5764
|
+
function createForwardingMethod(level, prev, target) {
|
|
5765
|
+
let forwarding = false;
|
|
5766
|
+
return (...args) => {
|
|
5767
|
+
if (forwarding) {
|
|
5768
|
+
prev(...args);
|
|
5769
|
+
return;
|
|
5770
|
+
}
|
|
5771
|
+
forwarding = true;
|
|
5772
|
+
try {
|
|
5773
|
+
prev(...args);
|
|
5774
|
+
const { server } = target;
|
|
5775
|
+
if (!server) return;
|
|
5776
|
+
if (isFrameworkInternalCaller()) return;
|
|
5777
|
+
try {
|
|
5778
|
+
const payload = {
|
|
5779
|
+
level,
|
|
5780
|
+
args: args.map((arg) => serializeArg(arg)),
|
|
5781
|
+
location: extractCallerLocation(target.projectRoot),
|
|
5782
|
+
timestamp: Date.now()
|
|
5783
|
+
};
|
|
5784
|
+
server.hot.send("timber:server-log", payload);
|
|
5785
|
+
} catch (e) {
|
|
5786
|
+
originalConsole.debug("[timber] server log forwarding failed:", e instanceof Error ? e.message : e);
|
|
5787
|
+
}
|
|
5788
|
+
} finally {
|
|
5789
|
+
forwarding = false;
|
|
5790
|
+
}
|
|
5720
5791
|
};
|
|
5721
5792
|
}
|
|
5722
5793
|
/**
|
|
5723
5794
|
* Create the timber-dev-logs Vite plugin.
|
|
5724
5795
|
*
|
|
5725
|
-
* Patches console methods when the dev server starts and
|
|
5726
|
-
* when
|
|
5796
|
+
* Patches console methods when the dev server starts and stops forwarding
|
|
5797
|
+
* to it when it closes. Only active during `vite dev`.
|
|
5727
5798
|
*/
|
|
5728
5799
|
function timberDevLogs(_ctx) {
|
|
5729
5800
|
let cleanup = null;
|
|
@@ -7864,13 +7935,13 @@ async function runPrebuiltCapture(ctx, rscDir) {
|
|
|
7864
7935
|
* cannot see a shadow of an import binding (redeclaration error). Calls in
|
|
7865
7936
|
* other positions fall back to the runtime path like other untraceable forms.
|
|
7866
7937
|
*
|
|
7867
|
-
* The rewrite
|
|
7868
|
-
*
|
|
7869
|
-
* dev: cache.component(fn, opts) → __prebuiltDev("<name>", fn, opts)
|
|
7938
|
+
* The rewrite, in dev and production alike:
|
|
7939
|
+
* cache.component(fn, opts) → __prebuilt("<id>", fn, opts)
|
|
7870
7940
|
*
|
|
7871
|
-
* with `import { __prebuilt } from '#server-internal'` prepended.
|
|
7872
|
-
*
|
|
7873
|
-
*
|
|
7941
|
+
* with `import { __prebuilt } from '#server-internal'` prepended. Dev uses the
|
|
7942
|
+
* same IDs: they key the dev store too, and because the hash covers the
|
|
7943
|
+
* call-site text, editing the call site re-keys its entries (design/44
|
|
7944
|
+
* §Dev Mode). Build attribution is recorded in production only.
|
|
7874
7945
|
*
|
|
7875
7946
|
* Component identity: `<name>_<hash16>`, e.g. `blogbody_a1b2c3d4e5f6a7b8`.
|
|
7876
7947
|
* The name prefix is the declaring variable's name (lowercased, for legible
|
|
@@ -8113,7 +8184,6 @@ function timberPrebuilt(ctx) {
|
|
|
8113
8184
|
const relPath = relative(root, id);
|
|
8114
8185
|
const s = new MagicString(code);
|
|
8115
8186
|
const occurrences = /* @__PURE__ */ new Map();
|
|
8116
|
-
const wrapperName = ctx.dev ? "__prebuiltDev" : "__prebuilt";
|
|
8117
8187
|
const componentIds = [];
|
|
8118
8188
|
for (const { call, stmt, displayName } of callSites) {
|
|
8119
8189
|
const stmtText = code.slice(stmt.start, stmt.end);
|
|
@@ -8121,10 +8191,10 @@ function timberPrebuilt(ctx) {
|
|
|
8121
8191
|
const dupKey = stmtText + String.fromCharCode(0) + spanText;
|
|
8122
8192
|
const occurrence = occurrences.get(dupKey) ?? 0;
|
|
8123
8193
|
occurrences.set(dupKey, occurrence + 1);
|
|
8124
|
-
const
|
|
8125
|
-
if (!ctx.dev && mayPrerender(call)) componentIds.push(
|
|
8126
|
-
s.overwrite(call.callee.start, call.callee.end,
|
|
8127
|
-
s.appendLeft(call.arguments[0].start, `${JSON.stringify(
|
|
8194
|
+
const componentId = generatePrebuiltId(relPath, stmtText, spanText, occurrence, displayName);
|
|
8195
|
+
if (!ctx.dev && mayPrerender(call)) componentIds.push(componentId);
|
|
8196
|
+
s.overwrite(call.callee.start, call.callee.end, "__prebuilt");
|
|
8197
|
+
s.appendLeft(call.arguments[0].start, `${JSON.stringify(componentId)}, `);
|
|
8128
8198
|
}
|
|
8129
8199
|
if (!ctx.dev && componentIds.length > 0 && this?.environment?.name === "rsc") {
|
|
8130
8200
|
moduleComponents.set(id, componentIds);
|
|
@@ -8161,7 +8231,7 @@ function timberPrebuilt(ctx) {
|
|
|
8161
8231
|
}
|
|
8162
8232
|
}
|
|
8163
8233
|
}
|
|
8164
|
-
s.appendLeft(importInsertionOffset(program), `import {
|
|
8234
|
+
s.appendLeft(importInsertionOffset(program), `import { __prebuilt } from '#server-internal';\n`);
|
|
8165
8235
|
return {
|
|
8166
8236
|
code: s.toString(),
|
|
8167
8237
|
map: s.generateMap({ hires: "boundary" })
|
|
@@ -8343,19 +8413,42 @@ function findDefaultExport(program, source) {
|
|
|
8343
8413
|
}
|
|
8344
8414
|
function timberPrerenderSugar(ctx) {
|
|
8345
8415
|
let resolvedPages = null;
|
|
8416
|
+
/** The route tree `resolvedPages` was computed from — a rescan replaces it. */
|
|
8417
|
+
let resolvedFor;
|
|
8346
8418
|
function ensureResolved() {
|
|
8347
|
-
if (resolvedPages) return;
|
|
8348
|
-
|
|
8349
|
-
|
|
8350
|
-
return;
|
|
8351
|
-
}
|
|
8352
|
-
resolvedPages = resolvePagePrerender(ctx.routeTree.root);
|
|
8419
|
+
if (resolvedPages && resolvedFor === ctx.routeTree) return;
|
|
8420
|
+
resolvedFor = ctx.routeTree;
|
|
8421
|
+
resolvedPages = ctx.routeTree ? resolvePagePrerender(ctx.routeTree.root) : /* @__PURE__ */ new Map();
|
|
8353
8422
|
}
|
|
8354
8423
|
return {
|
|
8355
8424
|
name: "timber-prerender-sugar",
|
|
8356
8425
|
buildStart() {
|
|
8357
8426
|
resolvedPages = null;
|
|
8358
8427
|
},
|
|
8428
|
+
/**
|
|
8429
|
+
* Dev: an edit can change the resolved prerender value of pages other
|
|
8430
|
+
* than the edited file — a layout's `export const prerender` cascades to
|
|
8431
|
+
* every descendant page. Vite re-transforms only the edited file, so
|
|
8432
|
+
* the pages whose value changed are added to the update; through the
|
|
8433
|
+
* RSC entry's HMR boundary they re-execute with the new wrapping
|
|
8434
|
+
* (TIM-1588: dev caches prerendered output, so a stale wrapping is
|
|
8435
|
+
* observable — a page switched to `prerender = false` would still be
|
|
8436
|
+
* captured under the build rules). Runs after timber-routing's watcher
|
|
8437
|
+
* rescan, which happens synchronously when the event fires.
|
|
8438
|
+
*/
|
|
8439
|
+
hotUpdate({ file, modules }) {
|
|
8440
|
+
if (this.environment.name !== "rsc" || !file.startsWith(ctx.appDir)) return;
|
|
8441
|
+
const previous = resolvedPages ?? /* @__PURE__ */ new Map();
|
|
8442
|
+
resolvedPages = null;
|
|
8443
|
+
ensureResolved();
|
|
8444
|
+
const next = resolvedPages;
|
|
8445
|
+
const changedPages = /* @__PURE__ */ new Set([...previous.keys(), ...next.keys()]);
|
|
8446
|
+
for (const page of changedPages) if (JSON.stringify(previous.get(page)) === JSON.stringify(next.get(page))) changedPages.delete(page);
|
|
8447
|
+
changedPages.delete(file);
|
|
8448
|
+
const extra = [...changedPages].flatMap((page) => [...this.environment.moduleGraph.getModulesByFile(page) ?? []]);
|
|
8449
|
+
if (extra.length === 0) return;
|
|
8450
|
+
return [...modules, ...extra];
|
|
8451
|
+
},
|
|
8359
8452
|
transform(code, id) {
|
|
8360
8453
|
if (this?.environment?.name === "client") return;
|
|
8361
8454
|
if (id.includes("node_modules")) return;
|
|
@@ -9644,7 +9737,7 @@ function timber(config) {
|
|
|
9644
9737
|
console: originalConsole
|
|
9645
9738
|
});
|
|
9646
9739
|
ctx.timer.start("client-deps-scan");
|
|
9647
|
-
const { clientOptimizeDepsEntries, skipUseServerScanPlugin } = await import("./_chunks/client-dep-entries-
|
|
9740
|
+
const { clientOptimizeDepsEntries, skipUseServerScanPlugin } = await import("./_chunks/client-dep-entries-BJyP9SIu.js");
|
|
9648
9741
|
const entries = await clientOptimizeDepsEntries(resolvedRoot, BROWSER_ENTRY_FILE, buildDir);
|
|
9649
9742
|
ctx.timer.end("client-deps-scan");
|
|
9650
9743
|
return {
|