fix: popstate navigations take pushState navigations into account (…

…#11765)

Fixes #11523

.changeset/stale-games-shake.md

@@ -0,0 +1,5 @@
+---
+"@sveltejs/kit": patch
+---
+
+fix: `popstate` navigations take `pushState` navigations into account

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

@@ -1818,6 +1818,7 @@ export function pushState(url, state) {
 	};
 
 	history.pushState(opts, '', resolve_url(url));
+	has_navigated = true;
 
 	page = { ...page, state };
 	root.$set({ page });

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

@@ -989,6 +989,17 @@ test.describe('Shallow routing', () => {
 		await expect(page.locator('span')).not.toHaveText(now);
 	});
 
+	test('Does not navigate when going back to shallow route', async ({ baseURL, page }) => {
+		await page.goto('/shallow-routing/push-state');
+		await page.locator('[data-id="two"]').click();
+		await page.goBack();
+		await page.goForward();
+
+		expect(page.url()).toBe(`${baseURL}/shallow-routing/push-state/a`);
+		await expect(page.locator('h1')).toHaveText('parent');
+		await expect(page.locator('p')).toHaveText('active: true');
+	});
+
 	test('Replaces state on the current URL', async ({ baseURL, page, clicknav }) => {
 		await page.goto('/shallow-routing/replace-state/b');
 		await clicknav('[href="/shallow-routing/replace-state"]');