respect --mode, and remove server, prod and mode from $app/env

packages/kit/src/vite/build/build_server.js

@@ -111,7 +111,7 @@ export class Server {
 /**
  * @param {{
  *   cwd: string;
- *   config: import('types').ValidatedConfig
+ *   config: import('types').ValidatedConfig;
  *   vite_config_env: import('vite').ConfigEnv
  *   manifest_data: import('types').ManifestData
  *   build_dir: string;

packages/kit/src/vite/utils.js

@@ -12,7 +12,7 @@ export async function get_vite_config(config_env) {
 	if (!config) {
 		throw new Error('Could not load Vite config');
 	}
-	return config;
+	return { ...config, mode: config_env.mode };
 }
 
 /**

packages/kit/test/apps/options/package.json

@@ -4,7 +4,7 @@
 	"version": "0.0.1",
 	"scripts": {
 		"dev": "vite dev",
-		"build": "vite build",
+		"build": "vite build --mode custom",
 		"preview": "vite preview",
 		"prepare": "node ../../cli.js sync",
 		"check": "tsc && svelte-check",

packages/kit/test/apps/options/source/app.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="@sveltejs/kit" />
+
+declare namespace App {
+	interface Locals {}
+
+	interface Platform {}
+
+	interface Session {}
+
+	interface Stuff {}
+}

packages/kit/test/apps/options/source/pages/mode/index.js

@@ -0,0 +1,7 @@
+export function GET() {
+	return {
+		body: {
+			mode_from_endpoint: import.meta.env.MODE
+		}
+	};
+}

packages/kit/test/apps/options/source/pages/mode/index.svelte

@@ -0,0 +1,12 @@
+<script>
+	import { dev, mode as mode_from_import } from '$app/env';
+
+	/** @type {string} */
+	export let mode_from_endpoint;
+</script>
+
+<h2>
+	{mode_from_endpoint} === {mode_from_import} === {import.meta.env.MODE} === {dev
+		? 'development'
+		: 'custom'}
+</h2>

packages/kit/test/apps/options/test/test.js

@@ -203,3 +203,12 @@ test.describe('serviceWorker', () => {
 		expect(await page.content()).not.toMatch('navigator.serviceWorker');
 	});
 });
+
+test.describe('Vite options', () => {
+	test('Respects --mode', async ({ page }) => {
+		await page.goto('/path-base/mode');
+
+		const mode = process.env.DEV ? 'development' : 'custom';
+		expect(await page.textContent('h2')).toBe(`${mode} === ${mode} === ${mode} === ${mode}`);
+	});
+});