diff options
| -rw-r--r-- | .changeset/tidy-days-decide.md | 5 | ||||
| -rw-r--r-- | packages/astro/src/config/index.ts | 4 | ||||
| -rw-r--r-- | packages/astro/src/core/config/config.ts | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.changeset/tidy-days-decide.md b/.changeset/tidy-days-decide.md new file mode 100644 index 000000000..53398e057 --- /dev/null +++ b/.changeset/tidy-days-decide.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixes an issue where the function `getViteConfig` wasn't returning the correct merged Astro configuration diff --git a/packages/astro/src/config/index.ts b/packages/astro/src/config/index.ts index 7950990ec..aa078a948 100644 --- a/packages/astro/src/config/index.ts +++ b/packages/astro/src/config/index.ts @@ -34,7 +34,7 @@ export function getViteConfig(inlineConfig: UserConfig, inlineAstroConfig: Astro dest: nodeLogDestination, level: 'info', }); - const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd); + const { astroConfig: config, userConfig } = await resolveConfig(inlineAstroConfig, cmd); let settings = await createSettings(config, inlineConfig.root); settings = await runHookConfigSetup({ settings, command: cmd, logger }); const viteConfig = await createVite( @@ -48,6 +48,6 @@ export function getViteConfig(inlineConfig: UserConfig, inlineAstroConfig: Astro { settings, logger, mode } ); await runHookConfigDone({ settings, logger }); - return mergeConfig(viteConfig, inlineConfig); + return mergeConfig(viteConfig, userConfig); }; } diff --git a/packages/astro/src/core/config/config.ts b/packages/astro/src/core/config/config.ts index d0cfd0e49..9a700ab0e 100644 --- a/packages/astro/src/core/config/config.ts +++ b/packages/astro/src/core/config/config.ts @@ -199,5 +199,5 @@ export async function resolveConfig( const mergedConfig = mergeConfig(userConfig, inlineUserConfig); const astroConfig = await validateConfig(mergedConfig, root, command); - return { userConfig, astroConfig }; + return { userConfig: mergedConfig, astroConfig }; } |