From 5272deceef420fa41a98e42ddfea58fd512ea701 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Thu, 12 Dec 2024 23:56:45 +0100
Subject: [PATCH 01/10] feat: add page-state migration

A simple, string-based migration for https://github.com/sveltejs/kit/pull/13140 (tested on that repo, zero false-positives, less than five false negatives)
---
 .changeset/polite-eyes-invent.md              |   5 +
 packages/migrate/README.md                    |   1 +
 .../migrate/migrations/page-state/index.js    | 119 ++++++++++++++++++
 .../migrate/migrations/page-state/migrate.js  |  74 +++++++++++
 .../migrations/page-state/migrate.spec.js     |  91 ++++++++++++++
 5 files changed, 290 insertions(+)
 create mode 100644 .changeset/polite-eyes-invent.md
 create mode 100644 packages/migrate/migrations/page-state/index.js
 create mode 100644 packages/migrate/migrations/page-state/migrate.js
 create mode 100644 packages/migrate/migrations/page-state/migrate.spec.js

diff --git a/.changeset/polite-eyes-invent.md b/.changeset/polite-eyes-invent.md
new file mode 100644
index 00000000..e9d7fa25
--- /dev/null
+++ b/.changeset/polite-eyes-invent.md
@@ -0,0 +1,5 @@
+---
+'svelte-migrate': minor
+---
+
+feat: add page-state migration
diff --git a/packages/migrate/README.md b/packages/migrate/README.md
index d6b7b677..794adf95 100644
--- a/packages/migrate/README.md
+++ b/packages/migrate/README.md
@@ -21,6 +21,7 @@ npx sv migrate [migration]
 | `sveltekit-2` | SvelteKit 1.0         | SvelteKit 2.0         | [Website](https://svelte.dev/docs/kit/migrating-to-sveltekit-2) |
 | `svelte-4`    | Svelte 3              | Svelte 4              | [Website](https://svelte.dev/docs/svelte/v4-migration-guide)    |
 | `svelte-5`    | Svelte 4              | Svelte 5              |                                                                 |
+| `page-state`  | `$app/stores`         | `$app/state`          |                                                                 |
 | `package`     | `@sveltejs/package@1` | `@sveltejs/package@2` | [#8922](https://github.com/sveltejs/kit/pull/8922)              |
 | `routes`      | SvelteKit pre-1.0     | SvelteKit 1.0         | [#5774](https://github.com/sveltejs/kit/discussions/5774)       |
 
diff --git a/packages/migrate/migrations/page-state/index.js b/packages/migrate/migrations/page-state/index.js
new file mode 100644
index 00000000..f496f5f0
--- /dev/null
+++ b/packages/migrate/migrations/page-state/index.js
@@ -0,0 +1,119 @@
+import colors from 'kleur';
+import fs from 'node:fs';
+import process from 'node:process';
+import prompts from 'prompts';
+import semver from 'semver';
+import glob from 'tiny-glob/sync.js';
+import { bail, check_git, update_svelte_file } from '../../utils.js';
+import { transform_svelte_code, update_pkg_json } from './migrate.js';
+
+export async function migrate() {
+	if (!fs.existsSync('package.json')) {
+		bail('Please re-run this script in a directory with a package.json');
+	}
+
+	const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+
+	const svelte_dep = pkg.devDependencies?.svelte ?? pkg.dependencies?.svelte;
+	if (svelte_dep && semver.validRange(svelte_dep) && semver.gtr('5.0.0', svelte_dep)) {
+		console.log(
+			colors
+				.bold()
+				.red('\nYou need to upgrade to Svelte version 5 first (`npx sv migrate svelte-5`).\n')
+		);
+		process.exit(1);
+	}
+
+	const kit_dep = pkg.devDependencies?.['@sveltejs/kit'] ?? pkg.dependencies?.['@sveltejs/kit'];
+	if (kit_dep && semver.validRange(kit_dep) && semver.gtr('2.0.0', kit_dep)) {
+		console.log(
+			colors
+				.bold()
+				.red('\nYou need to upgrade to SvelteKit version 2 first (`npx sv migrate sveltekit-2`).\n')
+		);
+		process.exit(1);
+	}
+
+	console.log(
+		colors
+			.bold()
+			.yellow(
+				'\nThis will update files in the current directory\n' +
+					"If you're inside a monorepo, don't run this in the root directory, rather run it in all projects independently.\n"
+			)
+	);
+
+	const use_git = check_git();
+
+	const response = await prompts({
+		type: 'confirm',
+		name: 'value',
+		message: 'Continue?',
+		initial: false
+	});
+
+	if (!response.value) {
+		process.exit(1);
+	}
+
+	const folders = await prompts({
+		type: 'multiselect',
+		name: 'value',
+		message: 'Which folders should be migrated?',
+		choices: fs
+			.readdirSync('.')
+			.filter(
+				(dir) => fs.statSync(dir).isDirectory() && dir !== 'node_modules' && !dir.startsWith('.')
+			)
+			.map((dir) => ({ title: dir, value: dir, selected: true }))
+	});
+
+	if (!folders.value?.length) {
+		process.exit(1);
+	}
+
+	update_pkg_json();
+
+	// For some reason {folders.value.join(',')} as part of the glob doesn't work and returns less files
+	const files = folders.value.flatMap(
+		/** @param {string} folder */ (folder) =>
+			glob(`${folder}/**`, { filesOnly: true, dot: true })
+				.map((file) => file.replace(/\\/g, '/'))
+				.filter(
+					(file) =>
+						!file.includes('/node_modules/') &&
+						// We're not transforming usage inside .ts/.js files since you can't use the $store syntax there,
+						// and therefore have to either subscribe or pass it along, which we can't auto-migrate
+						file.endsWith('.svelte')
+				)
+	);
+
+	for (const file of files) {
+		update_svelte_file(
+			file,
+			(code) => code,
+			(code) => transform_svelte_code(code, { filename: file })
+		);
+	}
+
+	console.log(colors.bold().green('✔ Your project has been migrated'));
+
+	console.log('\nRecommended next steps:\n');
+
+	const cyan = colors.bold().cyan;
+
+	const tasks = [
+		"install the updated dependencies ('npm i' / 'pnpm i' / etc) " + use_git &&
+			cyan('git commit -m "migration to $app/state"')
+	].filter(Boolean);
+
+	tasks.forEach((task, i) => {
+		console.log(`  ${i + 1}: ${task}`);
+	});
+
+	console.log('');
+
+	if (use_git) {
+		console.log(`Run ${cyan('git diff')} to review changes.\n`);
+	}
+}
diff --git a/packages/migrate/migrations/page-state/migrate.js b/packages/migrate/migrations/page-state/migrate.js
new file mode 100644
index 00000000..198a6807
--- /dev/null
+++ b/packages/migrate/migrations/page-state/migrate.js
@@ -0,0 +1,74 @@
+import fs from 'node:fs';
+import { update_pkg } from '../../utils.js';
+
+export function update_pkg_json() {
+	fs.writeFileSync(
+		'package.json',
+		update_pkg_json_content(fs.readFileSync('package.json', 'utf8'))
+	);
+}
+
+/**
+ * @param {string} content
+ */
+export function update_pkg_json_content(content) {
+	return update_pkg(content, [['@sveltejs/kit', '^2.12.0']]);
+}
+
+/**
+ * @param {string} code
+ * @param {{ filename?: string  }} options
+ */
+export function transform_svelte_code(code, options) {
+	// Quick check if nothing to do
+	if (!code.includes('$app/stores')) return code;
+
+	// Check if file is using legacy APIs - if so, we can't migrate since reactive statements would break
+	const lines = code.split('\n');
+	if (lines.some((line) => /^\s*(export let|\$:) /.test(line))) {
+		return code;
+	}
+
+	const import_match = code.match(/import\s*{([^}]+)}\s*from\s*("|')\$app\/stores\2/);
+	if (!import_match) return code; // nothing to do
+
+	const stores = import_match[1].split(',').map((i) => i.trim());
+	let modified = code.replace('$app/stores', '$app/state');
+
+	for (const store of stores) {
+		// if someone uses that they're deep into stores and we better not touch this file
+		if (store === 'getStores') return code;
+
+		const regex = new RegExp(`\\b${store}\\b`, 'g');
+		let match;
+		let count_removed = 0;
+
+		while ((match = regex.exec(modified)) !== null) {
+			const before = modified.slice(0, match.index);
+			const after = modified.slice(match.index + store.length);
+
+			if (before.slice(-1) !== '$') {
+				if (/[_'"]/.test(before.slice(-1))) continue; // false positive
+
+				if (store === 'updated' && after.startsWith('.check()')) {
+					continue; // this stays as is
+				}
+
+				if (
+					match.index - count_removed > /** @type {number} */ (import_match.index) &&
+					match.index - count_removed <
+						/** @type {number} */ (import_match.index) + import_match[0].length
+				) {
+					continue; // this is the import statement
+				}
+
+				return code;
+			}
+
+			modified = before.slice(0, -1) + store + (store === 'page' ? '' : '.current') + after;
+			count_removed++;
+		}
+	}
+
+	return modified;
+}
diff --git a/packages/migrate/migrations/page-state/migrate.spec.js b/packages/migrate/migrations/page-state/migrate.spec.js
new file mode 100644
index 00000000..589b9453
--- /dev/null
+++ b/packages/migrate/migrations/page-state/migrate.spec.js
@@ -0,0 +1,91 @@
+import { assert, test } from 'vitest';
+import { transform_svelte_code } from './migrate.js';
+
+test('Updates $app/store #1', () => {
+	const result = transform_svelte_code(
+		`<script>
+	import { page } from '$app/stores';
+</script>
+
+<div>{$page.url}</div>
+<button onclick={() => {
+	console.log($page.state);
+}}></button>
+`,
+		{}
+	);
+	assert.equal(
+		result,
+		`<script>
+	import { page } from '$app/state';
+</script>
+
+<div>{page.url}</div>
+<button onclick={() => {
+	console.log(page.state);
+}}></button>
+`
+	);
+});
+
+test('Updates $app/store #2', () => {
+	const result = transform_svelte_code(
+		`<script>
+	import { navigating, updated } from '$app/stores';
+	$updated;
+	updated.check();
+</script>
+
+is_navigating: {$navigating}
+`,
+		{}
+	);
+	assert.equal(
+		result,
+		`<script>
+	import { navigating, updated } from '$app/state';
+	updated.current;
+	updated.check();
+</script>
+
+is_navigating: {navigating.current}
+`
+	);
+});
+
+test('Does not update $app/store #1', () => {
+	const input = `<script>
+	import { page } from '$app/stores';
+	$: x = $page.url;
+</script>
+
+{x}
+`;
+	const result = transform_svelte_code(input, {});
+	assert.equal(result, input);
+});
+
+test('Does not update $app/store #2', () => {
+	const input = `<script>
+	import { page } from '$app/stores';
+	import { derived } from 'svelte/store';
+	const url = derived(page, ($page) => $page.url);
+</script>
+
+{$url}
+`;
+	const result = transform_svelte_code(input, {});
+	assert.equal(result, input);
+});
+
+test('Does not update $app/store #3', () => {
+	const input = `<script>
+	import { page, getStores } from '$app/stores';
+	const x = getStores();
+</script>
+
+{$page.url}
+`;
+	const result = transform_svelte_code(input, {});
+	assert.equal(result, input);
+});

From e892d77f6a548c81f7c4f121cb58432761bae559 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Fri, 13 Dec 2024 16:49:36 +0100
Subject: [PATCH 02/10] handle aliases

---
 .../migrate/migrations/page-state/migrate.js  | 14 ++++++++-----
 .../migrations/page-state/migrate.spec.js     | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/migrate/migrations/page-state/migrate.js b/packages/migrate/migrations/page-state/migrate.js
index 198a6807..af524b42 100644
--- a/packages/migrate/migrations/page-state/migrate.js
+++ b/packages/migrate/migrations/page-state/migrate.js
@@ -32,20 +32,24 @@ export function transform_svelte_code(code, options) {
 	const import_match = code.match(/import\s*{([^}]+)}\s*from\s*("|')\$app\/stores\2/);
 	if (!import_match) return code; // nothing to do
 
-	const stores = import_match[1].split(',').map((i) => i.trim());
+	const stores = import_match[1].split(',').map((i) => {
+		const str = i.trim();
+		const [name, alias] = str.split(' as ').map((s) => s.trim());
+		return [name, alias || name];
+	});
 	let modified = code.replace('$app/stores', '$app/state');
 
-	for (const store of stores) {
+	for (let [store, alias] of stores) {
 		// if someone uses that they're deep into stores and we better not touch this file
 		if (store === 'getStores') return code;
 
-		const regex = new RegExp(`\\b${store}\\b`, 'g');
+		const regex = new RegExp(`\\b${alias}\\b`, 'g');
 		let match;
 		let count_removed = 0;
 
 		while ((match = regex.exec(modified)) !== null) {
 			const before = modified.slice(0, match.index);
-			const after = modified.slice(match.index + store.length);
+			const after = modified.slice(match.index + alias.length);
 
 			if (before.slice(-1) !== '$') {
 				if (/[_'"]/.test(before.slice(-1))) continue; // false positive
@@ -65,7 +69,7 @@ export function transform_svelte_code(code, options) {
 				return code;
 			}
 
-			modified = before.slice(0, -1) + store + (store === 'page' ? '' : '.current') + after;
+			modified = before.slice(0, -1) + alias + (store === 'page' ? '' : '.current') + after;
 			count_removed++;
 		}
 	}
diff --git a/packages/migrate/migrations/page-state/migrate.spec.js b/packages/migrate/migrations/page-state/migrate.spec.js
index 589b9453..b085725e 100644
--- a/packages/migrate/migrations/page-state/migrate.spec.js
+++ b/packages/migrate/migrations/page-state/migrate.spec.js
@@ -53,6 +53,27 @@ is_navigating: {navigating.current}
 	);
 });
 
+test('Updates $app/store #3', () => {
+	const result = transform_svelte_code(
+		`<script>
+	import { page as _page } from '$app/stores';
+</script>
+
+{$_page.data}
+`,
+		{}
+	);
+	assert.equal(
+		result,
+		`<script>
+	import { page as _page } from '$app/state';
+</script>
+
+{_page.data}
+`
+	);
+});
+
 test('Does not update $app/store #1', () => {
 	const input = `<script>
 	import { page } from '$app/stores';

From 5d6f4fe4a7e5a71a3a38139f62641dc29272cd34 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sat, 14 Dec 2024 13:46:20 +0100
Subject: [PATCH 03/10] add migration to docs

---
 documentation/docs/20-commands/40-sv-migrate.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/documentation/docs/20-commands/40-sv-migrate.md b/documentation/docs/20-commands/40-sv-migrate.md
index 570072b5..7b55a693 100644
--- a/documentation/docs/20-commands/40-sv-migrate.md
+++ b/documentation/docs/20-commands/40-sv-migrate.md
@@ -14,6 +14,10 @@ npx sv migrate [migration]
 
 ## Migrations
 
+### `page-state`
+
+Migrates `$app/store` usage to `$app/state` in `.svelte` files. See the [pull request](https://github.com/sveltejs/kit/pull/13140) for more details.
+
 ### `svelte-5`
 
 Upgrades a Svelte 4 app to use Svelte 5, and updates individual components to use [runes](../svelte/what-are-runes) and other Svelte 5 syntax ([see migration guide](../svelte/v5-migration-guide)).

From 1a5124183638a13939bc87498536887754051dd5 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Sat, 14 Dec 2024 23:36:52 +0100
Subject: [PATCH 04/10] update link

---
 documentation/docs/20-commands/40-sv-migrate.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/20-commands/40-sv-migrate.md b/documentation/docs/20-commands/40-sv-migrate.md
index 7b55a693..8cfc31cc 100644
--- a/documentation/docs/20-commands/40-sv-migrate.md
+++ b/documentation/docs/20-commands/40-sv-migrate.md
@@ -16,7 +16,7 @@ npx sv migrate [migration]
 
 ### `page-state`
 
-Migrates `$app/store` usage to `$app/state` in `.svelte` files. See the [pull request](https://github.com/sveltejs/kit/pull/13140) for more details.
+Migrates `$app/store` usage to `$app/state` in `.svelte` files. See the [migration guide](/docs/kit/migrating-to-sveltekit-2#SvelteKit-2.12:-$app-stores-deprecated) for more details.
 
 ### `svelte-5`
 

From 10f1e0b95b5efeb04c389e80d729f5cf9257a4f2 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@vercel.com>
Date: Sat, 14 Dec 2024 23:38:21 +0100
Subject: [PATCH 05/10] lint

---
 packages/migrate/migrations/page-state/index.js   | 2 +-
 packages/migrate/migrations/page-state/migrate.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/migrate/migrations/page-state/index.js b/packages/migrate/migrations/page-state/index.js
index f496f5f0..8ba9a326 100644
--- a/packages/migrate/migrations/page-state/index.js
+++ b/packages/migrate/migrations/page-state/index.js
@@ -92,7 +92,7 @@ export async function migrate() {
 		update_svelte_file(
 			file,
 			(code) => code,
-			(code) => transform_svelte_code(code, { filename: file })
+			(code) => transform_svelte_code(code)
 		);
 	}
 
diff --git a/packages/migrate/migrations/page-state/migrate.js b/packages/migrate/migrations/page-state/migrate.js
index af524b42..e29213ee 100644
--- a/packages/migrate/migrations/page-state/migrate.js
+++ b/packages/migrate/migrations/page-state/migrate.js
@@ -17,9 +17,8 @@ export function update_pkg_json_content(content) {
 
 /**
  * @param {string} code
- * @param {{ filename?: string  }} options
  */
-export function transform_svelte_code(code, options) {
+export function transform_svelte_code(code) {
 	// Quick check if nothing to do
 	if (!code.includes('$app/stores')) return code;
 
@@ -39,7 +38,7 @@ export function transform_svelte_code(code, options) {
 	});
 	let modified = code.replace('$app/stores', '$app/state');
 
-	for (let [store, alias] of stores) {
+	for (const [store, alias] of stores) {
 		// if someone uses that they're deep into stores and we better not touch this file
 		if (store === 'getStores') return code;
 

From 4497308e8113e75ebbe9434977fdaecfcb25ce6e Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 16 Dec 2024 15:22:53 -0500
Subject: [PATCH 06/10] rename to app-state

---
 .changeset/polite-eyes-invent.md                | 2 +-
 documentation/docs/20-commands/40-sv-migrate.md | 2 +-
 packages/migrate/README.md                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.changeset/polite-eyes-invent.md b/.changeset/polite-eyes-invent.md
index e9d7fa25..024c7b59 100644
--- a/.changeset/polite-eyes-invent.md
+++ b/.changeset/polite-eyes-invent.md
@@ -2,4 +2,4 @@
 'svelte-migrate': minor
 ---
 
-feat: add page-state migration
+feat: add app-state migration
diff --git a/documentation/docs/20-commands/40-sv-migrate.md b/documentation/docs/20-commands/40-sv-migrate.md
index 8cfc31cc..4c236462 100644
--- a/documentation/docs/20-commands/40-sv-migrate.md
+++ b/documentation/docs/20-commands/40-sv-migrate.md
@@ -14,7 +14,7 @@ npx sv migrate [migration]
 
 ## Migrations
 
-### `page-state`
+### `app-state`
 
 Migrates `$app/store` usage to `$app/state` in `.svelte` files. See the [migration guide](/docs/kit/migrating-to-sveltekit-2#SvelteKit-2.12:-$app-stores-deprecated) for more details.
 
diff --git a/packages/migrate/README.md b/packages/migrate/README.md
index 856c0ca1..07ae73a9 100644
--- a/packages/migrate/README.md
+++ b/packages/migrate/README.md
@@ -18,7 +18,7 @@ npx sv migrate [migration]
 
 | Migration           | From                  | To                    | Guide                                                           |
 | ------------------- | --------------------- | --------------------- | --------------------------------------------------------------- |
-| `page-state`        | `$app/stores`         | `$app/state`          | [#13140](https://github.com/sveltejs/kit/pull/13140)            |
+| `app-state`         | `$app/stores`         | `$app/state`          | [#13140](https://github.com/sveltejs/kit/pull/13140)            |
 | `svelte-5`          | Svelte 4              | Svelte 5              | [Website](https://svelte.dev/docs/svelte/v5-migration-guide)    |
 | `self-closing-tags` | Svelte 4              | Svelte 4              | [#12128](https://github.com/sveltejs/kit/pull/12128)            |
 | `svelte-4`          | Svelte 3              | Svelte 4              | [Website](https://svelte.dev/docs/svelte/v4-migration-guide)    |

From 4d14334b640bece44be4e3a4fb1d7df552c7822b Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 16 Dec 2024 15:24:48 -0500
Subject: [PATCH 07/10] rename

---
 packages/migrate/migrations/{page-state => app-state}/index.js    | 0
 packages/migrate/migrations/{page-state => app-state}/migrate.js  | 0
 .../migrate/migrations/{page-state => app-state}/migrate.spec.js  | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/migrate/migrations/{page-state => app-state}/index.js (100%)
 rename packages/migrate/migrations/{page-state => app-state}/migrate.js (100%)
 rename packages/migrate/migrations/{page-state => app-state}/migrate.spec.js (100%)

diff --git a/packages/migrate/migrations/page-state/index.js b/packages/migrate/migrations/app-state/index.js
similarity index 100%
rename from packages/migrate/migrations/page-state/index.js
rename to packages/migrate/migrations/app-state/index.js
diff --git a/packages/migrate/migrations/page-state/migrate.js b/packages/migrate/migrations/app-state/migrate.js
similarity index 100%
rename from packages/migrate/migrations/page-state/migrate.js
rename to packages/migrate/migrations/app-state/migrate.js
diff --git a/packages/migrate/migrations/page-state/migrate.spec.js b/packages/migrate/migrations/app-state/migrate.spec.js
similarity index 100%
rename from packages/migrate/migrations/page-state/migrate.spec.js
rename to packages/migrate/migrations/app-state/migrate.spec.js

From 5c5129340440ba955f4879687d06029252796fd7 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 16 Dec 2024 15:31:56 -0500
Subject: [PATCH 08/10] remove .current from navigating references

---
 packages/migrate/migrations/app-state/migrate.js      | 2 +-
 packages/migrate/migrations/app-state/migrate.spec.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/migrate/migrations/app-state/migrate.js b/packages/migrate/migrations/app-state/migrate.js
index e29213ee..d48b4975 100644
--- a/packages/migrate/migrations/app-state/migrate.js
+++ b/packages/migrate/migrations/app-state/migrate.js
@@ -68,7 +68,7 @@ export function transform_svelte_code(code) {
 				return code;
 			}
 
-			modified = before.slice(0, -1) + alias + (store === 'page' ? '' : '.current') + after;
+			modified = before.slice(0, -1) + alias + (store === 'updated' ? '.current' : '') + after;
 			count_removed++;
 		}
 	}
diff --git a/packages/migrate/migrations/app-state/migrate.spec.js b/packages/migrate/migrations/app-state/migrate.spec.js
index b085725e..b65bfc6f 100644
--- a/packages/migrate/migrations/app-state/migrate.spec.js
+++ b/packages/migrate/migrations/app-state/migrate.spec.js
@@ -36,7 +36,7 @@ test('Updates $app/store #2', () => {
 	updated.check();
 </script>
 
-is_navigating: {$navigating}
+{$navigating?.to?.url.pathname}
 `,
 		{}
 	);
@@ -48,7 +48,7 @@ is_navigating: {$navigating}
 	updated.check();
 </script>
 
-is_navigating: {navigating.current}
+{navigating?.to?.url.pathname}
 `
 	);
 });

From 4d2e5dd419ab8543b8ffb10103eb692540725d93 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 16 Dec 2024 15:44:26 -0500
Subject: [PATCH 09/10] hopefully this will get it to shut up

---
 .../migrate/migrations/app-state/migrate.spec.js  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/migrate/migrations/app-state/migrate.spec.js b/packages/migrate/migrations/app-state/migrate.spec.js
index b65bfc6f..8c30416e 100644
--- a/packages/migrate/migrations/app-state/migrate.spec.js
+++ b/packages/migrate/migrations/app-state/migrate.spec.js
@@ -11,8 +11,7 @@ test('Updates $app/store #1', () => {
 <button onclick={() => {
 	console.log($page.state);
 }}></button>
-`,
-		{}
+`
 	);
 	assert.equal(
 		result,
@@ -37,8 +36,7 @@ test('Updates $app/store #2', () => {
 </script>
 
 {$navigating?.to?.url.pathname}
-`,
-		{}
+`
 	);
 	assert.equal(
 		result,
@@ -60,8 +58,7 @@ test('Updates $app/store #3', () => {
 </script>
 
 {$_page.data}
-`,
-		{}
+`
 	);
 	assert.equal(
 		result,
@@ -82,7 +79,7 @@ test('Does not update $app/store #1', () => {
 
 {x}
 `;
-	const result = transform_svelte_code(input, {});
+	const result = transform_svelte_code(input);
 	assert.equal(result, input);
 });
 
@@ -95,7 +92,7 @@ test('Does not update $app/store #2', () => {
 
 {$url}
 `;
-	const result = transform_svelte_code(input, {});
+	const result = transform_svelte_code(input);
 	assert.equal(result, input);
 });
 
@@ -107,6 +104,6 @@ test('Does not update $app/store #3', () => {
 
 {$page.url}
 `;
-	const result = transform_svelte_code(input, {});
+	const result = transform_svelte_code(input);
 	assert.equal(result, input);
 });

From 25a948b6a6336aba44e06bd28a9cb9c432af56c8 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 16 Dec 2024 16:12:48 -0500
Subject: [PATCH 10/10] add migration task

---
 packages/migrate/migrations/app-state/migrate.js      | 10 ++++++++++
 packages/migrate/migrations/app-state/migrate.spec.js |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/migrate/migrations/app-state/migrate.js b/packages/migrate/migrations/app-state/migrate.js
index d48b4975..43613663 100644
--- a/packages/migrate/migrations/app-state/migrate.js
+++ b/packages/migrate/migrations/app-state/migrate.js
@@ -38,6 +38,8 @@ export function transform_svelte_code(code) {
 	});
 	let modified = code.replace('$app/stores', '$app/state');
 
+	let needs_navigating_migration_task = false;
+
 	for (const [store, alias] of stores) {
 		// if someone uses that they're deep into stores and we better not touch this file
 		if (store === 'getStores') return code;
@@ -68,10 +70,18 @@ export function transform_svelte_code(code) {
 				return code;
 			}
 
+			if (store === 'navigating' && after[0] !== '.') {
+				needs_navigating_migration_task = true;
+			}
+
 			modified = before.slice(0, -1) + alias + (store === 'updated' ? '.current' : '') + after;
 			count_removed++;
 		}
 	}
 
+	if (needs_navigating_migration_task) {
+		modified = `<!-- @migration task: review uses of \`navigating\` -->\n${modified}`;
+	}
+
 	return modified;
 }
diff --git a/packages/migrate/migrations/app-state/migrate.spec.js b/packages/migrate/migrations/app-state/migrate.spec.js
index 8c30416e..4162bddd 100644
--- a/packages/migrate/migrations/app-state/migrate.spec.js
+++ b/packages/migrate/migrations/app-state/migrate.spec.js
@@ -40,7 +40,7 @@ test('Updates $app/store #2', () => {
 	);
 	assert.equal(
 		result,
-		`<script>
+		`<!-- @migration task: review uses of \`navigating\` -->\n<script>
 	import { navigating, updated } from '$app/state';
 	updated.current;
 	updated.check();