fix(core): use locale url in site config#12054
Merged
Merged
Conversation
✅ [V2]Built without sensitive environment variables
To edit notification comments on pull requests, go to your Netlify project configuration. |
slorber
approved these changes
May 22, 2026
Collaborator
slorber
left a comment
There was a problem hiding this comment.
LGTM 👍
Thanks
Although our e2e tests do not cover this well, I tested it locally and it seems like a reasonable thing to do
Contributor
Author
|
Thanks for the review. |
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
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.
Fixes #12013
Summary
This copies the active locale URL into
siteConfigwhen loading a localized site.Why
Docusaurus already applies the locale-specific
baseUrl, but kept the top-levelurl. Plugins that receivesiteConfig, including the sitemap plugin, could therefore generate URLs with the primary locale's domain even when the current locale is configured for a separate domain.Test plan
nvm use 26 && yarn oxfmt --list-different packages/docusaurus/src/server/site.ts packages/docusaurus/src/server/__tests__/site.test.tsnvm use 26 && yarn eslint --cache --report-unused-disable-directives packages/docusaurus/src/server/site.ts packages/docusaurus/src/server/__tests__/site.test.tsnvm use 26 && yarn test packages/docusaurus/src/server/__tests__/site.test.tscurrently blocked locally because this checkout needs additional built workspace packages (@docusaurus/bundler, then@docusaurus/faster/@docusaurus/babel) after installing dependencies with scripts disabled.