From a987a1f0091ee64b8a137dad7e02cac3ed5f212f Mon Sep 17 00:00:00 2001
From: Maksim Nazarev <maksim.nazarev@zfx.com>
Date: Wed, 24 Apr 2024 20:01:06 +0300
Subject: [PATCH] fix: respect 'mode' CLI flag when running dev command

---
 .changeset/nine-buttons-push.md           |  5 +++++
 packages/astro/src/core/dev/container.ts  |  2 +-
 packages/astro/test/units/dev/dev.test.js | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/nine-buttons-push.md

diff --git a/.changeset/nine-buttons-push.md b/.changeset/nine-buttons-push.md
new file mode 100644
index 0000000000000..6afa30a440876
--- /dev/null
+++ b/.changeset/nine-buttons-push.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+respect "mode" CLI flag when running dev command
diff --git a/packages/astro/src/core/dev/container.ts b/packages/astro/src/core/dev/container.ts
index d252e2eea5345..1c34f33652bdc 100644
--- a/packages/astro/src/core/dev/container.ts
+++ b/packages/astro/src/core/dev/container.ts
@@ -68,7 +68,7 @@ export async function createContainer({
 
 	const viteConfig = await createVite(
 		{
-			mode: 'development',
+			mode: inlineConfig?.mode || 'development',
 			server: { host, headers, open },
 			optimizeDeps: {
 				include: rendererClientEntries,
diff --git a/packages/astro/test/units/dev/dev.test.js b/packages/astro/test/units/dev/dev.test.js
index 85f584e9c3072..7478d08980508 100644
--- a/packages/astro/test/units/dev/dev.test.js
+++ b/packages/astro/test/units/dev/dev.test.js
@@ -273,4 +273,16 @@ describe('dev container', () => {
 			assert.equal(r.res.statusCode, 200);
 		});
 	});
+
+	it('overrides mode when CLI flag is specified', async () => {
+		await runInContainer({ inlineConfig: { mode: 'staging' } }, (container) => {
+			assert.equal(container.viteServer.config.mode, 'staging');
+		});
+	});
+
+	it('uses "development" mode when CLI flag is not specified', async () => {
+		await runInContainer({}, (container) => {
+			assert.equal(container.viteServer.config.mode, 'development');
+		});
+	});
 });