Merge branch 'main' into fix/error-in-stream

withastro · Oct 29, 2024 · 1d7c1f7 · 1d7c1f7
2 parents 917e538 + feb87c2
commit 1d7c1f7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.changeset/slimy-sloths-fry.md b/.changeset/slimy-sloths-fry.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where using `getViteConfig()` returns incorrect and duplicate configuration
diff --git a/packages/astro/src/core/middleware/vite-plugin.ts b/packages/astro/src/core/middleware/vite-plugin.ts
@@ -21,9 +21,8 @@ export function vitePluginMiddleware({ settings }: { settings: AstroSettings }):
 
 	return {
 		name: '@astro/plugin-middleware',
-		config(opts, { command }) {
+		config(_, { command }) {
 			isCommandBuild = command === 'build';
-			return opts;
 		},
 		async resolveId(id) {
 			if (id === MIDDLEWARE_MODULE_ID) {

diff --git a/packages/astro/test/config-vite.test.js b/packages/astro/test/config-vite.test.js
@@ -1,6 +1,8 @@
 import assert from 'node:assert/strict';
 import { before, describe, it } from 'node:test';
 import * as cheerio from 'cheerio';
+import { resolveConfig } from 'vite';
+import { getViteConfig } from '../dist/config/index.js';
 import { loadFixture } from './test-utils.js';
 
 describe('Vite Config', async () => {
@@ -21,3 +23,14 @@ describe('Vite Config', async () => {
 		assert.match($('link').attr('href'), /\/assets\/testing-[a-z\d]+\.css/);
 	});
 });
+
+describe('getViteConfig', () => {
+	it('Does not change the default config.', async () => {
+		const command = 'serve';
+		const mode = 'test';
+		const configFn = getViteConfig({});
+		const config = await configFn({ command, mode });
+		const resolvedConfig = await resolveConfig(config, command, mode);
+		assert.deepStrictEqual(resolvedConfig.resolve.conditions, ['astro']);
+	});
+});