Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid unnecessary console error on fetcher abort due to back-to-back revalidation calls #12050

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Avoid unnecessary console error on fetcher abort due to back-to-back revalidation calls #12050

merged 2 commits into from
Oct 1, 2024

Conversation

brophdawg11
Copy link
Contributor

Closes #12049

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Sep 30, 2024 •
edited
Loading

🦋 Changeset detected

Latest commit: 68824ab

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 5 packages
Name Type
@remix-run/router Patch
react-router Patch
react-router-dom Patch
react-router-dom-v5-compat Patch
react-router-native Patch

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 brophdawg11 linked an issue Sep 30, 2024 that may be closed by this pull request
Get "Expected fetch controller: :r1:" when calling fetcher.load and revalidator.revalidate #12049
Closed
@brophdawg11 brophdawg11 mentioned this pull request Sep 30, 2024
Closed
brophdawg11
brophdawg11 commented Sep 30, 2024
View reviewed changes
packages/router/router.ts
@@ -3018,9 +3014,10 @@ export function createRouter(init: RouterInit): Router {

function abortFetcher(key: string) {
let controller = fetchControllers.get(key);
invariant(controller, `Expected fetch controller: ${key}`);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All but 2 uses of abortFetcher were already defensive against this invariant and the 2 that weren't were the bug we're fixing, so now that they all want to be defensive we can just flatten the defensive check into this method.

brophdawg11
brophdawg11 commented Oct 1, 2024
View reviewed changes
packages/router/router.ts
@@ -2049,7 +2048,6 @@ export function createRouter(init: RouterInit): Router {
let { loaderData, errors } = processLoaderData(
state,
matches,
matchesToLoad,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was unused

@brophdawg11 brophdawg11 merged commit 51984d1 into v6 Oct 1, 2024
3 checks passed
@brophdawg11 brophdawg11 deleted the brophdawg11/fetcher-dup-revalidation-log branch October 1, 2024 13:42
brophdawg11 added a commit that referenced this pull request Oct 1, 2024
@brophdawg11
Avoid unnecessary console error on fetcher abort due to back-to-back …
d5aaee4 
…revalidation calls (#12050)
@brophdawg11 brophdawg11 mentioned this pull request Oct 1, 2024
Merged
brophdawg11 added a commit that referenced this pull request Oct 1, 2024
@brophdawg11
Avoid unnecessary console error on fetcher abort due to back-to-back …
1dc2ede 
…revalidation calls (#12050) (#12054)
@github-actions github-actions bot mentioned this pull request Oct 9, 2024
Merged
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 9, 2024

🤖 Hello there,

We just published version 6.27.0-pre.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

@github-actions github-actions bot mentioned this pull request Oct 11, 2024
Merged
@github-actions GitHub Actions
Copy link
Contributor

🤖 Hello there,

We just published version 6.27.0 which includes this pull request. If you'd like to take it for a test run please try it out and let us know what you think!

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CLA Signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Get "Expected fetch controller: :r1:" when calling fetcher.load and revalidator.revalidate
1 participant
@brophdawg11