[fix] set Vite base URL (#8046)

benmccann · web-flow · commit 5dc7f9f6a39e · 2022-12-10T11:57:29.000-08:00
diff --git a/.changeset/clever-ducks-wave.md b/.changeset/clever-ducks-wave.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[fix] set Vite base URL
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
@@ -253,7 +253,7 @@ function kit({ svelte_config }) {
 			/** @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/utils.js b/packages/kit/src/exports/vite/utils.js
@@ -173,8 +173,12 @@ export function not_found(req, res, base) {
 
 	if (type === 'text/html') {
 		res.setHeader('Content-Type', 'text/html');
-		res.end(`Not found (did you mean <a href="${prefixed}">${prefixed}</a>?)`);
+		res.end(
+			`The server is configured with a public base URL of /path-base - did you mean to visit <a href="${prefixed}">${prefixed}</a> instead?`
+		);
 	} else {
-		res.end(`Not found (did you mean ${prefixed}?)`);
+		res.end(
+			`The server is configured with a public base URL of /path-base - did you mean to visit ${prefixed} instead?`
+		);
 	}
 }
diff --git a/packages/kit/test/apps/options/source/template.html b/packages/kit/test/apps/options/source/template.html
@@ -9,6 +9,6 @@
 	<body>
 		<h1>I am in the template</h1>
 		<div>%sveltekit.body%</div>
-		<a href="/path-base/routing/link-outside-app-target/target">outside app target</a>
+		<a href="/path-base/routing/link-outside-app-target/target/">outside app target</a>
 	</body>
 </html>
diff --git a/packages/kit/test/apps/options/test/test.js b/packages/kit/test/apps/options/test/test.js
@@ -10,12 +10,14 @@ test.describe('base path', () => {
 		const html = await request.get('/slash/', { headers: { Accept: 'text/html' } });
 		expect(html.status()).toBe(404);
 		expect(await html.text()).toBe(
-			'Not found (did you mean <a href="/path-base/slash/">/path-base/slash/</a>?)'
+			'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?'
 		);
 
 		const plain = await request.get('/slash/');
 		expect(plain.status()).toBe(404);
-		expect(await plain.text()).toBe('Not found (did you mean /path-base/slash/?)');
+		expect(await plain.text()).toBe(
+			'The server is configured with a public base URL of /path-base - did you mean to visit /path-base/slash/ instead?'
+		);
 	});
 
 	test('serves /', async ({ page, javaScriptEnabled }) => {
@@ -248,9 +250,9 @@ test.describe('Vite options', () => {
 
 test.describe('Routing', () => {
 	test('ignores clicks outside the app target', async ({ page }) => {
-		await page.goto('/path-base/routing/link-outside-app-target/source');
+		await page.goto('/path-base/routing/link-outside-app-target/source/');
 
-		await page.click('[href="/path-base/routing/link-outside-app-target/target"]');
+		await page.click('[href="/path-base/routing/link-outside-app-target/target/"]');
 		await expect(page.locator('h2')).toHaveText('target: 0');
 	});
 });

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@sveltejs/kit': patch
 +---
++
 +[fix] set Vite base URL
Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,12 @@ export function not_found(req, res, base) {`
`173`	`173`
`174`	`174`	`if (type === 'text/html') {`
`175`	`175`	`res.setHeader('Content-Type', 'text/html');`
`176`		- res.end(`Not found (did you mean <a href="${prefixed}">${prefixed}</a>?)`);
	`176`	`+ res.end(`
	`177`	+ `The server is configured with a public base URL of /path-base - did you mean to visit <a href="${prefixed}">${prefixed}</a> instead?`
	`178`	`+ );`
`177`	`179`	`} else {`
`178`		- res.end(`Not found (did you mean ${prefixed}?)`);
	`180`	`+ res.end(`
	`181`	+ `The server is configured with a public base URL of /path-base - did you mean to visit ${prefixed} instead?`
	`182`	`+ );`
`179`	`183`	`}`
`180`	`184`	`}`