fix: data route rewrite for i18n root route #2002
Merged
Conversation
This file contains hidden or 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
✅ Deploy Preview for next-plugin-edge-middleware ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for netlify-plugin-nextjs-static-root-demo ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for netlify-plugin-nextjs-demo ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for next-plugin-canary ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for nextjs-plugin-custom-routes-demo ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for next-i18next-demo ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for netlify-plugin-nextjs-export-demo ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for netlify-plugin-nextjs-nx-monorepo-demo ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
✅ Deploy Preview for netlify-plugin-nextjs-next-auth-demo ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
nickytonline
approved these changes
Mar 21, 2023
| @@ -74,7 +74,7 @@ export const generateNetlifyRoutes = ({ | |||
| }) => [...(withData ? toNetlifyRoute(dataRoute) : []), ...toNetlifyRoute(route)] | |||
|
|
|||
| export const routeToDataRoute = (route: string, buildId: string, locale?: string) => | |||
| `/_next/data/${buildId}${locale ? `/${locale}` : ''}${route === '/' ? '/index' : route}.json` | |||
| `/_next/data/${buildId}${locale ? `/${locale}` : ''}${route === '/' ? (locale ? '' : '/index') : route}.json` | |||
There was a problem hiding this comment.
[dust] I get what's happening here but it's hard to grok with the multiple/nested ternaries.
There was a problem hiding this comment.
yeah, I agree. i did try to refactor this but ended up in a knot because it really needs to broken up into 2 different functions - one for i18n and one for non-i18n - but it's difficult because of the various places it gets called. hopefully all this will be replaced soon with edge routing and/or improved CDN redirects
Merged
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.
Summary
The runtime creates rewrites that route ISR pages (and their data routes) to the ODB handler. However, the runtime was not correctly handling data route rewrites on ISR index pages for i18n sites.
On non-i18n sites, the index data route has the 'index' suffix, e.g.
/_next/data/build-id/index.jsonOn i18n sites, the index data route uses the locale instead, e.g.
/_next/data/build-id/en.json, but the runtime was still using the 'index' suffix. This PR fixes that.Test plan
/_next/data/build-id/en.jsoninstead of/_next/data/build-id/index.jsonx-nf-render-mode: odb ttl=60header and not anx-nf-render-mode: ssrheaderRelevant links (GitHub issues, Notion docs, etc.) or a picture of cute animal
Closes netlify/pod-ecosystem-frameworks#429