From af10c3bc2f2c3459135e858a1236013b85440f4d Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 7 Aug 2025 05:00:42 -0700
Subject: [PATCH] chore: upgrade SvelteKit (#20736)

---
 web/package-lock.json                         | 18 ++++++++----
 web/package.json                              |  2 +-
 .../side-bar/side-bar-link.svelte             | 11 +++----
 .../side-bar/user-sidebar.svelte              | 29 ++++++++++---------
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 53b87d6b61..516babb3a9 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -52,7 +52,7 @@
         "@socket.io/component-emitter": "^3.1.0",
         "@sveltejs/adapter-static": "^3.0.8",
         "@sveltejs/enhanced-img": "^0.7.0",
-        "@sveltejs/kit": "^2.25.2",
+        "@sveltejs/kit": "^2.27.1",
         "@sveltejs/vite-plugin-svelte": "6.1.0",
         "@tailwindcss/vite": "^4.1.7",
         "@testing-library/jest-dom": "^6.4.2",
@@ -100,7 +100,7 @@
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.16.5",
+        "@types/node": "^22.17.0",
         "typescript": "^5.3.3"
       }
     },
@@ -2177,6 +2177,13 @@
       "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
       "license": "MIT"
     },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
+      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@sveltejs/acorn-typescript": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.5.tgz",
@@ -2216,12 +2223,13 @@
       }
     },
     "node_modules/@sveltejs/kit": {
-      "version": "2.25.2",
-      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.25.2.tgz",
-      "integrity": "sha512-aKfj82vqEINedoH9Pw4Ip16jj3w8soNq9F3nJqc56kxXW74TcEu/gdTAuLUI+gsl8i+KXfetRqg1F+gG/AZRVQ==",
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.27.1.tgz",
+      "integrity": "sha512-u5HbL9T4TgWZwXZM7hwdT0f5sDkGaNxsSrLYQoql+eiz2+9rcbbq4MiOAPoRtXG0dys5P5ixBmyQdqZedwZUlA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@standard-schema/spec": "^1.0.0",
         "@sveltejs/acorn-typescript": "^1.0.5",
         "@types/cookie": "^0.6.0",
         "acorn": "^8.14.1",
diff --git a/web/package.json b/web/package.json
index f37af78b12..c14ff6f04c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -69,7 +69,7 @@
     "@socket.io/component-emitter": "^3.1.0",
     "@sveltejs/adapter-static": "^3.0.8",
     "@sveltejs/enhanced-img": "^0.7.0",
-    "@sveltejs/kit": "^2.25.2",
+    "@sveltejs/kit": "^2.27.1",
     "@sveltejs/vite-plugin-svelte": "6.1.0",
     "@tailwindcss/vite": "^4.1.7",
     "@testing-library/jest-dom": "^6.4.2",
diff --git a/web/src/lib/components/shared-components/side-bar/side-bar-link.svelte b/web/src/lib/components/shared-components/side-bar/side-bar-link.svelte
index e12ef750de..99c98e0d0f 100644
--- a/web/src/lib/components/shared-components/side-bar/side-bar-link.svelte
+++ b/web/src/lib/components/shared-components/side-bar/side-bar-link.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { resolveRoute } from '$app/paths';
   import { page } from '$app/state';
   import Icon from '$lib/components/elements/icon.svelte';
   import { mdiChevronDown, mdiChevronLeft } from '@mdi/js';
@@ -8,7 +7,7 @@
 
   interface Props {
     title: string;
-    routeId: string;
+    href: string;
     icon: string;
     flippedLogo?: boolean;
     isSelected?: boolean;
@@ -19,7 +18,7 @@
 
   let {
     title,
-    routeId,
+    href,
     icon,
     flippedLogo = false,
     isSelected = $bindable(false),
@@ -28,10 +27,8 @@
     dropdownOpen = $bindable(false),
   }: Props = $props();
 
-  let routePath = $derived(resolveRoute(routeId, {}));
-
   $effect(() => {
-    isSelected = (page.route.id?.match(/^\/(admin|\(user\))\/[^/]*/) || [])[0] === routeId;
+    isSelected = (page.url.pathname.match(/^\/(admin|user)\/[^/]*/) || [])[0] === href;
   });
 </script>
 
@@ -55,7 +52,7 @@
     </span>
   {/if}
   <a
-    href={routePath}
+    {href}
     data-sveltekit-preload-data={preloadData ? 'hover' : 'off'}
     draggable="false"
     aria-current={isSelected ? 'page' : undefined}
diff --git a/web/src/lib/components/shared-components/side-bar/user-sidebar.svelte b/web/src/lib/components/shared-components/side-bar/user-sidebar.svelte
index 74cf69b08e..84ba56459e 100644
--- a/web/src/lib/components/shared-components/side-bar/user-sidebar.svelte
+++ b/web/src/lib/components/shared-components/side-bar/user-sidebar.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { resolve } from '$app/paths';
   import BottomInfo from '$lib/components/shared-components/side-bar/bottom-info.svelte';
   import RecentAlbums from '$lib/components/shared-components/side-bar/recent-albums.svelte';
   import Sidebar from '$lib/components/sidebar/sidebar.svelte';
@@ -48,19 +49,19 @@
 <Sidebar ariaLabel={$t('primary')}>
   <SideBarLink
     title={$t('photos')}
-    routeId="/(user)/photos"
+    href={resolve('/(user)/photos')}
     bind:isSelected={isPhotosSelected}
     icon={isPhotosSelected ? mdiImageMultiple : mdiImageMultipleOutline}
   ></SideBarLink>
 
   {#if $featureFlags.search}
-    <SideBarLink title={$t('explore')} routeId="/(user)/explore" icon={mdiMagnify} />
+    <SideBarLink title={$t('explore')} href={resolve('/(user)/explore')} icon={mdiMagnify} />
   {/if}
 
   {#if $featureFlags.map}
     <SideBarLink
       title={$t('map')}
-      routeId="/(user)/map"
+      href={resolve('/(user)/map')}
       bind:isSelected={isMapSelected}
       icon={isMapSelected ? mdiMap : mdiMapOutline}
     />
@@ -69,19 +70,19 @@
   {#if $preferences.people.enabled && $preferences.people.sidebarWeb}
     <SideBarLink
       title={$t('people')}
-      routeId="/(user)/people"
+      href={resolve('/(user)/people')}
       bind:isSelected={isPeopleSelected}
       icon={isPeopleSelected ? mdiAccount : mdiAccountOutline}
     />
   {/if}
 
   {#if $preferences.sharedLinks.enabled && $preferences.sharedLinks.sidebarWeb}
-    <SideBarLink title={$t('shared_links')} routeId="/(user)/shared-links" icon={mdiLink} />
+    <SideBarLink title={$t('shared_links')} href={resolve('/(user)/shared-links')} icon={mdiLink} />
   {/if}
 
   <SideBarLink
     title={$t('sharing')}
-    routeId="/(user)/sharing"
+    href={resolve('/(user)/sharing')}
     icon={isSharingSelected ? mdiAccountMultiple : mdiAccountMultipleOutline}
     bind:isSelected={isSharingSelected}
   ></SideBarLink>
@@ -90,14 +91,14 @@
 
   <SideBarLink
     title={$t('favorites')}
-    routeId="/(user)/favorites"
+    href={resolve('/(user)/favorites')}
     icon={isFavoritesSelected ? mdiHeart : mdiHeartOutline}
     bind:isSelected={isFavoritesSelected}
   ></SideBarLink>
 
   <SideBarLink
     title={$t('albums')}
-    routeId="/(user)/albums"
+    href={resolve('/(user)/albums')}
     icon={mdiImageAlbum}
     flippedLogo
     bind:dropdownOpen={$recentAlbumsDropdown}
@@ -110,30 +111,30 @@
   </SideBarLink>
 
   {#if $preferences.tags.enabled && $preferences.tags.sidebarWeb}
-    <SideBarLink title={$t('tags')} routeId="/(user)/tags" icon={mdiTagMultipleOutline} flippedLogo />
+    <SideBarLink title={$t('tags')} href={resolve('/(user)/tags')} icon={mdiTagMultipleOutline} flippedLogo />
   {/if}
 
   {#if $preferences.folders.enabled && $preferences.folders.sidebarWeb}
-    <SideBarLink title={$t('folders')} routeId="/(user)/folders" icon={mdiFolderOutline} flippedLogo />
+    <SideBarLink title={$t('folders')} href={resolve('/(user)/folders')} icon={mdiFolderOutline} flippedLogo />
   {/if}
 
   <SideBarLink
     title={$t('utilities')}
-    routeId="/(user)/utilities"
+    href={resolve('/(user)/utilities')}
     bind:isSelected={isUtilitiesSelected}
     icon={isUtilitiesSelected ? mdiToolbox : mdiToolboxOutline}
   ></SideBarLink>
 
   <SideBarLink
     title={$t('archive')}
-    routeId="/(user)/archive"
+    href={resolve('/(user)/archive')}
     bind:isSelected={isArchiveSelected}
     icon={isArchiveSelected ? mdiArchiveArrowDown : mdiArchiveArrowDownOutline}
   ></SideBarLink>
 
   <SideBarLink
     title={$t('locked_folder')}
-    routeId="/(user)/locked"
+    href={resolve('/(user)/locked')}
     bind:isSelected={isLockedFolderSelected}
     icon={isLockedFolderSelected ? mdiLock : mdiLockOutline}
   ></SideBarLink>
@@ -141,7 +142,7 @@
   {#if $featureFlags.trash}
     <SideBarLink
       title={$t('trash')}
-      routeId="/(user)/trash"
+      href={resolve('/(user)/trash')}
       bind:isSelected={isTrashSelected}
       icon={isTrashSelected ? mdiTrashCan : mdiTrashCanOutline}
     ></SideBarLink>