Skip to content

Commit 5532e8e

Browse files
benmccannbenmccann
committed
update site and tests to use vite.config.js
1 parent 20bce80 commit 5532e8e

23 files changed

+271
-139
lines changed

‎packages/adapter-static/test/apps/prerendered/svelte.config.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ const config = {
77

88
prerender: {
99
default: true
10-
},
11-
12-
vite: {
13-
build: {
14-
minify: false
15-
}
1610
}
1711
}
1812
};

‎packages/adapter-static/test/apps/prerendered/vite.config.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { sveltekit } from '@sveltejs/kit/vite';
2+
3+
/** @type {import('vite').UserConfig} */
4+
const config = {
5+
build: {
6+
minify: false
7+
},
8+
plugins: [sveltekit()]
9+
};
10+
11+
export default config;

‎packages/adapter-static/test/apps/spa/svelte.config.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ const config = {
55
kit: {
66
adapter: adapter({
77
fallback: '200.html'
8-
}),
9-
10-
vite: {
11-
build: {
12-
minify: false
13-
}
14-
}
8+
})
159
}
1610
};
1711

‎packages/adapter-static/test/apps/spa/vite.config.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { sveltekit } from '@sveltejs/kit/vite';
2+
3+
/** @type {import('vite').UserConfig} */
4+
const config = {
5+
build: {
6+
minify: false
7+
},
8+
plugins: [sveltekit()]
9+
};
10+
11+
export default config;

‎packages/kit/test/apps/amp/svelte.config.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,7 @@ const config = {
88
hydrate: false
99
},
1010

11-
inlineStyleThreshold: Infinity,
12-
13-
vite: {
14-
server: {
15-
fs: {
16-
allow: [path.resolve('../../../src')]
17-
},
18-
19-
// TODO: required to support ipv6, remove on vite 3
20-
// https://github.com/vitejs/vite/issues/7075
21-
host: 'localhost'
22-
}
23-
}
11+
inlineStyleThreshold: Infinity
2412
}
2513
};
2614

‎packages/kit/test/apps/amp/vite.config.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import * as path from 'path';
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config = {
6+
plugins: [sveltekit()],
7+
server: {
8+
// TODO: required to support ipv6, remove on vite 3
9+
// https://github.com/vitejs/vite/issues/7075
10+
host: 'localhost',
11+
fs: {
12+
allow: [path.resolve('../../../src')]
13+
},
14+
// TODO: remove on vite 3
15+
// https://github.com/vitejs/vite/pull/8778
16+
watch: {
17+
// perf, do not watch playwright output dir
18+
ignored: ['**/test-results/**']
19+
}
20+
}
21+
};
22+
23+
export default config;

‎packages/kit/test/apps/basics/svelte.config.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,6 @@ const config = {
66
prerender: {
77
onError: 'continue'
88
},
9-
vite: {
10-
build: {
11-
minify: false
12-
},
13-
clearScreen: false,
14-
optimizeDeps: {
15-
// for CI, we need to explicitly prebundle deps, since
16-
// the reload confuses Playwright
17-
include: ['cookie', 'marked']
18-
},
19-
server: {
20-
// TODO: required to support ipv6, remove on vite 3
21-
// https://github.com/vitejs/vite/issues/7075
22-
host: 'localhost',
23-
fs: {
24-
allow: [path.resolve('../../../src')]
25-
}
26-
}
27-
},
289
methodOverride: {
2910
allowed: ['PUT', 'PATCH', 'DELETE']
3011
}

‎packages/kit/test/apps/basics/vite.config.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import * as path from 'path';
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config = {
6+
build: {
7+
minify: false
8+
},
9+
clearScreen: false,
10+
optimizeDeps: {
11+
// for CI, we need to explicitly prebundle deps, since
12+
// the reload confuses Playwright
13+
include: ['cookie', 'marked']
14+
},
15+
plugins: [sveltekit()],
16+
server: {
17+
// TODO: required to support ipv6, remove on vite 3
18+
// https://github.com/vitejs/vite/issues/7075
19+
host: 'localhost',
20+
fs: {
21+
allow: [path.resolve('../../../src')]
22+
},
23+
// TODO: remove on vite 3
24+
// https://github.com/vitejs/vite/pull/8778
25+
watch: {
26+
// perf, do not watch playwright output dir
27+
ignored: ['**/test-results/**']
28+
}
29+
}
30+
};
31+
32+
export default config;

‎packages/kit/test/apps/options-2/vite.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ const config = {
1010
host: 'localhost',
1111
fs: {
1212
allow: [path.resolve('../../../src')]
13+
},
14+
// TODO: remove on vite 3
15+
// https://github.com/vitejs/vite/pull/8778
16+
watch: {
17+
// perf, do not watch playwright output dir
18+
ignored: ['**/test-results/**']
1319
}
1420
}
1521
};

‎packages/kit/test/apps/options/svelte.config.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@ const config = {
2222
inlineStyleThreshold: 1024,
2323
outDir: '.custom-out-dir',
2424
trailingSlash: 'always',
25-
vite: {
26-
build: {
27-
minify: false
28-
},
29-
clearScreen: false,
30-
server: {
31-
// TODO: required to support ipv6, remove on vite 3
32-
// https://github.com/vitejs/vite/issues/7075
33-
host: 'localhost',
34-
fs: {
35-
allow: [path.resolve('../../../src')]
36-
}
37-
}
38-
},
3925
paths: {
4026
base: '/path-base',
4127
assets: 'https://cdn.example.com/stuff'

‎packages/kit/test/apps/options/vite.config.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import * as path from 'path';
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config = {
6+
build: {
7+
minify: false
8+
},
9+
clearScreen: false,
10+
plugins: [sveltekit()],
11+
server: {
12+
// TODO: required to support ipv6, remove on vite 3
13+
// https://github.com/vitejs/vite/issues/7075
14+
host: 'localhost',
15+
fs: {
16+
allow: [path.resolve('../../../src')]
17+
},
18+
// TODO: remove on vite 3
19+
// https://github.com/vitejs/vite/pull/8778
20+
watch: {
21+
// perf, do not watch playwright output dir
22+
ignored: ['**/test-results/**']
23+
}
24+
}
25+
};
26+
27+
export default config;

‎packages/kit/test/prerendering/basics/svelte.config.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ const config = {
99
prerender: {
1010
default: true,
1111
onError: 'continue'
12-
},
13-
14-
vite: {
15-
build: {
16-
minify: false
17-
},
18-
clearScreen: false,
19-
server: {
20-
fs: {
21-
allow: [path.resolve('../../../src')]
22-
}
23-
}
2412
}
2513
}
2614
};

‎packages/kit/test/prerendering/basics/vite.config.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import * as path from 'path';
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config = {
6+
build: {
7+
minify: false
8+
},
9+
clearScreen: false,
10+
plugins: [sveltekit()],
11+
server: {
12+
// TODO: required to support ipv6, remove on vite 3
13+
// https://github.com/vitejs/vite/issues/7075
14+
host: 'localhost',
15+
fs: {
16+
allow: [path.resolve('../../../src')]
17+
},
18+
// TODO: remove on vite 3
19+
// https://github.com/vitejs/vite/pull/8778
20+
watch: {
21+
// perf, do not watch playwright output dir
22+
ignored: ['**/test-results/**']
23+
}
24+
}
25+
};
26+
27+
export default config;

‎packages/kit/test/prerendering/disabled/svelte.config.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ const config = {
88

99
prerender: {
1010
enabled: false
11-
},
12-
13-
vite: {
14-
build: {
15-
minify: false
16-
},
17-
clearScreen: false,
18-
server: {
19-
fs: {
20-
allow: [path.resolve('../../../src')]
21-
}
22-
}
2311
}
2412
}
2513
};

‎packages/kit/test/prerendering/disabled/vite.config.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import * as path from 'path';
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config = {
6+
build: {
7+
minify: false
8+
},
9+
clearScreen: false,
10+
plugins: [sveltekit()],
11+
server: {
12+
// TODO: required to support ipv6, remove on vite 3
13+
// https://github.com/vitejs/vite/issues/7075
14+
host: 'localhost',
15+
fs: {
16+
allow: [path.resolve('../../../src')]
17+
},
18+
// TODO: remove on vite 3
19+
// https://github.com/vitejs/vite/pull/8778
20+
watch: {
21+
// perf, do not watch playwright output dir
22+
ignored: ['**/test-results/**']
23+
}
24+
}
25+
};
26+
27+
export default config;

‎packages/kit/test/prerendering/options/svelte.config.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,7 @@ const config = {
2727
default: true
2828
},
2929

30-
trailingSlash: 'always',
31-
32-
vite: {
33-
build: {
34-
minify: false
35-
},
36-
clearScreen: false,
37-
server: {
38-
fs: {
39-
allow: [path.resolve('../../../src')]
40-
}
41-
}
42-
}
30+
trailingSlash: 'always'
4331
}
4432
};
4533

‎packages/kit/test/prerendering/options/vite.config.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import * as path from 'path';
2+
import { sveltekit } from '@sveltejs/kit/vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config = {
6+
build: {
7+
minify: false
8+
},
9+
clearScreen: false,
10+
plugins: [sveltekit()],
11+
server: {
12+
// TODO: required to support ipv6, remove on vite 3
13+
// https://github.com/vitejs/vite/issues/7075
14+
host: 'localhost',
15+
fs: {
16+
allow: [path.resolve('../../../src')]
17+
},
18+
// TODO: remove on vite 3
19+
// https://github.com/vitejs/vite/pull/8778
20+
watch: {
21+
// perf, do not watch playwright output dir
22+
ignored: ['**/test-results/**']
23+
}
24+
}
25+
};
26+
27+
export default config;

‎packages/kit/test/prerendering/paths-base/svelte.config.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@ const config = {
1212

1313
prerender: {
1414
default: true
15-
},
16-
17-
vite: {
18-
build: {
19-
minify: false
20-
},
21-
clearScreen: false,
22-
server: {
23-
fs: {
24-
allow: [path.resolve('../../../src')]
25-
}
26-
}
2715
}
2816
}
2917
};

0 commit comments

Comments
 (0)