update site and tests to use vite.config.js

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

@@ -7,12 +7,6 @@ const config = {
 
 		prerender: {
 			default: true
-		},
-
-		vite: {
-			build: {
-				minify: false
-			}
 		}
 	}
 };

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

@@ -0,0 +1,12 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	plugins: [sveltekit()]
+};
+
+export default config;

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

@@ -5,13 +5,7 @@ const config = {
 	kit: {
 		adapter: adapter({
 			fallback: '200.html'
-		}),
-
-		vite: {
-			build: {
-				minify: false
-			}
-		}
+		})
 	}
 };
 

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

@@ -0,0 +1,12 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	plugins: [sveltekit()]
+};
+
+export default config;

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

@@ -8,19 +8,7 @@ const config = {
 			hydrate: false
 		},
 
-		inlineStyleThreshold: Infinity,
-
-		vite: {
-			server: {
-				fs: {
-					allow: [path.resolve('../../../src')]
-				},
-
-				// TODO: required to support ipv6, remove on vite 3
-				// https://github.com/vitejs/vite/issues/7075
-				host: 'localhost'
-			}
-		}
+		inlineStyleThreshold: Infinity
 	}
 };
 

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

@@ -0,0 +1,23 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	plugins: [sveltekit()],
+	server: {
+		// TODO: required to support ipv6, remove on vite 3
+		// https://github.com/vitejs/vite/issues/7075
+		host: 'localhost',
+		fs: {
+			allow: [path.resolve('../../../src')]
+		},
+		// TODO: remove on vite 3
+		// https://github.com/vitejs/vite/pull/8778
+		watch: {
+			// perf, do not watch playwright output dir
+			ignored: ['**/test-results/**']
+		}
+	}
+};
+
+export default config;

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

@@ -6,25 +6,6 @@ const config = {
 		prerender: {
 			onError: 'continue'
 		},
-		vite: {
-			build: {
-				minify: false
-			},
-			clearScreen: false,
-			optimizeDeps: {
-				// for CI, we need to explicitly prebundle deps, since
-				// the reload confuses Playwright
-				include: ['cookie', 'marked']
-			},
-			server: {
-				// TODO: required to support ipv6, remove on vite 3
-				// https://github.com/vitejs/vite/issues/7075
-				host: 'localhost',
-				fs: {
-					allow: [path.resolve('../../../src')]
-				}
-			}
-		},
 		methodOverride: {
 			allowed: ['PUT', 'PATCH', 'DELETE']
 		}

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

@@ -0,0 +1,32 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	clearScreen: false,
+	optimizeDeps: {
+		// for CI, we need to explicitly prebundle deps, since
+		// the reload confuses Playwright
+		include: ['cookie', 'marked']
+	},
+	plugins: [sveltekit()],
+	server: {
+		// TODO: required to support ipv6, remove on vite 3
+		// https://github.com/vitejs/vite/issues/7075
+		host: 'localhost',
+		fs: {
+			allow: [path.resolve('../../../src')]
+		},
+		// TODO: remove on vite 3
+		// https://github.com/vitejs/vite/pull/8778
+		watch: {
+			// perf, do not watch playwright output dir
+			ignored: ['**/test-results/**']
+		}
+	}
+};
+
+export default config;

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

@@ -10,6 +10,12 @@ const config = {
 		host: 'localhost',
 		fs: {
 			allow: [path.resolve('../../../src')]
+		},
+		// TODO: remove on vite 3
+		// https://github.com/vitejs/vite/pull/8778
+		watch: {
+			// perf, do not watch playwright output dir
+			ignored: ['**/test-results/**']
 		}
 	}
 };

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

@@ -22,20 +22,6 @@ const config = {
 		inlineStyleThreshold: 1024,
 		outDir: '.custom-out-dir',
 		trailingSlash: 'always',
-		vite: {
-			build: {
-				minify: false
-			},
-			clearScreen: false,
-			server: {
-				// TODO: required to support ipv6, remove on vite 3
-				// https://github.com/vitejs/vite/issues/7075
-				host: 'localhost',
-				fs: {
-					allow: [path.resolve('../../../src')]
-				}
-			}
-		},
 		paths: {
 			base: '/path-base',
 			assets: 'https://cdn.example.com/stuff'

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

@@ -0,0 +1,27 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	clearScreen: false,
+	plugins: [sveltekit()],
+	server: {
+		// TODO: required to support ipv6, remove on vite 3
+		// https://github.com/vitejs/vite/issues/7075
+		host: 'localhost',
+		fs: {
+			allow: [path.resolve('../../../src')]
+		},
+		// TODO: remove on vite 3
+		// https://github.com/vitejs/vite/pull/8778
+		watch: {
+			// perf, do not watch playwright output dir
+			ignored: ['**/test-results/**']
+		}
+	}
+};
+
+export default config;

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

@@ -9,18 +9,6 @@ const config = {
 		prerender: {
 			default: true,
 			onError: 'continue'
-		},
-
-		vite: {
-			build: {
-				minify: false
-			},
-			clearScreen: false,
-			server: {
-				fs: {
-					allow: [path.resolve('../../../src')]
-				}
-			}
 		}
 	}
 };

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

@@ -0,0 +1,27 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	clearScreen: false,
+	plugins: [sveltekit()],
+	server: {
+		// TODO: required to support ipv6, remove on vite 3
+		// https://github.com/vitejs/vite/issues/7075
+		host: 'localhost',
+		fs: {
+			allow: [path.resolve('../../../src')]
+		},
+		// TODO: remove on vite 3
+		// https://github.com/vitejs/vite/pull/8778
+		watch: {
+			// perf, do not watch playwright output dir
+			ignored: ['**/test-results/**']
+		}
+	}
+};
+
+export default config;

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

@@ -8,18 +8,6 @@ const config = {
 
 		prerender: {
 			enabled: false
-		},
-
-		vite: {
-			build: {
-				minify: false
-			},
-			clearScreen: false,
-			server: {
-				fs: {
-					allow: [path.resolve('../../../src')]
-				}
-			}
 		}
 	}
 };

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

@@ -0,0 +1,27 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	clearScreen: false,
+	plugins: [sveltekit()],
+	server: {
+		// TODO: required to support ipv6, remove on vite 3
+		// https://github.com/vitejs/vite/issues/7075
+		host: 'localhost',
+		fs: {
+			allow: [path.resolve('../../../src')]
+		},
+		// TODO: remove on vite 3
+		// https://github.com/vitejs/vite/pull/8778
+		watch: {
+			// perf, do not watch playwright output dir
+			ignored: ['**/test-results/**']
+		}
+	}
+};
+
+export default config;

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

@@ -27,19 +27,7 @@ const config = {
 			default: true
 		},
 
-		trailingSlash: 'always',
-
-		vite: {
-			build: {
-				minify: false
-			},
-			clearScreen: false,
-			server: {
-				fs: {
-					allow: [path.resolve('../../../src')]
-				}
-			}
-		}
+		trailingSlash: 'always'
 	}
 };
 

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

@@ -0,0 +1,27 @@
+import * as path from 'path';
+import { sveltekit } from '@sveltejs/kit/vite';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	clearScreen: false,
+	plugins: [sveltekit()],
+	server: {
+		// TODO: required to support ipv6, remove on vite 3
+		// https://github.com/vitejs/vite/issues/7075
+		host: 'localhost',
+		fs: {
+			allow: [path.resolve('../../../src')]
+		},
+		// TODO: remove on vite 3
+		// https://github.com/vitejs/vite/pull/8778
+		watch: {
+			// perf, do not watch playwright output dir
+			ignored: ['**/test-results/**']
+		}
+	}
+};
+
+export default config;

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

@@ -12,18 +12,6 @@ const config = {
 
 		prerender: {
 			default: true
-		},
-
-		vite: {
-			build: {
-				minify: false
-			},
-			clearScreen: false,
-			server: {
-				fs: {
-					allow: [path.resolve('../../../src')]
-				}
-			}
 		}
 	}
 };