Improve env var handling in SSR #9637
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: c9e2cd9 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
pkg: astro
bluwy
commented
Jan 8, 2024
Comment on lines
-51
to
-56
| privateEnv.SITE = astroConfig.site ? JSON.stringify(astroConfig.site) : 'undefined'; | ||
| privateEnv.SSR = JSON.stringify(true); | ||
| privateEnv.BASE_URL = astroConfig.base ? JSON.stringify(astroConfig.base) : 'undefined'; | ||
| privateEnv.ASSETS_PREFIX = astroConfig.build.assetsPrefix | ||
| ? JSON.stringify(astroConfig.build.assetsPrefix) | ||
| : 'undefined'; |
There was a problem hiding this comment.
We don't need to re-specify these here as Vite will already handle them. If we specify them here, we'd do a plain string replacement instead, which is less accurate than Vite's implementation.
ematipico
approved these changes
Jan 8, 2024
| @@ -308,3 +308,7 @@ function isCommonNotAstro(dep: string): boolean { | |||
| ) | |||
| ); | |||
| } | |||
|
|
|||
| function stringifyForDefine(value: string | undefined): string { | |||
There was a problem hiding this comment.
Should it be stringifyOrDefine?
There was a problem hiding this comment.
It is "For" since we're stringifying the value for the define config passed to Vite.
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
Some env var replacement can be relayed to Vite to replace instead, which is more accurate as we're using plain string replacements. I'm currently working on improving Astro's env replacement too and notice this stop gap improvement.
Testing
Existing env vars tests should pass.
Docs
n/a. internal refactor.