fix: add more test cases and include additional check for base path fetch

Author: goulinkh

packages/kit/src/runtime/server/fetch.js

@@ -56,9 +56,10 @@ export function create_fetch({ event, options, manifest, state, get_cookie_heade
 				}
 
 				const decoded = decodeURIComponent(url.pathname);
+
 				if (
 					url.origin !== event.url.origin ||
-					(paths.base && !decoded.startsWith(`${paths.base}/`))
+					(paths.base && decoded !== paths.base && !decoded.startsWith(`${paths.base}/`))
 				) {
 					// Allow cookie passthrough for "credentials: same-origin" and "credentials: include"
 					// if SvelteKit is serving my.domain.com:

packages/kit/test/apps/options/source/pages/+server.js

@@ -0,0 +1,3 @@
+export function GET() {
+	return new Response('root');
+}

…outing/link-outside-base/+page.server.js …/fetch/link-outside-base/+page.server.jspackages/kit/test/apps/options/source/pages/routing/link-outside-base/+page.server.js renamed to packages/kit/test/apps/options/source/pages/fetch/link-outside-base/+page.server.js packages/kit/test/apps/options/source/pages/routing/link-outside-base/+page.server.js renamed to packages/kit/test/apps/options/source/pages/fetch/link-outside-base/+page.server.js

@@ -1,6 +1,7 @@
 export async function load({ fetch }) {
 	const response = await fetch('/not-base-path/');
 	return {
-		fetchUrl: response.url
+		fetchUrl: response.url,
+		fetchResponse: await response.text()
 	};
 }

packages/kit/test/apps/options/source/pages/fetch/link-outside-base/+page.svelte

@@ -0,0 +1,7 @@
+<script>
+	/** @type {import('./$types').PageProps} */
+	const { data } = $props();
+</script>
+
+<p data-testid="fetch-url">{data.fetchUrl}</p>
+<p data-testid="fetch-response">{data.fetchResponse}</p>

packages/kit/test/apps/options/source/pages/fetch/link-root/+page.server.js

@@ -0,0 +1,21 @@
+export async function load({ fetch }) {
+	// fetch to root with trailing slash
+	const response1 = await fetch('/');
+	// fetch to root without trailing slash
+	const response2 = await fetch('');
+	// fetch to root with custom base path with trailing slash
+	const response3 = await fetch('/path-base/');
+	// fetch to root with custom base path without trailing slash
+	const response4 = await fetch('/path-base');
+
+	return {
+		fetchUrl1: response1.url,
+		fetchUrl2: response2.url,
+		fetchUrl3: response3.url,
+		fetchUrl4: response4.url,
+		fetchResponse1: await response1.text(),
+		fetchResponse2: await response2.text(),
+		fetchResponse3: await response3.text(),
+		fetchRedirect4: response4.headers.get('location')
+	};
+}

packages/kit/test/apps/options/source/pages/fetch/link-root/+page.svelte

@@ -0,0 +1,29 @@
+<script>
+	/** @type {import('./$types').PageProps} */
+	const { data } = $props();
+</script>
+
+<h2>Fetch URLs</h2>
+
+<dl>
+	<dt>fetch1-url</dt>
+	<dd data-testid="fetch1-url">{data.fetchUrl1}</dd>
+	<dt>fetch2-url</dt>
+	<dd data-testid="fetch2-url">{data.fetchUrl2}</dd>
+	<dt>fetch3-url</dt>
+	<dd data-testid="fetch3-url">{data.fetchUrl3}</dd>
+	<dt>fetch4-url</dt>
+	<dd data-testid="fetch4-url">{data.fetchUrl4}</dd>
+</dl>
+
+<h2>Fetch Responses</h2>
+<dl>
+	<dt>fetch1-response</dt>
+	<dd data-testid="fetch1-response">{data.fetchResponse1}</dd>
+	<dt>fetch2-response</dt>
+	<dd data-testid="fetch2-response">{data.fetchResponse2}</dd>
+	<dt>fetch3-response</dt>
+	<dd data-testid="fetch3-response">{data.fetchResponse3}</dd>
+	<dt>fetch4-redirect</dt>
+	<dd data-testid="fetch4-redirect">{data.fetchRedirect4}</dd>
+</dl>

packages/kit/test/apps/options/source/pages/fetch/link-root/+server.js

@@ -0,0 +1,3 @@
+export function GET() {
+	return new Response('relative');
+}

packages/kit/test/apps/options/source/pages/routing/link-outside-base/+page.svelte

@@ -236,13 +236,6 @@ test.describe('Routing', () => {
 		await page.click('[href="/path-base/routing/link-outside-app-target/target/"]');
 		await expect(page.locator('h2')).toHaveText('target: 0');
 	});
-
-	test('fetch outside base path succeeds', async ({ page, baseURL }) => {
-		await page.goto('/path-base/routing/link-outside-base/');
-		expect(await page.locator('p[data-testid="fetch-url"]').textContent()).toContain(
-			`${baseURL}/not-base-path/`
-		);
-	});
 });
 
 test.describe('Async', () => {
@@ -265,4 +258,38 @@ test.describe('Async', () => {
 		await expect(page.locator('h1', { hasText: 'Page B' })).toBeVisible();
 		expect(logs).toEqual(['mounted', 'navigated']);
 	});
+
+	test.describe('Fetch', () => {
+		test('fetch outside base path succeeds', async ({ page, baseURL }) => {
+			await page.goto('/path-base/fetch/link-outside-base/');
+			expect(await page.locator('[data-testid="fetch-url"]').textContent()).toContain(
+				`${baseURL}/not-base-path/`
+			);
+			expect(await page.locator('[data-testid="fetch-response"]').textContent()).toContain(
+				'did you mean to visit'
+			);
+		});
+
+		test('fetch to root succeeds', async ({ page, baseURL }) => {
+			await page.goto('/path-base/fetch/link-root/');
+			// fetch to root with trailing slash
+			expect(await page.locator('[data-testid="fetch1-url"]').textContent()).toContain(
+				`${baseURL}/`
+			);
+			expect(await page.locator('[data-testid="fetch1-response"]').textContent()).toContain('root');
+			// fetch to root without trailing slash should be relative
+			expect(await page.locator('[data-testid="fetch2-url"]').textContent()).toBeFalsy();
+			expect(await page.locator('[data-testid="fetch2-response"]').textContent()).toBe('relative');
+
+			// fetch to root with custom base path with trailing slash
+			expect(await page.locator('[data-testid="fetch3-url"]').textContent()).toBeFalsy();
+			expect(await page.locator('[data-testid="fetch3-response"]').textContent()).toBe('root');
+
+			// fetch to root with custom base path without trailing slash
+			expect(await page.locator('[data-testid="fetch4-url"]').textContent()).toBeFalsy();
+			expect(await page.locator('[data-testid="fetch4-redirect"]').textContent()).toBe(
+				'/path-base/'
+			);
+		});
+	});
 });