Upgrade to Vite 3

package.json

@@ -43,7 +43,7 @@
 		"prettier": "^2.5.0",
 		"prettier-plugin-svelte": "^2.5.0",
 		"rimraf": "^3.0.2",
-		"rollup": "^2.60.2",
+		"rollup": "^2.74.1",
 		"sirv": "^2.0.0",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.5.0",

packages/adapter-cloudflare-workers/package.json

@@ -29,7 +29,7 @@
 	},
 	"dependencies": {
 		"@iarna/toml": "^2.2.5",
-		"esbuild": "^0.14.29"
+		"esbuild": "^0.14.39"
 	},
 	"devDependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0"

packages/adapter-cloudflare/package.json

@@ -31,7 +31,7 @@
 		"prepublishOnly": "npm run build"
 	},
 	"dependencies": {
-		"esbuild": "^0.14.29",
+		"esbuild": "^0.14.39",
 		"worktop": "0.8.0-next.14"
 	},
 	"devDependencies": {

packages/adapter-netlify/package.json

@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@iarna/toml": "^2.2.5",
-		"esbuild": "^0.14.29",
+		"esbuild": "^0.14.39",
 		"tiny-glob": "^0.2.9"
 	},
 	"devDependencies": {

packages/adapter-vercel/package.json

@@ -28,7 +28,7 @@
 		"check": "tsc"
 	},
 	"dependencies": {
-		"esbuild": "^0.14.29"
+		"esbuild": "^0.14.39"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*"

packages/kit/package.json

@@ -13,7 +13,7 @@
 		"@sveltejs/vite-plugin-svelte": "^1.0.0-next.44",
 		"chokidar": "^3.5.3",
 		"sade": "^1.7.4",
-		"vite": "^2.9.9"
+		"vite": "^3.0.0-alpha.2"
 	},
 	"devDependencies": {
 		"@types/connect": "^3.4.35",

packages/kit/src/core/build/build_server.js

@@ -209,8 +209,6 @@ export async function build_server(
 
 	/** @type {[any, string[]]} */
 	const [merged_config, conflicts] = deep_merge(modified_vite_config, {
-		configFile: false,
-		root: cwd,
 		base: assets_base,
 		build: {
 			ssr: true,
@@ -228,6 +226,7 @@ export async function build_server(
 				preserveEntrySignatures: 'strict'
 			}
 		},
+		configFile: false,
 		plugins: [
 			svelte({
 				...config,
@@ -240,7 +239,9 @@ export async function build_server(
 		],
 		resolve: {
 			alias: get_aliases(config)
-		}
+		},
+		root: cwd,
+		spa: false
 	});
 
 	print_config_conflicts(conflicts, 'kit.vite.', 'build_server');

packages/kit/src/core/dev/index.js

@@ -49,11 +49,8 @@ export async function dev({ cwd, port, host, https, config }) {
 
 	/** @type {[any, string[]]} */
 	const [merged_config, conflicts] = deep_merge(vite_config, {
+		base: '/',
 		configFile: false,
-		root: cwd,
-		resolve: {
-			alias: get_aliases(config)
-		},
 		build: {
 			rollupOptions: {
 				// Vite dependency crawler needs an explicit JS entry point
@@ -73,7 +70,11 @@ export async function dev({ cwd, port, host, https, config }) {
 			}),
 			await create_plugin(config, cwd)
 		],
-		base: '/'
+		resolve: {
+			alias: get_aliases(config)
+		},
+		root: cwd,
+		spa: false
 	});
 
 	print_config_conflicts(conflicts, 'kit.vite.');

packages/kit/src/core/dev/plugin.js

@@ -57,7 +57,7 @@ export async function create_plugin(config, cwd) {
 								const url = id.startsWith('..') ? `/@fs${path.posix.resolve(id)}` : `/${id}`;
 
 								const module = /** @type {import('types').SSRComponent} */ (
-									await vite.ssrLoadModule(url, { fixStacktrace: false })
+									await vite.ssrLoadModule(url)
 								);
 								const node = await vite.moduleGraph.getModuleByUrl(url);
 
@@ -78,7 +78,7 @@ export async function create_plugin(config, cwd) {
 										(query.has('svelte') && query.get('type') === 'style')
 									) {
 										try {
-											const mod = await vite.ssrLoadModule(dep.url, { fixStacktrace: false });
+											const mod = await vite.ssrLoadModule(dep.url);
 											styles[dep.url] = mod.default;
 										} catch {
 											// this can happen with dynamically imported modules, I think
@@ -111,7 +111,7 @@ export async function create_plugin(config, cwd) {
 									shadow: route.shadow
 										? async () => {
 												const url = path.resolve(cwd, /** @type {string} */ (route.shadow));
-												return await vite.ssrLoadModule(url, { fixStacktrace: false });
+												return await vite.ssrLoadModule(url);
 										  }
 										: null,
 									a: route.a.map((id) => (id ? manifest_data.components.indexOf(id) : undefined)),
@@ -127,7 +127,7 @@ export async function create_plugin(config, cwd) {
 								types,
 								load: async () => {
 									const url = path.resolve(cwd, route.file);
-									return await vite.ssrLoadModule(url, { fixStacktrace: false });
+									return await vite.ssrLoadModule(url);
 								}
 							};
 						}),
@@ -138,7 +138,7 @@ export async function create_plugin(config, cwd) {
 							for (const key in manifest_data.matchers) {
 								const file = manifest_data.matchers[key];
 								const url = path.resolve(cwd, file);
-								const module = await vite.ssrLoadModule(url, { fixStacktrace: false });
+								const module = await vite.ssrLoadModule(url);
 
 								if (module.match) {
 									matchers[key] = module.match;
@@ -208,7 +208,7 @@ export async function create_plugin(config, cwd) {
 
 						/** @type {Partial<import('types').Hooks>} */
 						const user_hooks = resolve_entry(config.kit.files.hooks)
-							? await vite.ssrLoadModule(`/${config.kit.files.hooks}`, { fixStacktrace: false })
+							? await vite.ssrLoadModule(`/${config.kit.files.hooks}`)
 							: {};
 
 						const handle = user_hooks.handle || (({ event, resolve }) => resolve(event));
@@ -371,12 +371,7 @@ function not_found(res, message = 'Not found') {
  * @param {import('connect').Server} server
  */
 function remove_html_middlewares(server) {
-	const html_middlewares = [
-		'viteIndexHtmlMiddleware',
-		'vite404Middleware',
-		'viteSpaFallbackMiddleware',
-		'viteServeStaticMiddleware'
-	];
+	const html_middlewares = ['viteServeStaticMiddleware'];
 	for (let i = server.stack.length - 1; i > 0; i--) {
 		// @ts-expect-error using internals until https://github.com/vitejs/vite/pull/4640 is merged
 		if (html_middlewares.includes(server.stack[i].handle.name)) {