Skip to content

Commit ec0f943

Browse files
authored
respect env.dir when running preview (#7001)
* respect env.dir when running preview - closes #6204 * add test
1 parent 2c6f537 commit ec0f943

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

.changeset/forty-news-smell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@sveltejs/kit': patch
3+
---
4+
5+
Respect `config.kit.env.dir` when running `vite preview`

packages/kit/src/exports/vite/preview/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export async function preview(vite, vite_config, svelte_config) {
4646

4747
const server = new Server(manifest);
4848
await server.init({
49-
env: loadEnv(vite_config.mode, process.cwd(), '')
49+
env: loadEnv(vite_config.mode, svelte_config.kit.env.dir, '')
5050
});
5151

5252
return () => {
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<script>
22
import { PUBLIC_LOOK_IN_OPTIONS_2 } from '$env/static/public';
3+
import { env } from '$env/dynamic/public';
34
</script>
45

5-
<p>{PUBLIC_LOOK_IN_OPTIONS_2}</p>
6+
<p data-testid="static">static: {PUBLIC_LOOK_IN_OPTIONS_2}</p>
7+
<p data-testid="dynamic">dynamic: {env.PUBLIC_LOOK_IN_OPTIONS_2}</p>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ test.describe.configure({ mode: 'parallel' });
88
test.describe('env', () => {
99
test('resolves upwards', async ({ page }) => {
1010
await page.goto('/basepath/env');
11-
expect(await page.textContent('p')).toBe('resolves upwards!');
11+
expect(await page.textContent('[data-testid="static"]')).toBe('static: resolves upwards!');
12+
expect(await page.textContent('[data-testid="dynamic"]')).toBe('dynamic: resolves upwards!');
1213
});
1314
});
1415

0 commit comments

Comments
 (0)