From e51997b6a829d5aba04f64e34945006e96d9a7b5 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 23 Sep 2022 14:57:44 -0400
Subject: [PATCH 1/2] respect env.dir when running preview - closes #6204

---
 .changeset/forty-news-smell.md                 | 5 +++++
 packages/kit/src/exports/vite/preview/index.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/forty-news-smell.md

diff --git a/.changeset/forty-news-smell.md b/.changeset/forty-news-smell.md
new file mode 100644
index 000000000000..6a71c37e1216
--- /dev/null
+++ b/.changeset/forty-news-smell.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Respect `config.kit.env.dir` when running `vite preview`
diff --git a/packages/kit/src/exports/vite/preview/index.js b/packages/kit/src/exports/vite/preview/index.js
index 0a24a0b9c932..2948346e0a6b 100644
--- a/packages/kit/src/exports/vite/preview/index.js
+++ b/packages/kit/src/exports/vite/preview/index.js
@@ -46,7 +46,7 @@ export async function preview(vite, vite_config, svelte_config) {
 
 	const server = new Server(manifest);
 	await server.init({
-		env: loadEnv(vite_config.mode, process.cwd(), '')
+		env: loadEnv(vite_config.mode, svelte_config.kit.env.dir, '')
 	});
 
 	return () => {

From c6e3fcd128ce563f6ba0feaddbc23870ff47a1b5 Mon Sep 17 00:00:00 2001
From: Rich Harris <hello@rich-harris.dev>
Date: Fri, 23 Sep 2022 15:00:49 -0400
Subject: [PATCH 2/2] add test

---
 packages/kit/test/apps/options-2/src/routes/env/+page.svelte | 4 +++-
 packages/kit/test/apps/options-2/test/test.js                | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/kit/test/apps/options-2/src/routes/env/+page.svelte b/packages/kit/test/apps/options-2/src/routes/env/+page.svelte
index a5ee26895b67..07cfc06fe42b 100644
--- a/packages/kit/test/apps/options-2/src/routes/env/+page.svelte
+++ b/packages/kit/test/apps/options-2/src/routes/env/+page.svelte
@@ -1,5 +1,7 @@
 <script>
 	import { PUBLIC_LOOK_IN_OPTIONS_2 } from '$env/static/public';
+	import { env } from '$env/dynamic/public';
 </script>
 
-<p>{PUBLIC_LOOK_IN_OPTIONS_2}</p>
+<p data-testid="static">static: {PUBLIC_LOOK_IN_OPTIONS_2}</p>
+<p data-testid="dynamic">dynamic: {env.PUBLIC_LOOK_IN_OPTIONS_2}</p>
diff --git a/packages/kit/test/apps/options-2/test/test.js b/packages/kit/test/apps/options-2/test/test.js
index 05a849daa14a..76056ef7fa85 100644
--- a/packages/kit/test/apps/options-2/test/test.js
+++ b/packages/kit/test/apps/options-2/test/test.js
@@ -8,7 +8,8 @@ test.describe.configure({ mode: 'parallel' });
 test.describe('env', () => {
 	test('resolves upwards', async ({ page }) => {
 		await page.goto('/basepath/env');
-		expect(await page.textContent('p')).toBe('resolves upwards!');
+		expect(await page.textContent('[data-testid="static"]')).toBe('static: resolves upwards!');
+		expect(await page.textContent('[data-testid="dynamic"]')).toBe('dynamic: resolves upwards!');
 	});
 });