Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support envPrefix in Astro config #5852

Merged
merged 7 commits into from
Jan 13, 2023
Merged

Support envPrefix in Astro config #5852

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b05305
Support envPrefix in Astro config
Jan 13, 2023
3128564
Update packages/astro/src/core/config/schema.ts
Jan 13, 2023
f9e26db
Update packages/astro/src/core/build/static-build.ts
Jan 13, 2023
3cbfa56
Update packages/astro/src/core/build/static-build.ts
Jan 13, 2023
85a2e25
Update packages/astro/src/core/config/schema.ts
Jan 13, 2023
30ea9cc
Update packages/astro/src/core/create-vite.ts
Jan 13, 2023
f2b4b53
Update .changeset/twenty-llamas-type.md
natemoo-re Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/twenty-llamas-type.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': minor
---

fix envPrefix in Astro.config
natemoo-re marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions packages/astro/src/core/build/static-build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
// SSR needs to be last
ssr && vitePluginSSR(internals, settings.adapter!),
],
envPrefix: 'PUBLIC_',
envPrefix: settings.config.envPrefix ?? 'PUBLIC_',
rishi-raj-jain marked this conversation as resolved.
Show resolved Hide resolved
base: settings.config.base,
};

Expand Down Expand Up @@ -230,7 +230,7 @@ async function clientBuild(
}),
...(viteConfig.plugins || []),
],
envPrefix: 'PUBLIC_',
envPrefix: settings.config.envPrefix ?? 'PUBLIC_',
rishi-raj-jain marked this conversation as resolved.
Show resolved Hide resolved
base: settings.config.base,
};

Expand Down
2 changes: 2 additions & 0 deletions packages/astro/src/core/config/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const ASTRO_CONFIG_DEFAULTS: AstroUserConfig & any = {
publicDir: './public',
outDir: './dist',
base: '/',
envPrefix: 'PUBLIC_',
rishi-raj-jain marked this conversation as resolved.
Show resolved Hide resolved
trailingSlash: 'ignore',
build: {
format: 'directory',
Expand Down Expand Up @@ -62,6 +63,7 @@ export const AstroConfigSchema = z.object({
.url()
.optional()
.transform((val) => (val ? appendForwardSlash(val) : val)),
envPrefix: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.envPrefix),
rishi-raj-jain marked this conversation as resolved.
Show resolved Hide resolved
base: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.base),
trailingSlash: z
.union([z.literal('always'), z.literal('never'), z.literal('ignore')])
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/core/create-vite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export async function createVite(
],
publicDir: fileURLToPath(settings.config.publicDir),
root: fileURLToPath(settings.config.root),
envPrefix: 'PUBLIC_',
envPrefix: settings.config.envPrefix ?? 'PUBLIC_',
rishi-raj-jain marked this conversation as resolved.
Show resolved Hide resolved
define: {
'import.meta.env.SITE': settings.config.site
? JSON.stringify(settings.config.site)
Expand Down