Upgrade to Vite 4

benmccann · benmccann · commit e373b68104ba · 2022-11-22T14:24:09.000-08:00
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
 		"@svitejs/changesets-changelog-github-compact": "^0.1.1",
 		"playwright": "1.25.0",
 		"prettier": "^2.7.1",
-		"rollup": "^2.79.1",
+		"rollup": "^3.4.0",
 		"svelte": "^3.52.0",
 		"tiny-glob": "^0.2.9",
 		"turbo": "^1.6.1",
diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -31,7 +31,7 @@
 	"dependencies": {
 		"@cloudflare/workers-types": "^4.0.0",
 		"@iarna/toml": "^2.2.5",
-		"esbuild": "^0.15.12"
+		"esbuild": "^0.15.15"
 	},
 	"devDependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json
@@ -33,7 +33,7 @@
 	},
 	"dependencies": {
 		"@cloudflare/workers-types": "^4.0.0",
-		"esbuild": "^0.15.12",
+		"esbuild": "^0.15.15",
 		"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.15.12",
+		"esbuild": "^0.15.15",
 		"set-cookie-parser": "^2.5.1"
 	},
 	"devDependencies": {
@@ -45,7 +45,7 @@
 		"@types/node": "^16.11.68",
 		"@types/set-cookie-parser": "^2.4.2",
 		"rimraf": "^3.0.2",
-		"rollup": "^2.79.1",
+		"rollup": "^3.4.0",
 		"typescript": "^4.8.4",
 		"uvu": "^0.5.6"
 	}
diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json
@@ -45,6 +45,6 @@
 		"@rollup/plugin-commonjs": "^23.0.2",
 		"@rollup/plugin-json": "^5.0.1",
 		"@rollup/plugin-node-resolve": "^15.0.1",
-		"rollup": "^2.79.1"
+		"rollup": "^3.4.0"
 	}
 }
diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
@@ -31,6 +31,6 @@
 		"svelte": "^3.52.0",
 		"typescript": "^4.8.4",
 		"uvu": "^0.5.6",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	}
 }
diff --git a/packages/adapter-static/test/apps/prerendered/package.json b/packages/adapter-static/test/apps/prerendered/package.json
@@ -10,7 +10,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.52.0",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/adapter-static/test/apps/spa/package.json b/packages/adapter-static/test/apps/spa/package.json
@@ -12,7 +12,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"sirv-cli": "^2.0.2",
 		"svelte": "^3.52.0",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -29,7 +29,7 @@
 	},
 	"dependencies": {
 		"@vercel/nft": "^0.22.1",
-		"esbuild": "^0.15.12"
+		"esbuild": "^0.15.15"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
diff --git a/packages/create-svelte/templates/default/package.json b/packages/create-svelte/templates/default/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.52.0",
 		"svelte-preprocess": "^4.10.7",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module",
 	"dependencies": {
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -32,12 +32,12 @@
 		"@types/sade": "^1.7.4",
 		"@types/set-cookie-parser": "^2.4.2",
 		"marked": "^4.2.2",
-		"rollup": "^2.79.1",
+		"rollup": "^3.4.0",
 		"svelte": "^3.52.0",
 		"svelte-preprocess": "^4.10.7",
 		"typescript": "^4.8.4",
 		"uvu": "^0.5.6",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"peerDependencies": {
 		"svelte": "^3.44.0",
diff --git a/packages/kit/src/exports/vite/dev/index.js b/packages/kit/src/exports/vite/dev/index.js
@@ -1,7 +1,6 @@
 import fs from 'fs';
 import colors from 'kleur';
 import path from 'path';
-import sirv from 'sirv';
 import { URL } from 'url';
 import { getRequest, setResponse } from '../../../exports/node/index.js';
 import { installPolyfills } from '../../../exports/node/polyfills.js';
@@ -230,44 +229,6 @@ export async function dev(vite, vite_config, svelte_config) {
 	});
 
 	const assets = svelte_config.kit.paths.assets ? SVELTE_KIT_ASSETS : svelte_config.kit.paths.base;
-	const asset_server = sirv(svelte_config.kit.files.assets, {
-		dev: true,
-		etag: true,
-		maxAge: 0,
-		extensions: [],
-		setHeaders: (res) => {
-			res.setHeader('access-control-allow-origin', '*');
-		}
-	});
-
-	vite.middlewares.use(async (req, res, next) => {
-		try {
-			const base = `${vite.config.server.https ? 'https' : 'http'}://${
-				req.headers[':authority'] || req.headers.host
-			}`;
-
-			const decoded = decodeURI(new URL(base + req.url).pathname);
-
-			if (decoded.startsWith(assets)) {
-				const pathname = decoded.slice(assets.length);
-				const file = svelte_config.kit.files.assets + pathname;
-
-				if (fs.existsSync(file) && !fs.statSync(file).isDirectory()) {
-					if (has_correct_case(file, svelte_config.kit.files.assets)) {
-						req.url = encodeURI(pathname); // don't need query/hash
-						asset_server(req, res);
-						return;
-					}
-				}
-			}
-
-			next();
-		} catch (e) {
-			const error = coalesce_to_error(e);
-			res.statusCode = 500;
-			res.end(fix_stack_trace(error));
-		}
-	});
 
 	// set `import { version } from '$app/environment'`
 	(await vite.ssrLoadModule(`${runtime_prefix}/env.js`)).set_version(
@@ -303,13 +264,6 @@ export async function dev(vite, vite_config, svelte_config) {
 					return;
 				}
 
-				if (!decoded.startsWith(svelte_config.kit.paths.base)) {
-					return not_found(
-						res,
-						`Not found (did you mean ${svelte_config.kit.paths.base + req.url}?)`
-					);
-				}
-
 				if (decoded === svelte_config.kit.paths.base + '/service-worker.js') {
 					const resolved = resolve_entry(svelte_config.kit.files.serviceWorker);
 
@@ -506,21 +460,11 @@ export async function dev(vite, vite_config, svelte_config) {
 	};
 }
 
-/** @param {import('http').ServerResponse} res */
-function not_found(res, message = 'Not found') {
-	res.statusCode = 404;
-	res.end(message);
-}
-
 /**
  * @param {import('connect').Server} server
  */
 function remove_static_middlewares(server) {
-	// We don't use viteServePublicMiddleware because of the following issues:
-	// https://github.com/vitejs/vite/issues/9260
-	// https://github.com/vitejs/vite/issues/9236
-	// https://github.com/vitejs/vite/issues/9234
-	const static_middlewares = ['viteServePublicMiddleware', 'viteServeStaticMiddleware'];
+	const static_middlewares = ['viteServeStaticMiddleware'];
 	for (let i = server.stack.length - 1; i > 0; i--) {
 		// @ts-expect-error using internals
 		if (static_middlewares.includes(server.stack[i].handle.name)) {
@@ -571,24 +515,3 @@ async function find_deps(vite, node, deps) {
 
 	await Promise.all(branches);
 }
-
-/**
- * Determine if a file is being requested with the correct case,
- * to ensure consistent behaviour between dev and prod and across
- * operating systems. Note that we can't use realpath here,
- * because we don't want to follow symlinks
- * @param {string} file
- * @param {string} assets
- * @returns {boolean}
- */
-function has_correct_case(file, assets) {
-	if (file === assets) return true;
-
-	const parent = path.dirname(file);
-
-	if (fs.readdirSync(parent).includes(path.basename(file))) {
-		return has_correct_case(parent, assets);
-	}
-
-	return false;
-}
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
@@ -240,7 +240,7 @@ function kit() {
 			/** @type {import('vite').UserConfig} */
 			const result = {
 				appType: 'custom',
-				base: './',
+				base: svelte_config.kit.paths.base,
 				build: {
 					rollupOptions: {
 						// Vite dependency crawler needs an explicit JS entry point
diff --git a/packages/kit/src/exports/vite/preview/index.js b/packages/kit/src/exports/vite/preview/index.js
@@ -73,7 +73,11 @@ export async function preview(vite, vite_config, svelte_config) {
 				next();
 			} else {
 				res.statusCode = 404;
-				res.end(`Not found (did you mean ${base + pathname}?)`);
+				res.end(
+					`The server is configured with a public base URL of ${base} - did you mean to visit <a href="${
+						base + pathname
+					}">${base + pathname}</a> instead?`
+				);
 			}
 		});
 
diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
@@ -19,7 +19,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
@@ -18,7 +18,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/dev-only/package.json b/packages/kit/test/apps/dev-only/package.json
@@ -16,7 +16,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json
@@ -18,7 +18,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json
@@ -17,7 +17,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/options/test/test.js b/packages/kit/test/apps/options/test/test.js
@@ -7,9 +7,11 @@ test.describe.configure({ mode: 'parallel' });
 
 test.describe('base path', () => {
 	test('serves a useful 404 when visiting unprefixed path', async ({ request }) => {
-		const response = await request.get('/');
+		const response = await request.get('/slash/', { headers: { Accept: 'text/html' } });
 		expect(response.status()).toBe(404);
-		expect(await response.text()).toBe('Not found (did you mean /path-base/?)');
+		expect(await response.text()).toBe(
+			'The server is configured with a public base URL of /path-base - did you mean to visit <a href="/path-base/slash/">/path-base/slash/</a> instead?'
+		);
 	});
 
 	test('serves /', async ({ page, javaScriptEnabled }) => {
diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json
@@ -18,7 +18,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json b/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json
@@ -9,12 +9,12 @@
 		"check": "svelte-kit sync && tsc && svelte-check"
 	},
 	"devDependencies": {
-		"@sveltejs/kit": "workspace:*",
 		"@sveltejs/adapter-auto": "workspace:*",
+		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
 		"typescript": "^4.8.2",
-		"vite": "^3.1.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json b/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json b/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env/package.json b/packages/kit/test/build-errors/apps/private-dynamic-env/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json b/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/private-static-env/package.json b/packages/kit/test/build-errors/apps/private-static-env/package.json
@@ -15,7 +15,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json b/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/server-only-folder/package.json b/packages/kit/test/build-errors/apps/server-only-folder/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.52.0",
 		"svelte-check": "^2.9.2",
 		"typescript": "^4.8.4",
-		"vite": "^3.2.1"
+		"vite": "^4.0.0-alpha.5"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json b/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json
diff --git a/packages/kit/test/build-errors/apps/server-only-module/package.json b/packages/kit/test/build-errors/apps/server-only-module/package.json
diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json
diff --git a/packages/kit/test/prerendering/fallback/package.json b/packages/kit/test/prerendering/fallback/package.json
diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json
diff --git a/packages/kit/test/prerendering/paths-base/package.json b/packages/kit/test/prerendering/paths-base/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sites/kit.svelte.dev/package.json b/sites/kit.svelte.dev/package.json

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@`
`45`	`45`	`"@rollup/plugin-commonjs": "^23.0.2",`
`46`	`46`	`"@rollup/plugin-json": "^5.0.1",`
`47`	`47`	`"@rollup/plugin-node-resolve": "^15.0.1",`
`48`		`- "rollup": "^2.79.1"`
	`48`	`+ "rollup": "^3.4.0"`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@`
`31`	`31`	`"svelte": "^3.52.0",`
`32`	`32`	`"typescript": "^4.8.4",`
`33`	`33`	`"uvu": "^0.5.6",`
`34`		`- "vite": "^3.2.1"`
	`34`	`+ "vite": "^4.0.0-alpha.5"`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"devDependencies": {`
`11`	`11`	`"@sveltejs/kit": "workspace:*",`
`12`	`12`	`"svelte": "^3.52.0",`
`13`		`- "vite": "^3.2.1"`
	`13`	`+ "vite": "^4.0.0-alpha.5"`
`14`	`14`	`},`
`15`	`15`	`"type": "module"`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"@sveltejs/kit": "workspace:*",`
`13`	`13`	`"sirv-cli": "^2.0.2",`
`14`	`14`	`"svelte": "^3.52.0",`
`15`		`- "vite": "^3.2.1"`
	`15`	`+ "vite": "^4.0.0-alpha.5"`
`16`	`16`	`},`
`17`	`17`	`"type": "module"`
`18`	`18`	`}`