From f0a5e41da2ed63f5be8386eb74f66e789ca57ebf Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Tue, 28 Mar 2023 17:52:26 +0100
Subject: [PATCH 01/10] Updating page store in case of hash change

---
 packages/kit/src/runtime/client/client.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
index a049d2d3eeaf..c927c09644b4 100644
--- a/packages/kit/src/runtime/client/client.js
+++ b/packages/kit/src/runtime/client/client.js
@@ -1700,6 +1700,16 @@ export function create_client(app, target) {
 						'',
 						location.href
 					);
+				} else {
+					// In the occasion of the hash being updated directly through
+					// the browser's address bar, the page store needs to be
+					// updated
+					const url = new URL(location.href, document.baseURI);
+
+					current.url = url;
+
+					stores.page.set({ ...page, url });
+					stores.page.notify();
 				}
 			});
 

From 065f77e94ae440fdb00bc96265e3d0952c860001 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Tue, 28 Mar 2023 17:56:16 +0100
Subject: [PATCH 02/10] Verifying hash change results in store update

---
 .../src/routes/store/data/+layout.svelte      |  1 +
 packages/kit/test/apps/basics/test/test.js    | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte b/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte
index 1ad81a9ca762..74fe6039bd36 100644
--- a/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte
+++ b/packages/kit/test/apps/basics/src/routes/store/data/+layout.svelte
@@ -4,6 +4,7 @@
 
 <div id="store-data">{JSON.stringify($page.data)}</div>
 <div id="store-error">{$page.error?.message}</div>
+<div id="page-url">{$page.url}</div>
 
 <nav>
 	<a href="/store/data/xxx">xxx</a> <a href="/store/data/yyy">yyy</a>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 3e242b9e73d9..7fb168cf0d53 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -769,6 +769,28 @@ test.describe('$app/stores', () => {
 			expect(await page.textContent('#nav-status')).toBe('not currently navigating');
 		}
 	});
+
+	test("url's hash is updated when it is modified in the address bar", async ({ page, javaScriptEnabled }) => {
+		if (javaScriptEnabled) {
+			const baseUrl = '/store/data/www';
+			// Go to page where store data, as well as URL, are displayed
+			await page.goto(baseUrl);
+
+			// Change hash to #2 in address bar
+			await page.evaluate(() => {
+				history.pushState({}, '', '#2');
+			});
+
+			await page.waitForTimeout(500);
+
+			const url = await page.evaluate(() => {
+				const el = document.getElementById("page-url");
+				return el && el.textContent;
+			});
+
+			expect(url).toMatch(/#2$/);
+		}
+	});
 });
 
 test.describe('searchParams', () => {

From da02124ead8e0dbcdb37bb9fbabd6603380b4624 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Tue, 28 Mar 2023 18:08:39 +0100
Subject: [PATCH 03/10] Awaiting page reload

---
 packages/kit/test/apps/basics/test/test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 7fb168cf0d53..a687cc155ba8 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -781,6 +781,8 @@ test.describe('$app/stores', () => {
 				history.pushState({}, '', '#2');
 			});
 
+      await page.reload();
+
 			await page.waitForTimeout(500);
 
 			const url = await page.evaluate(() => {

From 1f5005a4d5bc9c2f66321c481e9daf345aae3865 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Tue, 28 Mar 2023 18:15:02 +0100
Subject: [PATCH 04/10] Running prettier

---
 packages/kit/test/apps/basics/test/test.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index a687cc155ba8..a6739e628b55 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -770,7 +770,10 @@ test.describe('$app/stores', () => {
 		}
 	});
 
-	test("url's hash is updated when it is modified in the address bar", async ({ page, javaScriptEnabled }) => {
+	test("url's hash is updated when it is modified in the address bar", async ({
+		page,
+		javaScriptEnabled
+	}) => {
 		if (javaScriptEnabled) {
 			const baseUrl = '/store/data/www';
 			// Go to page where store data, as well as URL, are displayed
@@ -781,12 +784,12 @@ test.describe('$app/stores', () => {
 				history.pushState({}, '', '#2');
 			});
 
-      await page.reload();
+			await page.reload();
 
 			await page.waitForTimeout(500);
 
 			const url = await page.evaluate(() => {
-				const el = document.getElementById("page-url");
+				const el = document.getElementById('page-url');
 				return el && el.textContent;
 			});
 

From e34d14acf15383487702c908563dabab0f65400d Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Tue, 28 Mar 2023 18:26:05 +0100
Subject: [PATCH 05/10] Adding changeset

---
 .changeset/long-monkeys-sniff.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/long-monkeys-sniff.md

diff --git a/.changeset/long-monkeys-sniff.md b/.changeset/long-monkeys-sniff.md
new file mode 100644
index 000000000000..a25f43cb1773
--- /dev/null
+++ b/.changeset/long-monkeys-sniff.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Enables $page.url updates when URL is changed directly in address bar

From 0e0b0e3a039b6a5e3e0beef91ad06ca3ebed8aa0 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Tue, 28 Mar 2023 18:53:22 +0100
Subject: [PATCH 06/10] New test attempt

---
 packages/kit/test/apps/basics/test/test.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index a6739e628b55..d4273db3c858 100644
--- a/packages/kit/test/apps/basics/test/test.js
+++ b/packages/kit/test/apps/basics/test/test.js
@@ -784,16 +784,9 @@ test.describe('$app/stores', () => {
 				history.pushState({}, '', '#2');
 			});
 
-			await page.reload();
-
-			await page.waitForTimeout(500);
-
-			const url = await page.evaluate(() => {
-				const el = document.getElementById('page-url');
-				return el && el.textContent;
+			expect(await page.locator('#page-url').textContent({ timeout: 5000 })).toMatch(/#2$/, {
+				timeout: 5000
 			});
-
-			expect(url).toMatch(/#2$/);
 		}
 	});
 });

From dff3330266490743c62df4a7ad01c934ca23bdf4 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Tue, 28 Mar 2023 18:54:49 +0100
Subject: [PATCH 07/10] Correcting changeset

---
 .changeset/great-kangaroos-train.md | 5 +++++
 .changeset/long-monkeys-sniff.md    | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/great-kangaroos-train.md
 delete mode 100644 .changeset/long-monkeys-sniff.md

diff --git a/.changeset/great-kangaroos-train.md b/.changeset/great-kangaroos-train.md
new file mode 100644
index 000000000000..59e0f61f04f6
--- /dev/null
+++ b/.changeset/great-kangaroos-train.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: Enables $page.url changes when URL is directly altered in address bar
diff --git a/.changeset/long-monkeys-sniff.md b/.changeset/long-monkeys-sniff.md
deleted file mode 100644
index a25f43cb1773..000000000000
--- a/.changeset/long-monkeys-sniff.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@sveltejs/kit': patch
----
-
-Enables $page.url updates when URL is changed directly in address bar

From c51b1875e644ad88ff3f52bf4c8074695aea1d73 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Sat, 1 Apr 2023 20:20:38 +0100
Subject: [PATCH 08/10] Update .changeset/great-kangaroos-train.md

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 .changeset/great-kangaroos-train.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/great-kangaroos-train.md b/.changeset/great-kangaroos-train.md
index 59e0f61f04f6..1d5d66c7936b 100644
--- a/.changeset/great-kangaroos-train.md
+++ b/.changeset/great-kangaroos-train.md
@@ -2,4 +2,4 @@
 '@sveltejs/kit': patch
 ---
 
-fix: Enables $page.url changes when URL is directly altered in address bar
+fix: update `$page.url` when URL hash is directly altered in address bar

From 9422a77ab41c0f559f455d57d352068d67033f23 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Sat, 1 Apr 2023 20:20:57 +0100
Subject: [PATCH 09/10] Update packages/kit/src/runtime/client/client.js

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/kit/src/runtime/client/client.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
index c927c09644b4..283948c8c5aa 100644
--- a/packages/kit/src/runtime/client/client.js
+++ b/packages/kit/src/runtime/client/client.js
@@ -1701,9 +1701,8 @@ export function create_client(app, target) {
 						location.href
 					);
 				} else {
-					// In the occasion of the hash being updated directly through
-					// the browser's address bar, the page store needs to be
-					// updated
+					// when the hash is updated directly through the browser's
+					// address bar, the page store needs to be updated
 					const url = new URL(location.href, document.baseURI);
 
 					current.url = url;

From 185e99f024fd12c9940f13612715814258f71395 Mon Sep 17 00:00:00 2001
From: GabrielBarbosaGV <gabrielbgasparv@gmail.com>
Date: Wed, 12 Apr 2023 18:03:37 +0100
Subject: [PATCH 10/10] Extracting function for URL update

---
 packages/kit/src/runtime/client/client.js | 26 ++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
index 283948c8c5aa..9b060a3ed6aa 100644
--- a/packages/kit/src/runtime/client/client.js
+++ b/packages/kit/src/runtime/client/client.js
@@ -1487,6 +1487,10 @@ export function create_client(app, target) {
 					callbacks.before_navigate.forEach((fn) => fn(navigation));
 				}
 
+				const url = new URL(location.href, document.baseURI);
+				update_url_and_page_store_notifying_with_url(url);
+
+
 				if (should_block) {
 					e.preventDefault();
 					e.returnValue = '';
@@ -1570,9 +1574,7 @@ export function create_client(app, target) {
 
 					update_scroll_positions(current_history_index);
 
-					current.url = url;
-					stores.page.set({ ...page, url });
-					stores.page.notify();
+					update_url_and_page_store_notifying_with_url(url);
 
 					return;
 				}
@@ -1700,15 +1702,6 @@ export function create_client(app, target) {
 						'',
 						location.href
 					);
-				} else {
-					// when the hash is updated directly through the browser's
-					// address bar, the page store needs to be updated
-					const url = new URL(location.href, document.baseURI);
-
-					current.url = url;
-
-					stores.page.set({ ...page, url });
-					stores.page.notify();
 				}
 			});
 
@@ -1728,6 +1721,15 @@ export function create_client(app, target) {
 					stores.navigating.set(null);
 				}
 			});
+
+			/**
+			* @param {URL} url
+			*/
+			function update_url_and_page_store_notifying_with_url(url) {
+				current.url = url;
+				stores.page.set({ ...page, url });
+				stores.page.notify();
+			}
 		},
 
 		_hydrate: async ({