fix: do not create unwanted record in history when redirecting after an invalidation

.changeset/spotty-lobsters-smell.md

@@ -0,0 +1,5 @@
+---
+"@sveltejs/kit": patch
+---
+
+fix: redirect loop after invalidate

packages/kit/src/runtime/client/client.js

@@ -332,7 +332,12 @@ async function _invalidate() {
 	if (!navigation_result || nav_token !== token) return;
 
 	if (navigation_result.type === 'redirect') {
-		return _goto(new URL(navigation_result.location, current.url).href, {}, 1, nav_token);
+		return _goto(
+			new URL(navigation_result.location, current.url).href,
+			{ replaceState: true },
+			1,
+			nav_token
+		);
 	}
 
 	if (navigation_result.props.page) {
@@ -1336,7 +1341,12 @@ async function navigate({
 				route: { id: null }
 			});
 		} else {
-			_goto(new URL(navigation_result.location, url).href, {}, redirect_count + 1, nav_token);
+			_goto(
+				new URL(navigation_result.location, url).href,
+				{ replaceState: replace_state },
+				redirect_count + 1,
+				nav_token
+			);
 			return false;
 		}
 	} else if (/** @type {number} */ (navigation_result.props.page.status) >= 400) {

packages/kit/test/apps/basics/src/routes/redirect/app-with-auth/+layout.server.js

@@ -0,0 +1,5 @@
+export async function load({ cookies }) {
+	return {
+		loggedIn: cookies.get('logged_in') === '1'
+	};
+}

packages/kit/test/apps/basics/src/routes/redirect/app-with-auth/+page.svelte

@@ -0,0 +1,2 @@
+<h1>App with authorization</h1>
+<a href="/redirect/app-with-auth/main" data-testid="enter"> enter </a>

packages/kit/test/apps/basics/src/routes/redirect/app-with-auth/main/+page.js

@@ -0,0 +1,10 @@
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ parent }) {
+	const { loggedIn } = await parent();
+	if (!loggedIn) {
+		redirect(302, '/redirect/app-with-auth/signin');
+	}
+
+	return {};
+}

packages/kit/test/apps/basics/src/routes/redirect/app-with-auth/main/+page.svelte

@@ -0,0 +1 @@
+<h1>main</h1>

packages/kit/test/apps/basics/src/routes/redirect/app-with-auth/signin/+page.js

@@ -0,0 +1,10 @@
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ parent }) {
+	const { loggedIn } = await parent();
+	if (loggedIn) {
+		redirect(302, '/redirect/app-with-auth/main');
+	}
+
+	return {};
+}

packages/kit/test/apps/basics/src/routes/redirect/app-with-auth/signin/+page.svelte

@@ -0,0 +1,11 @@
+<script>
+	import { invalidateAll } from '$app/navigation';
+
+	function login() {
+		document.cookie = 'logged_in=1;path=/redirect/app-with-auth';
+		invalidateAll();
+	}
+</script>
+
+<h1>signin</h1>
+<button on:click={login} data-testid="login"> login </button>

packages/kit/test/apps/basics/test/client.test.js

@@ -623,6 +623,21 @@
 		expect(next_layout_2).toBe(next_layout_1);
 		expect(next_page_2).not.toBe(next_page_1);
 	});
+
+	test('does not create new records in history for intermediate redirects', async ({
+		page,
+		clicknav
+	}) => {
+		await page.goto('/redirect/app-with-auth');
+		await clicknav("a[data-testid='enter']");
+		expect(await page.textContent('h1')).toContain('signin');
+
+		await clicknav("button[data-testid='login']");
+		expect(await page.textContent('h1')).toContain('main');
+
+		await page.evaluate(() => window.history.back());
+		expect(await page.textContent('h1')).toContain('App with authorization');
+	});
 });
 
 test.describe('data-sveltekit attributes', () => {
@@ -954,7 +969,7 @@
 			expect(page.locator('p.loadingfail')).toBeHidden();
 		});
 
 		test('Catches fetch errors from server load functions (direct hit)', async ({ page }) => {
 			page.goto('/streaming/server-error');
 			await expect(page.locator('p.eager')).toHaveText('eager');
 			await expect(page.locator('p.fail')).toHaveText('fail');