Fix astro sync config merge #6392
Merged
Conversation
This file contains 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
🦋 Changeset detectedLatest commit: acf9e3e The changes in this PR will be included in the next version bump. 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 |
github-actions
bot
added
the
pkg: astro
bluwy
commented
Mar 1, 2023
Comment on lines
-206
to
+203
| } else { | ||
| result = vite.mergeConfig(result, settings.config.vite || {}); | ||
| } | ||
| return true; | ||
| }); | ||
| result = vite.mergeConfig(result, { ...rest, plugins }); | ||
| } else { | ||
| result = vite.mergeConfig(result, settings.config.vite || {}); |
There was a problem hiding this comment.
The main change in this diff is that previously when command is not set, it means it's in astro sync. However, it did not run result = vite.mergeConfig(result, settings.config.vite || {});, causing the issue.
We can't run that mergeConfig if command is undefined because that calls Vite plugins with apply: 'serve' in builds. So I made astro sync run in build mode only to fix this.
matthewp
approved these changes
Mar 1, 2023
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.
Changes
Recently merged but unreleased change #6368 regresses #6238. Causing docs to fail to build because integrations that updates the Vite config isn't affecting Astro's internal Vite config.
This PR makes
astro syncto run inbuildmode, meaning plugins withapply: 'serve'will not run inastro sync. I think this is what #6368 was trying to fix (the issue: #6364), so this shouldn't be regressing that. And opens up the path forastro syncto update Astro's internal Vite config.cc @userquin
Testing
I made sure the test added in #6368 still passed
Docs
n/a. bug fix.