From fa77ba2b0f4a31f55f1ab73e8e00062215c5b58f Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Thu, 1 Oct 2026 18:51:43 -0400
Subject: [PATCH] Upgrade SvelteKit templates to 3.0

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
---
 javascript/site-sveltekit/package.json.jinja       |  8 ++++----
 javascript/site-sveltekit/svelte.config.js.jinja   | 11 -----------
 javascript/site-sveltekit/tsconfig.json.jinja      |  3 ++-
 javascript/site-sveltekit/vite.config.ts.jinja     |  9 ++++++++-
 javascript/uitk-svelte/package.json.jinja          | 14 +++++++++-----
 .../uitk-svelte/src/routes/+layout.svelte.jinja    |  2 +-
 .../uitk-svelte/src/routes/+page.svelte.jinja      |  2 +-
 javascript/uitk-svelte/svelte.config.js.jinja      | 11 -----------
 javascript/uitk-svelte/tsconfig.json.jinja         |  3 ++-
 javascript/uitk-svelte/vite.config.ts.jinja        | 10 +++++++++-
 10 files changed, 36 insertions(+), 37 deletions(-)
 delete mode 100644 javascript/site-sveltekit/svelte.config.js.jinja
 delete mode 100644 javascript/uitk-svelte/svelte.config.js.jinja

diff --git a/javascript/site-sveltekit/package.json.jinja b/javascript/site-sveltekit/package.json.jinja
index aa53b27..feccfe7 100644
--- a/javascript/site-sveltekit/package.json.jinja
+++ b/javascript/site-sveltekit/package.json.jinja
@@ -5,7 +5,7 @@
   "private": true,
   "packageManager": "pnpm@11.28.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=22.17"
   },
   "type": "module",
   "scripts": {
@@ -22,8 +22,8 @@
   "devDependencies": {
     "@axe-core/playwright": "^4.13.0",
     "@playwright/test": "^1.63.0",
-    "@sveltejs/adapter-{{ site_adapter }}": "{{ '^3.0.10' if site_adapter == 'static' else '^5.0.0' }}",
-    "@sveltejs/kit": "^2.70.3",
+    "@sveltejs/adapter-{{ site_adapter }}": "{{ '^4.0.0' if site_adapter == 'static' else '^6.0.0' }}",
+    "@sveltejs/kit": "^3.0.0",
     "@sveltejs/vite-plugin-svelte": "^7.3.1",
     "@tailwindcss/vite": "^4.3.3",
     "@types/node": "^26.6.3",
@@ -32,7 +32,7 @@
     "svelte": "^5.57.1",
     "svelte-check": "^4.7.6",
     "tailwindcss": "^4.3.3",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "vite": "^8.3.1"
   }
 }
diff --git a/javascript/site-sveltekit/svelte.config.js.jinja b/javascript/site-sveltekit/svelte.config.js.jinja
deleted file mode 100644
index 07dc4e5..0000000
--- a/javascript/site-sveltekit/svelte.config.js.jinja
+++ /dev/null
@@ -1,11 +0,0 @@
-import adapter from '@sveltejs/adapter-{{ site_adapter }}';
-
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-  kit: {
-    adapter: adapter({{ "{ fallback: '404.html', precompress: true, strict: true }" if site_adapter == 'static' else '' }}){% if site_adapter == 'static' %},
-    prerender: { entries: ['*'] }{% endif %}
-  }
-};
-
-export default config;
diff --git a/javascript/site-sveltekit/tsconfig.json.jinja b/javascript/site-sveltekit/tsconfig.json.jinja
index 4344710..933dde8 100644
--- a/javascript/site-sveltekit/tsconfig.json.jinja
+++ b/javascript/site-sveltekit/tsconfig.json.jinja
@@ -1,5 +1,6 @@
 {
-  "extends": "./.svelte-kit/tsconfig.json",
+  "extends": "$app/tsconfig",
+  "include": ["src", "tests", "*"],
   "compilerOptions": {
     "allowJs": true,
     "checkJs": true,
diff --git a/javascript/site-sveltekit/vite.config.ts.jinja b/javascript/site-sveltekit/vite.config.ts.jinja
index 50f7258..b52f103 100644
--- a/javascript/site-sveltekit/vite.config.ts.jinja
+++ b/javascript/site-sveltekit/vite.config.ts.jinja
@@ -1,7 +1,14 @@
+import adapter from '@sveltejs/adapter-{{ site_adapter }}';
 import tailwindcss from '@tailwindcss/vite';
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
-  plugins: [tailwindcss(), sveltekit()]
+  plugins: [
+    tailwindcss(),
+    sveltekit({
+      adapter: adapter({{ "{ fallback: '404.html', precompress: true, strict: true }" if site_adapter == 'static' else '' }}){% if site_adapter == 'static' %},
+      prerender: { entries: ['*'] }{% endif %}
+    })
+  ]
 });
diff --git a/javascript/uitk-svelte/package.json.jinja b/javascript/uitk-svelte/package.json.jinja
index 4fb5055..5e382a8 100644
--- a/javascript/uitk-svelte/package.json.jinja
+++ b/javascript/uitk-svelte/package.json.jinja
@@ -6,9 +6,13 @@
   "private": true,
   "packageManager": "pnpm@11.28.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=22.17"
   },
   "type": "module",
+  "imports": {
+    "#lib": "./src/lib/index.ts",
+    "#lib/*": "./src/lib/*"
+  },
   "files": [
     "dist",
     "!dist/**/*.test.*",
@@ -47,9 +51,9 @@
   "devDependencies": {
     "@axe-core/playwright": "^4.13.0",
     "@playwright/test": "^1.63.0",
-    "@sveltejs/adapter-static": "^3.0.10",
-    "@sveltejs/kit": "^2.70.3",
-    "@sveltejs/package": "^2.5.8",
+    "@sveltejs/adapter-static": "^4.0.0",
+    "@sveltejs/kit": "^3.0.0",
+    "@sveltejs/package": "^3.0.0",
     "@sveltejs/vite-plugin-svelte": "^7.3.1",
     "@types/node": "^26.6.3",
     "jsdom": "^30.1.1",
@@ -58,7 +62,7 @@
     "publint": "^0.3.24",
     "svelte": "^5.57.1",
     "svelte-check": "^4.7.6",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "vite": "^8.3.1",
     "vitest": "^5.0.1"
   }
diff --git a/javascript/uitk-svelte/src/routes/+layout.svelte.jinja b/javascript/uitk-svelte/src/routes/+layout.svelte.jinja
index 33df299..012a462 100644
--- a/javascript/uitk-svelte/src/routes/+layout.svelte.jinja
+++ b/javascript/uitk-svelte/src/routes/+layout.svelte.jinja
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import '$lib/styles/tokens.css';
+  import '#lib/styles/tokens.css';
   let { children } = $props();
 </script>
 
diff --git a/javascript/uitk-svelte/src/routes/+page.svelte.jinja b/javascript/uitk-svelte/src/routes/+page.svelte.jinja
index a5877f7..5333503 100644
--- a/javascript/uitk-svelte/src/routes/+page.svelte.jinja
+++ b/javascript/uitk-svelte/src/routes/+page.svelte.jinja
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { BrandMark, ThemeToggle } from '$lib';
+  import { BrandMark, ThemeToggle } from '#lib';
 </script>
 
 <svelte:head><title>{{ brand_name }} brand kit</title></svelte:head>
diff --git a/javascript/uitk-svelte/svelte.config.js.jinja b/javascript/uitk-svelte/svelte.config.js.jinja
deleted file mode 100644
index d664bea..0000000
--- a/javascript/uitk-svelte/svelte.config.js.jinja
+++ /dev/null
@@ -1,11 +0,0 @@
-import adapter from '@sveltejs/adapter-static';
-
-/** @type {import('@sveltejs/kit').Config} */
-const config = {
-  kit: {
-    adapter: adapter({ fallback: '404.html' }),
-    prerender: { entries: ['*'] }
-  }
-};
-
-export default config;
diff --git a/javascript/uitk-svelte/tsconfig.json.jinja b/javascript/uitk-svelte/tsconfig.json.jinja
index 4344710..933dde8 100644
--- a/javascript/uitk-svelte/tsconfig.json.jinja
+++ b/javascript/uitk-svelte/tsconfig.json.jinja
@@ -1,5 +1,6 @@
 {
-  "extends": "./.svelte-kit/tsconfig.json",
+  "extends": "$app/tsconfig",
+  "include": ["src", "tests", "*"],
   "compilerOptions": {
     "allowJs": true,
     "checkJs": true,
diff --git a/javascript/uitk-svelte/vite.config.ts.jinja b/javascript/uitk-svelte/vite.config.ts.jinja
index 1180a91..4de921f 100644
--- a/javascript/uitk-svelte/vite.config.ts.jinja
+++ b/javascript/uitk-svelte/vite.config.ts.jinja
@@ -1,4 +1,12 @@
+import adapter from '@sveltejs/adapter-static';
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
 
-export default defineConfig({ plugins: [sveltekit()] });
+export default defineConfig({
+  plugins: [
+    sveltekit({
+      adapter: adapter({ fallback: '404.html' }),
+      prerender: { entries: ['*'] }
+    })
+  ]
+});