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.

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

Better handling of deferred promises that resolve/reject with undefined #10690

Merged
merged 4 commits into from
Jul 11, 2023

Conversation

brophdawg11
Copy link
Contributor

Alternate fix for remix-run/remix#6793

@changeset-bot
Copy link

changeset-bot bot commented Jul 11, 2023

🦋 Changeset detected

Latest commit: ba5804c

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

Comment on lines 1364 to 1374
// Option 1
if (data === undefined) {
Object.defineProperty(promise, "_error", {
get: () =>
new Error(
`Deferred data for key ${key} resolved to \`undefined\`, you must resolve with a value or \`null\`.`
),
});
this.emit(false, key);
return Promise.reject(error);
}
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 approach better aligns with our handling of function loader() { return undefined; }

packages/router/utils.ts Outdated Show resolved Hide resolved
packages/router/utils.ts Outdated Show resolved Hide resolved
@brophdawg11
Copy link
Contributor Author

LGTM - just minor refactor questions - take 'em or leave 'em 😄

@brophdawg11 brophdawg11 merged commit 0586306 into dev Jul 11, 2023
@brophdawg11 brophdawg11 deleted the brophdawg11/deferred-hang branch July 11, 2023 20:27
@github-actions
Copy link
Contributor

🤖 Hello there,

We just published version 6.14.2-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
Copy link
Contributor

🤖 Hello there,

We just published version 6.14.2 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants