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_service_worker.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import vite from 'vite';
+import { build } from 'vite';
 import { s } from '../../utils/misc.js';
 import { deep_merge } from '../../utils/object.js';
 import { normalize_path } from '../../utils/url.js';
@@ -22,12 +22,12 @@ export async function build_service_worker(
 	prerendered,
 	client_manifest
 ) {
-	const build = new Set();
+	const build_files = new Set();
 	for (const key in client_manifest) {
 		const { file, css = [], assets = [] } = client_manifest[key];
-		build.add(file);
-		css.forEach((file) => build.add(file));
-		assets.forEach((file) => build.add(file));
+		build_files.add(file);
+		css.forEach((file) => build_files.add(file));
+		assets.forEach((file) => build_files.add(file));
 	}
 
 	const service_worker = `${config.kit.outDir}/generated/service-worker.js`;
@@ -43,7 +43,7 @@ export async function build_service_worker(
 			};
 
 			export const build = [
-				${Array.from(build)
+				${Array.from(build_files)
 					.map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/${file}`)}`)
 					.join(',\n\t\t\t\t')}
 			];
@@ -96,5 +96,5 @@ export async function build_service_worker(
 
 	print_config_conflicts(conflicts, 'kit.vite.', 'build_service_worker');
 
-	await vite.build(merged_config);
+	await build(merged_config);
 }

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

@@ -1,4 +1,4 @@
-import vite from 'vite';
+import { build } from 'vite';
 
 /**
  * @typedef {import('rollup').RollupOutput} RollupOutput
@@ -8,7 +8,7 @@ import vite from 'vite';
 
 /** @param {import('vite').UserConfig} config */
 export async function create_build(config) {
-	const { output } = /** @type {RollupOutput} */ (await vite.build(config));
+	const { output } = /** @type {RollupOutput} */ (await build(config));
 
 	const chunks = output.filter(
 		/** @returns {output is OutputChunk} */ (output) => output.type === 'chunk'

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

@@ -1,6 +1,6 @@
 import path from 'path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
-import vite from 'vite';
+import { createServer, searchForWorkspaceRoot } from 'vite';
 import { deep_merge } from '../../utils/object.js';
 import { print_config_conflicts } from '../config/index.js';
 import { get_aliases, get_runtime_path } from '../utils.js';
@@ -33,7 +33,7 @@ export async function dev({ cwd, port, host, https, config }) {
 							config.kit.outDir,
 							path.resolve(cwd, 'src'),
 							path.resolve(cwd, 'node_modules'),
-							path.resolve(vite.searchForWorkspaceRoot(cwd), 'node_modules')
+							path.resolve(searchForWorkspaceRoot(cwd), 'node_modules')
 						])
 					]
 				},
@@ -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.');
@@ -94,7 +95,7 @@ export async function dev({ cwd, port, host, https, config }) {
 		merged_config.server.port = port;
 	}
 
-	const server = await vite.createServer(merged_config);
+	const server = await createServer(merged_config);
 	await server.listen(port);
 
 	const address_info = /** @type {import('net').AddressInfo} */ (

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

@@ -372,9 +372,6 @@ function not_found(res, message = 'Not found') {
  */
 function remove_html_middlewares(server) {
 	const html_middlewares = [
-		'viteIndexHtmlMiddleware',
-		'vite404Middleware',
-		'viteSpaFallbackMiddleware',
 		'viteServeStaticMiddleware'
 	];
 	for (let i = server.stack.length - 1; i > 0; i--) {