Remove proload for config loading #5778
Merged
+65
−162
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: 8b0a4ba 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
Jan 6, 2023
Comment on lines
-210
to
-212
| // Reset NODE_ENV to initial value | ||
| // Vite's `createServer()` sets NODE_ENV to 'development'! | ||
| process.env.NODE_ENV = nodeEnv; |
There was a problem hiding this comment.
This removal undoes #5700 (review) since we're already using Vite 4. Thought I'll make this change since this PR is config related.
| ].map((p) => path.join(root, p)); | ||
|
|
||
| for (const file of paths) { | ||
| if (fsMod.existsSync(file)) { |
There was a problem hiding this comment.
The previous function uses stat to check file existence, I switched to existsSync since it should be the same.
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
Close #5748
Fix #5459
resolveConfigPathto only search for a config path, and not load the config itself, this fixes Issue withastro addand@astrojs/mdx#5459Note: I tried to use Vite's
loadConfigFromFileinstead, but it doesn't bring much benefit for us, and prevents named exports from the Astro config if we ever need it. It's also harder to test withcreateFssinceloadConfigFromFilealways read from the actual filesystem.Testing
Existing config loading test should work. Since this removes a proload feature, I don't think there's new test to add.
Docs
n/a. Ideally loading the config with Vite should always work, so this change shouldn't need a docs update.