Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/curly-wolves-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: ignore nested outDir files outside generated
5 changes: 3 additions & 2 deletions packages/kit/src/exports/vite/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,9 @@ function kit({ svelte_config }) {
sourcemapIgnoreList,
watch: {
ignored: [
// Ignore all siblings of config.outDir/generated
`${out_dir}/!(generated)`
// Ignore all siblings of config.outDir/generated, at any depth
`${out_dir}/!(generated)`,
`${out_dir}/!(generated)/**`
]
}
},
Expand Down
17 changes: 17 additions & 0 deletions packages/kit/test/apps/options/unit-test/vite.spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
import { test, expect } from 'vitest';
import { spawnSync } from 'node:child_process';
import path from 'node:path';
import { createFilter, resolveConfig } from 'vite';

const timeout = 60_000;

const cwd = path.resolve(import.meta.dirname, '..');

test('ignores all outDir files except generated files', async () => {
const config = await resolveConfig(
{ configFile: path.join(cwd, 'vite.custom.config.js') },
'serve'
);
const is_ignored = createFilter(config.server.watch.ignored);
const out_dir = path.resolve(cwd, '.custom-out-dir').replaceAll('\\', '/');

expect(is_ignored(`${out_dir}/tsconfig.json`)).toBe(true);
expect(is_ignored(`${out_dir}/.svelte-check/tsconfig.json`)).toBe(true);
expect(is_ignored(`${out_dir}/types/a/$types.d.ts`)).toBe(true);
expect(is_ignored(`${out_dir}/generated`)).toBe(false);
expect(is_ignored(`${out_dir}/generated/root.js`)).toBe(false);
expect(is_ignored(`${out_dir}/generated/client/app.js`)).toBe(false);
});

test('no overridden options warning', { timeout }, () => {
const result = spawnSync(
'pnpm',
Expand Down
Loading