Upgrade to Vite 3

sveltejs · May 23, 2022 · 5bb56ce · 5bb56ce
1 parent 4f3b1db
commit 5bb56ce
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 125 deletions.
diff --git a/package.json b/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",

diff --git a/packages/adapter-cloudflare-workers/package.json b/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"

diff --git a/packages/adapter-cloudflare/package.json b/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": {

diff --git a/packages/adapter-netlify/package.json b/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": {

diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -28,7 +28,7 @@
 		"check": "tsc"
 	},
 	"dependencies": {
-		"esbuild": "^0.14.29"
+		"esbuild": "^0.14.39"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*"

diff --git a/packages/kit/package.json b/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",

diff --git a/packages/kit/src/core/build/build_service_worker.js b/packages/kit/src/core/build/build_service_worker.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')}
 			];

diff --git a/packages/kit/src/core/dev/index.js b/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.');

diff --git a/packages/kit/src/core/dev/plugin.js b/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--) {