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

fix(router): fallback support in new_defineRouter and new_createPages #1013

Merged
merged 20 commits into from
Nov 25, 2024

Conversation

dai-shi
Copy link
Owner

@dai-shi dai-shi commented Nov 24, 2024

add fallback mechanism for #1003.

Copy link

vercel bot commented Nov 24, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
waku ✅ Ready (Inspect) Visit Preview Nov 25, 2024 2:52am

Copy link

codesandbox-ci bot commented Nov 24, 2024

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

…error"

This reverts commit b6b3ba2, reversing
changes made to 1eb74a3.
Copy link
Contributor

@tylersayshi tylersayshi left a comment

Choose a reason for hiding this comment

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

This seems fine. I don't yet fully understand what fallbackElement is yet though.

}>;
}): ReturnType<typeof defineEntries> {
const platformObject = unstable_getPlatformObject();
type MyPathConfig = {
pattern: string;
pathname: PathSpec;
// FIXME Do we need this isStaticRouteElement?
Copy link
Contributor

Choose a reason for hiding this comment

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

nope! good catch, safe to remove. This just slipped in as left over

Comment on lines +317 to +322
// HACK I'm not sure if this is the right way
return createElement(
ChildrenContextProvider,
{ value: createElement(InnerErr, { err }) },
fallback,
);
Copy link
Owner Author

Choose a reason for hiding this comment

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

I wonder if this hack works for new_createPages fallback. Let check it after merging...

Copy link
Owner Author

Choose a reason for hiding this comment

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

It doesn't work. so #1015.

Comment on lines +334 to +339
if (unstable_renderPrev) {
if (!elementsPromise.prev) {
throw new Error('Missing prev elements');
}
return renderSlot(elementsPromise.prev);
}
Copy link
Owner Author

Choose a reason for hiding this comment

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

I'm not happy with this, and hope to redesign it after finishing our current transition.

@dai-shi dai-shi merged commit f17dafb into main Nov 25, 2024
26 checks passed
@dai-shi dai-shi deleted the fix/define-router-for-error branch November 25, 2024 03:22
dai-shi added a commit that referenced this pull request Nov 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants