Skip to content

Modern Docker Management, Designed for Everyone

chore(deps): bump @sveltejs/kit from 3.0.0-next.11 to 3.0.0-next.13 (#3444)

dependabot[bot]72be25e69e58
diff --git a/frontend/package.json b/frontend/package.json
index 2c1a87649..23ecf3726 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -33,7 +33,7 @@
"@fontsource-variable/montserrat": "^5.3.0",
"@internationalized/date": "^3.12.2",
"@lezer/highlight": "^1.2.3",
- "@sveltejs/kit": "^3.0.0-next.11",
+ "@sveltejs/kit": "^3.0.0-next.13",
"@tanstack/svelte-query": "^6.1.38",
"@tanstack/svelte-table": "^9.0.0-beta.58",
"@tanstack/table-core": "9.0.0-beta.58",
@@ -66,7 +66,7 @@
"devDependencies": {
"@iconify/json": "^2.2.506",
"@inlang/paraglide-js": "2.23.0",
- "@sveltejs/adapter-static": "^4.0.0-next.1",
+ "@sveltejs/adapter-static": "^4.0.0-next.2",
"@sveltejs/vite-plugin-svelte": "^7.2.0",
"@tailwindcss/vite": "^4.3.3",
"@tanstack/svelte-query-devtools": "^6.1.38",
diff --git a/frontend/src/lib/hooks/use-url-tab.svelte.ts b/frontend/src/lib/hooks/use-url-tab.svelte.ts
index fd60cef40..8b9364137 100644
--- a/frontend/src/lib/hooks/use-url-tab.svelte.ts
+++ b/frontend/src/lib/hooks/use-url-tab.svelte.ts
@@ -1,4 +1,4 @@
-import { replaceState } from '$app/navigation';
+import { goto } from '$app/navigation';
import { page } from '$app/state';
import { onMount, untrack } from 'svelte';
@@ -9,11 +9,27 @@ type UseUrlTabOptions<T extends string> = {
};
export function useUrlTab<T extends string>({ validTabs, defaultTab, ready = () => true }: UseUrlTabOptions<T>) {
+ let pendingUrlUpdate = Promise.resolve();
+
function currentUrl() {
const reactiveUrl = page.url;
return typeof window === 'undefined' ? new URL(reactiveUrl.href) : new URL(window.location.href);
}
+ function updateUrl(url: URL) {
+ const state = page.state;
+ pendingUrlUpdate = pendingUrlUpdate
+ .catch(() => undefined)
+ .then(() =>
+ goto(url, {
+ replace: true,
+ shallow: true,
+ reset: false,
+ state
+ })
+ );
+ }
+
function resolveTab(url = currentUrl()) {
const tabs = validTabs();
const defaultValue = defaultTab();
@@ -40,7 +56,7 @@ export function useUrlTab<T extends string>({ validTabs, defaultTab, ready = ()
const url = currentUrl();
if (url.searchParams.get('tab') !== tab) {
url.searchParams.set('tab', tab);
- replaceState(url, page.state);
+ updateUrl(url);
}
value = tab as T;
@@ -51,7 +67,7 @@ export function useUrlTab<T extends string>({ validTabs, defaultTab, ready = ()
const selected = resolveTab(url);
if (mounted && ready() && url.searchParams.get('tab') !== selected) {
url.searchParams.set('tab', selected);
- replaceState(url, page.state);
+ updateUrl(url);
}
if (untrack(() => value) !== selected) value = selected;
});
diff --git a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
index 328e8fb67..7211366b3 100644
--- a/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
+++ b/frontend/src/routes/(app)/dashboard/dashboard-all-environments-view.svelte
@@ -1,6 +1,5 @@
<script lang="ts">
import { goto, refreshAll } from '$app/navigation';
- import { resolve } from '$app/paths';
import { formatDistanceToNow } from 'date-fns';
import { onDestroy, onMount, untrack } from 'svelte';
import { toast } from 'svelte-sonner';
@@ -595,7 +594,7 @@
id: `${item.environment.id}-details`,
action: 'inspect',
label: m.common_view_details(),
- onclick: () => void goto(resolve(`/environments/${item.environment.id}`)),
+ onclick: () => void goto(`/environments/${item.environment.id}`),
icon: InspectIcon
});
diff --git a/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte b/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte
index 413ec9ddb..ef0d48110 100644
--- a/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte
@@ -59,7 +59,7 @@
const newUrl = new URL(page.url.href);
newUrl.searchParams.delete('action');
newUrl.searchParams.delete('targetType');
- goto(newUrl.toString(), { replaceState: true, keepFocus: true });
+ goto(newUrl.toString(), { replaceState: true, reset: false });
}, 100);
}
});
diff --git a/frontend/src/routes/(app)/projects/+page.svelte b/frontend/src/routes/(app)/projects/+page.svelte
index 947670b5a..abebe41d7 100644
--- a/frontend/src/routes/(app)/projects/+page.svelte
+++ b/frontend/src/routes/(app)/projects/+page.svelte
@@ -177,7 +177,7 @@
} else {
url.searchParams.delete('archived');
}
- await goto(`${url.pathname}${url.search}`, { keepFocus: true, replaceState: true, noScroll: true });
+ await goto(`${url.pathname}${url.search}`, { reset: false, replaceState: true });
}
const canCreateProject = $derived(hasPermission('projects:create', envId));
diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
index b4d203ced..4b2b0c21b 100644
--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
@@ -271,6 +271,7 @@
type ProjectTab = 'services' | 'compose' | 'logs';
let selectedTab = $state<ProjectTab>('compose');
+ let userSelectedTabProjectId: string | null = null;
let composeOpen = $state(true);
let envOpen = $state(true);
let overrideOpen = $state(false);
@@ -446,7 +447,6 @@
defaultTab: () => selectedTab,
ready: () => lastPrefsProjectId === project?.id
});
- const activeTab = $derived(urlTab.value);
function ensureIncludeFileUiState(relativePath: string) {
if (includeFilesPanelStates[relativePath] === undefined) {
@@ -666,7 +666,12 @@
syncTabs: false
});
const cur = prefs.current ?? {};
- selectedTab = cur.tab ?? defaultComposeUIPrefs.tab;
+ const userSelectedTabForProject = userSelectedTabProjectId === project.id;
+ const requestedTab = new URL(window.location.href).searchParams.get('tab');
+ const urlTabValue = tabItems.some((tab) => tab.value === requestedTab) ? (requestedTab as ProjectTab) : null;
+ if (!userSelectedTabForProject) {
+ selectedTab = urlTabValue ?? cur.tab ?? defaultComposeUIPrefs.tab;
+ }
composeOpen = cur.composeOpen ?? defaultComposeUIPrefs.composeOpen;
// Expanding the override collapses the compose editor (accordion), so the
// override defaults to collapsed to keep compose primary on load.
@@ -686,7 +691,7 @@
layoutMode = hadStoredPrefs ? (cur.layoutMode ?? defaultMode) : defaultMode;
// PersistedState seeds storage with the defaults on first mount; persist the
// resolved state so the auto-detected layout survives the next visit.
- if (!hadStoredPrefs) {
+ if (!hadStoredPrefs || userSelectedTabForProject) {
persistPrefs();
}
});
@@ -1314,8 +1319,9 @@
{backUrl}
backLabel={m.common_back()}
{tabItems}
- selectedTab={activeTab}
+ {selectedTab}
onTabChange={(value: string) => {
+ userSelectedTabProjectId = project.id;
selectedTab = value as ProjectTab;
urlTab.select(value);
persistPrefs();
diff --git a/frontend/src/service-worker.ts b/frontend/src/service-worker/index.ts
similarity index 85%
rename from frontend/src/service-worker.ts
rename to frontend/src/service-worker/index.ts
index 50e34f9a7..be5f24fc3 100644
--- a/frontend/src/service-worker.ts
+++ b/frontend/src/service-worker/index.ts
@@ -1,17 +1,13 @@
-/// <reference no-default-lib="true"/>
-/// <reference lib="esnext" />
-/// <reference lib="webworker" />
-/// <reference types="@sveltejs/kit" />
-
-import { base, files, version } from '$service-worker';
-
-const self = globalThis.self as unknown as ServiceWorkerGlobalScope;
+import { version } from '$app/env';
+import { assets } from '$app/manifest';
+import { asset } from '$app/paths';
+import { self } from '$app/service-worker';
const CACHE = `cache-${version}`;
-const API_PREFIX = `${base}/api/`;
-const ASSETS = files;
-const ASSET_PATHS = new Set(ASSETS.map((asset) => new URL(asset, self.location.origin).pathname));
+const API_PREFIX = new URL('api/', self.registration.scope).pathname;
+const ASSETS = assets.map(({ path }) => asset(path));
+const ASSET_PATHS = new Set(ASSETS.map((assetPath) => new URL(assetPath, self.location.origin).pathname));
self.addEventListener('install', (event) => {
console.log('[ServiceWorker] Install');
diff --git a/frontend/src/service-worker/tsconfig.json b/frontend/src/service-worker/tsconfig.json
new file mode 100644
index 000000000..11fb03695
--- /dev/null
+++ b/frontend/src/service-worker/tsconfig.json
@@ -0,0 +1,6 @@
+{
+ "extends": "$app/tsconfig/service-worker",
+ "compilerOptions": {
+ "skipLibCheck": true
+ }
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 44f329a5e..230cea8ee 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,5 +1,6 @@
{
- "extends": "./.svelte-kit/tsconfig.json",
+ "extends": "$app/tsconfig",
+ "include": ["src"],
"compilerOptions": {
"target": "ES2022",
"verbatimModuleSyntax": true,
@@ -20,7 +21,7 @@
"noUncheckedIndexedAccess": true,
"noPropertyAccessFromIndexSignature": true,
"moduleResolution": "bundler",
- "types": ["unplugin-icons/types/svelte"]
+ "types": ["$app/types", "unplugin-icons/types/svelte"]
},
"exclude": [
"node_modules/**",
@@ -28,7 +29,6 @@
"src/paraglide/**",
"src/service-worker.js",
"src/service-worker/**/*.js",
- "src/service-worker.ts",
"src/service-worker/**/*.ts",
"src/service-worker.d.ts",
"src/service-worker/**/*.d.ts"
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 28b4c9769..9de59f376 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -33,10 +33,7 @@ function parseBooleanEnv(value: string | undefined): boolean | undefined {
const explicitInsecureTLS = parseBooleanEnv(process.env['DEV_BACKEND_INSECURE_TLS']);
// Allow local self-signed HTTPS while developing edge mTLS against the manager.
-const useInsecureLocalTLS =
- explicitInsecureTLS ??
- (parsedDevBackendURL.protocol === 'https:' &&
- (parsedDevBackendURL.hostname === 'localhost' || parsedDevBackendURL.hostname === '127.0.0.1'));
+const useInsecureLocalTLS = explicitInsecureTLS ?? (parsedDevBackendURL.protocol === 'https:' && (parsedDevBackendURL.hostname === 'localhost' || parsedDevBackendURL.hostname === '127.0.0.1'));
export default defineConfig({
plugins: [
@@ -48,7 +45,8 @@ export default defineConfig({
fallback: 'index.html'
}),
version: {
- name: packageJson.version
+ name: packageJson.version,
+ pollInterval: 0
}
}),
paraglideVitePlugin({
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0c8623d25..620759fa9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,8 +22,8 @@ overrides:
uuid: '>=11.1.1'
fast-uri: '>=3.1.2'
ws: '>=8.20.1'
- '@sveltejs/kit': ^3.0.0-next.11
- '@sveltejs/adapter-static': '>=4.0.0-next.1'
+ '@sveltejs/kit': ^3.0.0-next.13
+ '@sveltejs/adapter-static': '>=4.0.0-next.2'
dompurify: '>=3.4.11'
ts-deepmerge: '>=8.0.0'
joi: '>=17.13.4'
@@ -123,8 +123,8 @@ importers:
specifier: ^1.2.3
version: 1.2.3
'@sveltejs/kit':
- specifier: ^3.0.0-next.11
+ specifier: ^3.0.0-next.13
'@tanstack/svelte-query':
specifier: ^6.1.38
version: 6.1.38([email protected])
@@ -157,7 +157,7 @@ importers:
version: 0.7.2
bits-ui:
specifier: ^2.18.1
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -169,7 +169,7 @@ importers:
version: 8.6.0([email protected])
formsnap:
specifier: ^2.0.1
ky:
specifier: ^2.0.2
version: 2.0.2
@@ -181,7 +181,7 @@ importers:
version: 1.1.0([email protected])
runed:
specifier: ^0.37.1
svelte:
specifier: ^5.56.8
version: 5.56.8
@@ -217,8 +217,8 @@ importers:
specifier: 2.23.0
'@sveltejs/adapter-static':
- specifier: '>=4.0.0-next.1'
+ specifier: '>=4.0.0-next.2'
'@sveltejs/vite-plugin-svelte':
specifier: ^7.2.0
@@ -254,10 +254,10 @@ importers:
version: 0.11.0(@typescript/[email protected])
svelte-toolbelt:
specifier: ^0.10.6
sveltekit-superforms:
specifier: ^2.30.2
tailwindcss:
specifier: ^4.3.3
version: 4.3.3
@@ -1083,13 +1083,13 @@ packages:
peerDependencies:
acorn: ^8.9.0
- '@sveltejs/[email protected]':
- resolution: {integrity: sha512-B8Go4HflODgz7wjwblL4KCg8nlIB5Twj0LZOTULai7ssfs/yKaPQxtQphwn5zrbo+k7gLL/ddf+Ak4BmsYYwmw==}
+ '@sveltejs/[email protected]':
+ resolution: {integrity: sha512-j21jhbCVftKt4HAzcKp9XMjSqebtKwIRtKZKpqSBk+fl6S2B6ad6Ybf0vHJ6MjKKBWSBGLtXQuDS+lgHNkos9w==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.11
+ '@sveltejs/kit': ^3.0.0-next.13
- '@sveltejs/[email protected]':
- resolution: {integrity: sha512-FkdeE/92YK4WvNaZ7tPRsZYp4eflxhuFKEbRfhFPWNBsPNqtLrJZWox0g6u3eUxGOZV5WDatk/6nQfzsocijHg==}
+ '@sveltejs/[email protected]':
+ resolution: {integrity: sha512-t3GeqIfpYDUGVTJ7MYf+gn+cbWi5nwS4x9kczL9lDHY7b0trYsWGk+6lfga9ipaSlWk3/E79yZJjh2biCbm7Lg==}
engines: {node: '>=22'}
hasBin: true
peerDependencies:
@@ -1518,11 +1518,6 @@ packages:
resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
engines: {node: '>= 0.6'}
- resolution: {integrity: sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==}
- engines: {node: '>=0.4.0'}
- hasBin: true
-
resolution: {integrity: sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==}
engines: {node: '>=0.4.0'}
@@ -2417,7 +2412,7 @@ packages:
resolution: {integrity: sha512-2F4Q/FZzbeJTFdIS/PuOoPRSm92sA2LhzTnv6FXhCoENb3huf5+fDuNOg1LNvGOouy3u/225qxmuJvcV3IZK5Q==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.11
+ '@sveltejs/kit': ^3.0.0-next.13
svelte: ^5.7.0
peerDependenciesMeta:
'@sveltejs/kit':
@@ -2426,7 +2421,7 @@ packages:
resolution: {integrity: sha512-MeFY73xBW8IueWBm012nNFIGy19WUGPLtknavyUPMpnyt350M47PhGSGrGoSLbidwn+Zlt/O0cp8/OZE3LASWA==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.11
+ '@sveltejs/kit': ^3.0.0-next.13
svelte: ^5.7.0
zod: ^4.1.0
peerDependenciesMeta:
@@ -2560,7 +2555,7 @@ packages:
resolution: {integrity: sha512-6sR70ZfjFMAfdNure/Bu26o1rY32+WGxebko1L8jUFS+qZw5fxIHBPkUaTpNBkOIlJZ/UJwoNCYCm5xK2Z7Kqw==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.11
+ '@sveltejs/kit': ^3.0.0-next.13
svelte: 3.x || 4.x || >=5.0.0-next.51
@@ -3540,24 +3535,20 @@ snapshots:
dependencies:
svelte: 5.56.8
- dependencies:
- acorn: 8.17.0
-
dependencies:
acorn: 8.18.0
dependencies:
dependencies:
'@standard-schema/spec': 1.1.0
- '@sveltejs/acorn-typescript': 1.0.11([email protected])
+ '@sveltejs/acorn-typescript': 1.0.11([email protected])
- acorn: 8.17.0
+ acorn: 8.18.0
cookie: 1.1.1
devalue: 5.8.2
esm-env: 1.2.2
@@ -3898,8 +3889,6 @@ snapshots:
mime-types: 2.1.35
negotiator: 0.6.3
-
@@ -3948,15 +3937,15 @@ snapshots:
dependencies:
require-from-string: 2.0.2
dependencies:
'@floating-ui/core': 1.7.5
'@floating-ui/dom': 1.7.6
'@internationalized/date': 3.12.2
esm-env: 1.2.2
svelte: 5.56.8
tabbable: 6.4.0
transitivePeerDependencies:
- '@sveltejs/kit'
@@ -4260,11 +4249,11 @@ snapshots:
optionalDependencies:
picomatch: 4.0.5
dependencies:
svelte: 5.56.8
svelte-toolbelt: 0.5.0([email protected])
optional: true
@@ -4556,7 +4545,7 @@ snapshots:
dependencies:
- acorn: 8.17.0
+ acorn: 8.18.0
pathe: 2.0.3
pkg-types: 1.3.1
ufo: 1.6.4
@@ -4777,23 +4766,23 @@ snapshots:
esm-env: 1.2.2
svelte: 5.56.8
dependencies:
dequal: 2.0.3
esm-env: 1.2.2
lz-string: 1.5.0
svelte: 5.56.8
optionalDependencies:
dependencies:
dequal: 2.0.3
esm-env: 1.2.2
lz-string: 1.5.0
svelte: 5.56.8
optionalDependencies:
zod: 4.4.3
@@ -4906,10 +4895,10 @@ snapshots:
runed: 0.28.0([email protected])
svelte: 5.56.8
dependencies:
clsx: 2.1.1
style-to-object: 1.0.14
svelte: 5.56.8
transitivePeerDependencies:
@@ -4956,9 +4945,9 @@ snapshots:
transitivePeerDependencies:
- '@typescript-eslint/types'
dependencies:
devalue: 5.8.1
memoize-weak: 1.0.2
svelte: 5.56.8
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a91a06c5e..3217c0059 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -27,8 +27,8 @@ overrides:
uuid: ">=11.1.1"
fast-uri: ">=3.1.2"
ws: ">=8.20.1"
- "@sveltejs/kit": "^3.0.0-next.11"
- "@sveltejs/adapter-static": ">=4.0.0-next.1"
+ "@sveltejs/kit": "^3.0.0-next.13"
+ "@sveltejs/adapter-static": ">=4.0.0-next.2"
dompurify: ">=3.4.11"
ts-deepmerge: ">=8.0.0"
joi: ">=17.13.4"
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index d049cf418..fa42efdd3 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -657,21 +657,20 @@ test.describe('New Compose Project Page', () => {
await expect(page.getByRole('button', { name: projectName, exact: true })).toBeVisible();
await page.getByRole('tab', { name: 'Services 1', exact: true }).click();
- await page.waitForLoadState('load');
-
- const serviceTable = page.getByRole('table');
- const serviceNameWhenStopped = serviceTable.getByText('nginx', {
- exact: true
- });
- const emptyServicesState = page.getByText('No services found for this project', {
- exact: true
- });
+ await expect.poll(() => new URL(page.url()).searchParams.get('tab')).toBe('services');
- if ((await serviceNameWhenStopped.count()) > 0) {
- await expect(serviceNameWhenStopped.first()).toBeVisible();
- } else {
- await expect(emptyServicesState).toBeVisible();
- }
+ const serviceTable = page.getByRole('table').filter({ visible: true });
+ const serviceNameWhenStopped = serviceTable
+ .getByText('nginx', {
+ exact: true
+ })
+ .filter({ visible: true });
+ const emptyServicesState = page
+ .getByText('No services found for this project', {
+ exact: true
+ })
+ .filter({ visible: true });
+ await expect(serviceNameWhenStopped.or(emptyServicesState).first()).toBeVisible();
await page.route('**/api/environments/*/projects/*/pull', async (route) => {
projectPullRequestCount += 1;
@@ -1262,11 +1261,19 @@ test.describe('Project Detail Page', () => {
try {
projectId = await createProjectViaUI(page, projectName, composeContent);
- await page.getByRole('tab', { name: 'Services 1', exact: true }).click();
-
- await page.getByText('8081:80', { exact: true }).hover();
+ const servicesTab = page.getByRole('tab', { name: 'Services 1', exact: true });
+ await servicesTab.click();
+ await expect.poll(() => new URL(page.url()).searchParams.get('tab')).toBe('services');
+ await expect(servicesTab).toHaveAttribute('data-state', 'active');
+
+ const port = page.getByText('8081:80', { exact: true }).filter({ visible: true }).first();
+ await expect(port).toBeVisible();
+ await port.hover();
await expect(
- page.getByText('Published: 127.0.0.1:8081 → 80/tcp', { exact: true })
+ page
+ .getByText('Published: 127.0.0.1:8081 → 80/tcp', { exact: true })
+ .filter({ visible: true })
+ .first()
).toBeVisible();
} finally {
if (projectId) {