Allow returning undefined from loaders/actions (part 2) #12057
Merged
+213
−228
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: b05d129 The changes in this PR will be included in the next version bump. This PR includes changesets to release 10 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 |
brophdawg11
commented
Oct 2, 2024
packages/react-router/lib/hooks.tsx
Outdated
| @@ -832,7 +832,7 @@ export function _renderMatches( | |||
| let { loaderData, errors } = dataRouterState; | |||
| let needsToRunLoader = | |||
| match.route.loader && | |||
| loaderData[match.route.id] === undefined && | |||
| !(match.route.id in loaderData) && | |||
There was a problem hiding this comment.
The presence of the key in loaderData/actionData now indicates if it ran or not
brophdawg11
force-pushed
the
brophdawg11/allow-undefined
branch
from
a92cb5c
to
17dca50
Compare
brophdawg11
commented
Oct 2, 2024
| @@ -20,61 +20,18 @@ export interface AppLoadContext { | |||
| */ | |||
| export type AppData = unknown; | |||
|
|
|||
| export async function callRouteAction({ | |||
There was a problem hiding this comment.
Once the undefined check was removed there was no difference left between callRouteLoader and callRouteAction so they are now collapsed to callRouteHandler
brophdawg11
commented
Oct 2, 2024
| @@ -770,6 +770,10 @@ const defaultMapRouteProperties: MapRoutePropertiesFunction = (route) => ({ | |||
|
|
|||
| const TRANSITIONS_STORAGE_KEY = "remix-router-transitions"; | |||
|
|
|||
| // Flag used on new `loaderData` to indicate that we do not want to preserve | |||
| // any prior loader data from the throwing route in `mergeLoaderData` | |||
| const ResetLoaderDataSymbol = Symbol("ResetLoaderData"); | |||
There was a problem hiding this comment.
We used to use undefined to detect this scenario, switched to a symbol since undefined is a valid value now
brophdawg11
force-pushed
the
brophdawg11/allow-undefined
branch
from
0e77363
to
f4aebf9
Compare
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.
Follow up to #11680 which missed some of the Remix codepath checks.