defer - initial attempt at exposing required data to ssr implementations #9760
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: f77b4f4 The changes in this PR will be included in the next version bump. This PR includes changesets to release 5 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
- add settledKey to DeferredData subscription callback
brophdawg11
reviewed
Dec 20, 2022
Comment on lines
+2296
to
+2303
| let error = getInternalRouterError(400, { type: "defer-action" }); | ||
| if (isRouteRequest) { | ||
| throw error; | ||
| } | ||
| result = { | ||
| type: ResultType.error, | ||
| error, | ||
| }; |
There was a problem hiding this comment.
Converted this to our ErrorResponse approach
brophdawg11
reviewed
Dec 20, 2022
| @@ -2922,7 +2930,7 @@ function processRouteLoaderData( | |||
| matchesToLoad: AgnosticDataRouteMatch[], | |||
| results: DataResult[], | |||
| pendingError: RouteData | undefined, | |||
| activeDeferreds?: Map<string, DeferredData> | |||
| activeDeferreds: Map<string, DeferredData> | |||
There was a problem hiding this comment.
This can be required now since we use it in SSR
brophdawg11
reviewed
Dec 20, 2022
packages/router/router.ts
Outdated
Comment on lines
2980
to
2993
| } else if (isDeferredResult(result)) { | ||
| activeDeferreds && activeDeferreds.set(id, result.deferredData); | ||
| loaderData[id] = result.deferredData.data; | ||
| let init = result.deferredData.responseInit; | ||
| if (init) { | ||
| // Error status codes always override success status codes, but if all | ||
| // loaders are successful we take the deepest status code. | ||
| if (init.status != null && init.status !== 200 && !foundError) { | ||
| statusCode = init.status; | ||
| } | ||
| if (init.headers) { | ||
| loaderHeaders[id] = new Headers(init.headers); | ||
| } | ||
| } |
There was a problem hiding this comment.
I aligned the SuccessResult/DeferredResult apis here for statusCode and headers
5 tasks
brophdawg11
reviewed
Dec 21, 2022
| data: Record<string, unknown>; | ||
| statusCode: number; | ||
| headers: Headers; | ||
| deferredKeys: string[] = []; |
There was a problem hiding this comment.
Could this be deduced via:
Object.entries(deferredData.data)
.filter(e => 'then' in e[1] && typeof e[1].then === 'function')
.map(e => e[0]);
brophdawg11
changed the title
2 tasks
fix: allow unsubscribe from DeferredData
brophdawg11
reviewed
Jan 11, 2023
Comment on lines
+2467
to
+2470
| activeDeferreds: | ||
| activeDeferreds.size > 0 | ||
| ? Object.fromEntries(activeDeferreds.entries()) | ||
| : null, |
There was a problem hiding this comment.
Do we need to convert this to an object? Or could it remain a Map since it's never intended to be serialized?
brophdawg11
approved these changes
Jan 11, 2023
This was referenced Jan 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.