Skip to content

Modern Docker Management, Designed for Everyone

chore: fix type safety in pnpm workspace

Kyle Mendell8082189474ad
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d3d6efbbd..15aa63961 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,10 +6,10 @@
"features": {
"ghcr.io/devcontainers/features/go:1": {
"version": "1.26"
- },
- "ghcr.io/devcontainers/features/node:2": {
- "version": "25",
- "pnpm": "10.22.0"
+ },
+ "ghcr.io/devcontainers/features/node:2": {
+ "version": "25",
+ "pnpm": "10.22.0"
},
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
"version": "latest",
@@ -33,9 +33,9 @@
"bradlc.vscode-tailwindcss",
"ms-azuretools.vscode-docker",
"GitHub.copilot-chat",
- "GitHub.copilot",
- "ms-vscode.vscode-typescript-next",
- "actboy168.tasks"
+ "GitHub.copilot",
+ "ms-vscode.vscode-typescript-next",
+ "actboy168.tasks"
]
}
},
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a587759a..dbe4b6150 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -199,8 +199,8 @@ jobs:
> Analysis from commit ${{ github.sha }}
edit-mode: replace
- svelte-check:
- name: Svelte Type Check
+ type-check:
+ name: Type Check
runs-on: depot-ubuntu-latest
steps:
- name: Checkout code
@@ -218,8 +218,8 @@ jobs:
- name: Setup Just
uses: extractions/setup-just@v4
- - name: Install Fontend Dependencies
- run: just deps install frontend
+ - name: Install Node dependencies
+ run: pnpm install --frozen-lockfile
- name: Add svelte-check problem matcher
run: echo "::add-matcher::.github/matchers/svelte-check-matcher.json"
@@ -227,8 +227,8 @@ jobs:
- name: Build frontend
run: just build single frontend
- - name: Run svelte-check
- run: just lint frontend
+ - name: Run workspace type checks
+ run: just lint js
e2e-tests:
name: E2E Tests (${{ matrix.database.name }})
diff --git a/Justfile b/Justfile
index f740de6a3..816184515 100644
--- a/Justfile
+++ b/Justfile
@@ -342,6 +342,23 @@ format target="all" check="":
_lint-frontend:
pnpm -C frontend check
+# Type check Playwright tests
+[group('quality')]
+_lint-tests:
+ pnpm -C tests check
+
+# Type check email templates
+[group('quality')]
+_lint-email-templates:
+ pnpm -C email-templates check
+
+# Type check all JavaScript/TypeScript workspaces
+[group('quality')]
+_lint-js:
+ @just _lint-frontend
+ @just _lint-tests
+ @just _lint-email-templates
+
# Lint Go backend
[group('quality')]
_lint-backend:
@@ -363,10 +380,10 @@ _lint-go: _lint-backend _lint-cli _lint-types
[group('quality')]
_lint-all:
- @just _lint-frontend
+ @just _lint-js
@just _lint-go
-# Lint targets. Valid: "backend", "frontend", "cli", "types" "all".
+# Lint targets. Valid: "backend", "frontend", "tests", "email-templates", "js", "cli", "types", "go", "all".
[group('quality')]
lint target="all":
@just "_lint-{{ target }}"
diff --git a/backend/resources/email-templates/batch-image-updates_html.tmpl b/backend/resources/email-templates/batch-image-updates_html.tmpl
index 129613ef2..e027eea84 100644
--- a/backend/resources/email-templates/batch-image-updates_html.tmpl
+++ b/backend/resources/email-templates/batch-image-updates_html.tmpl
@@ -1,4 +1,4 @@
-{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
+{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:#31343a;border:1px solid #3a3e45;padding:32px;border-radius:14px;box-shadow:none"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f5f7fa;font-family:&#x27;Geist Mono&#x27;, ui-monospace, SFMono-Regular, Menlo, Monaco, &#x27;Courier New&#x27;, monospace">Image Updates Available</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td><p style="font-size:16px;line-height:24px;color:#c7cbd1;margin:0 0 16px 0;margin-top:0;margin-right:0;margin-bottom:16px;margin-left:0">{{.UpdateCount}} container images have updates available.</p></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;background-color:#2b2e34;border:1px solid #3a3e45;border-radius:10px"><tbody><tr><td style="padding:20px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:160px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0"
>Environment:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.Environment}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-color:#3a3e45;border-top:1px solid #eaeaea;margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:160px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Updates Available:</p></td><td data-id="__react-email-column"><p style="font-size:24px;line-height:24px;font-weight:700;color:#34d399;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.UpdateCount}}</p>
diff --git a/backend/resources/email-templates/container-update_html.tmpl b/backend/resources/email-templates/container-update_html.tmpl
index e12e632f9..8fad6f723 100644
--- a/backend/resources/email-templates/container-update_html.tmpl
+++ b/backend/resources/email-templates/container-update_html.tmpl
@@ -1,4 +1,4 @@
-{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
+{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:#31343a;border:1px solid #3a3e45;padding:32px;border-radius:14px;box-shadow:none"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f5f7fa;font-family:&#x27;Geist Mono&#x27;, ui-monospace, SFMono-Regular, Menlo, Monaco, &#x27;Courier New&#x27;, monospace">Container Successfully Updated</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td><p style="font-size:16px;line-height:24px;color:#c7cbd1;margin:0 0 16px 0;margin-top:0;margin-right:0;margin-bottom:16px;margin-left:0">Your container has been successfully updated with the latest image version.</p></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;background-color:#2b2e34;border:1px solid #3a3e45;border-radius:10px"><tbody><tr><td style="padding:20px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px">
<p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Environment:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.Environment}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-color:#3a3e45;border-top:1px solid #eaeaea;margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Container:</p></td><td data-id="__react-email-column">
diff --git a/backend/resources/email-templates/image-update_html.tmpl b/backend/resources/email-templates/image-update_html.tmpl
index 44dbd6f1c..2507505ef 100644
--- a/backend/resources/email-templates/image-update_html.tmpl
+++ b/backend/resources/email-templates/image-update_html.tmpl
@@ -1,4 +1,4 @@
-{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
+{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:#31343a;border:1px solid #3a3e45;padding:32px;border-radius:14px;box-shadow:none"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f5f7fa;font-family:&#x27;Geist Mono&#x27;, ui-monospace, SFMono-Regular, Menlo, Monaco, &#x27;Courier New&#x27;, monospace">Container Image Update</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:24px"><tbody><tr><td><p style="font-size:16px;line-height:24px;color:#c7cbd1;margin:0 0 16px 0;margin-top:0;margin-right:0;margin-bottom:16px;margin-left:0">A new update has been detected for your container image.</p></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;background-color:#2b2e34;border:1px solid #3a3e45;border-radius:10px"><tbody><tr><td style="padding:20px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">
Environment:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.Environment}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-color:#3a3e45;border-top:1px solid #eaeaea;margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Image:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.ImageRef}}</p></td></tr>
diff --git a/backend/resources/email-templates/prune-report_html.tmpl b/backend/resources/email-templates/prune-report_html.tmpl
index f33bf990a..17f484965 100644
--- a/backend/resources/email-templates/prune-report_html.tmpl
+++ b/backend/resources/email-templates/prune-report_html.tmpl
@@ -1,4 +1,4 @@
-{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
+{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:#31343a;border:1px solid #3a3e45;padding:32px;border-radius:14px;box-shadow:none"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f5f7fa;font-family:&#x27;Geist Mono&#x27;, ui-monospace, SFMono-Regular, Menlo, Monaco, &#x27;Courier New&#x27;, monospace">System Prune Report</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;text-align:center;background-color:#2b2e34;border:1px solid #3a3e45;border-radius:10px"><tbody><tr><td style="padding:20px"><p style="font-size:12px;line-height:18px;letter-spacing:0.08em;text-transform:uppercase;color:#9298a3;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">Total Reclaimed</p><p style="font-size:30px;line-height:36px;font-weight:700;color:#34d399;margin:8px 0 0 0;margin-top:8px;margin-right:0;margin-bottom:0;margin-left:0">{{.TotalSpaceReclaimed}}</p></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:18px;background-color:#2b2e34;border:1px solid #3a3e45;border-radius:10px"><tbody><tr><td style="padding:20px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0">
<tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:180px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Environment:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;font-family:&#x27;Geist Mono&#x27;, ui-monospace, SFMono-Regular, Menlo, Monaco, &#x27;Courier New&#x27;, monospace;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.Environment}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-color:#3a3e45;border-top:1px solid #eaeaea;margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%">
diff --git a/backend/resources/email-templates/test_html.tmpl b/backend/resources/email-templates/test_html.tmpl
index b191b0ebe..98a3a9023 100644
--- a/backend/resources/email-templates/test_html.tmpl
+++ b/backend/resources/email-templates/test_html.tmpl
@@ -1,4 +1,4 @@
-{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
+{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:#31343a;border:1px solid #3a3e45;padding:32px;border-radius:14px;box-shadow:none"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f5f7fa;font-family:&#x27;Geist Mono&#x27;, ui-monospace, SFMono-Regular, Menlo, Monaco, &#x27;Courier New&#x27;, monospace">Test Email</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>
<p style="font-size:16px;line-height:24px;color:#c7cbd1;margin-top:16px;margin-bottom:0">Your email setup is working correctly!</p><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;background-color:#2b2e34;border:1px solid #3a3e45;border-radius:10px"><tbody><tr><td style="padding:20px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:140px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Environment:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">
{{.Environment}}</p></td></tr></tbody></table></td></tr></tbody></table></div><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-top:32px"><tbody><tr><td style="padding-top:24px"><p style="font-size:14px;line-height:20px;margin:0;color:#9298a3;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0"><a href="{{.AppURL}}" style="color:#a855f7;text-decoration-line:none;text-decoration:none;font-weight:500" target="_blank">Open Arcane Dashboard →</a></p></td></tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table><!--/$--></body></html>{{end}}
diff --git a/backend/resources/email-templates/vulnerability-summary_html.tmpl b/backend/resources/email-templates/vulnerability-summary_html.tmpl
index 515de6c17..b18f56f41 100644
--- a/backend/resources/email-templates/vulnerability-summary_html.tmpl
+++ b/backend/resources/email-templates/vulnerability-summary_html.tmpl
@@ -1,4 +1,4 @@
-{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><link rel="preload" as="image" href="{{.LogoURL}}"/><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
+{{define "root"}}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html dir="ltr" lang="en"><head><meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/><meta name="x-apple-disable-message-reformatting"/></head><body dir="ltr" lang="en" style="background-color:#24262b;padding:0"><!--$--><!--html--><!--head--><!--body--><table border="0" width="100%" cellPadding="0" cellSpacing="0" role="presentation" align="center"><tbody><tr><td dir="ltr" lang="en" style="padding:40px 20px;background-color:#24262b;font-family:&#x27;Montserrat&#x27;, -apple-system, BlinkMacSystemFont, &#x27;Segoe UI&#x27;, Roboto, &#x27;Helvetica Neue&#x27;, Arial, sans-serif"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="max-width:37.5em;width:600px;margin:0 auto"><tbody><tr style="width:100%"><td>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="text-align:center;margin-bottom:32px"><tbody><tr><td><img alt="Arcane" height="auto" src="{{.LogoURL}}" style="display:inline-block;outline:none;border:none;text-decoration:none;width:180px;height:auto" width="180"/></td></tr></tbody></table><div style="background-color:#31343a;border:1px solid #3a3e45;padding:32px;border-radius:14px;box-shadow:none"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column"><h1 style="font-size:24px;font-weight:bold;margin:0;color:#f5f7fa;font-family:&#x27;Geist Mono&#x27;, ui-monospace, SFMono-Regular, Menlo, Monaco, &#x27;Courier New&#x27;, monospace">Daily Vulnerability Summary</h1></td><td align="right" data-id="__react-email-column"></td></tr></tbody></table>
<table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:16px"><tbody><tr><td><p style="font-size:14px;line-height:22px;color:#9298a3;margin:0;margin-top:0;margin-bottom:0;margin-left:0;margin-right:0">{{.SummaryLabel}}</p></td></tr></tbody></table><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-top:20px;background-color:#2b2e34;border:1px solid #3a3e45;border-radius:10px"><tbody><tr><td style="padding:20px"><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:170px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Environment:</p></td>
<td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.Environment}}</p></td></tr></tbody></table><hr style="width:100%;border:none;border-color:#3a3e45;border-top:1px solid #eaeaea;margin:4px 0"/><table align="center" width="100%" border="0" cellPadding="0" cellSpacing="0" role="presentation" style="margin-bottom:0"><tbody style="width:100%"><tr style="width:100%"><td data-id="__react-email-column" style="width:170px;vertical-align:top;padding-right:12px"><p style="font-size:14px;line-height:24px;font-weight:600;color:#9298a3;margin:8px 0;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">Overview:</p></td><td data-id="__react-email-column"><p style="font-size:14px;line-height:24px;color:#e6e8ec;margin:8px 0;word-break:break-word;margin-top:8px;margin-right:0;margin-bottom:8px;margin-left:0">{{.Overview}}</p></td></tr></tbody></table>
diff --git a/email-templates/build.ts b/email-templates/build.ts
index ec8fe651c..5ab7f8f53 100644
--- a/email-templates/build.ts
+++ b/email-templates/build.ts
@@ -48,9 +48,9 @@ function tagAwareWrap(input: string, maxLen: number): string {
}
async function buildTemplateFile(Component: any, templateName: string, isPlainText: boolean) {
- const rendered = await render(Component(Component.TemplateProps), {
- plainText: isPlainText
- });
+ const rendered = isPlainText
+ ? await render(Component(Component.TemplateProps), { plainText: true })
+ : await render(Component(Component.TemplateProps), { plainText: false });
// Normalize quotes
let normalized = rendered.replace(/&quot;/g, '"');
diff --git a/email-templates/package.json b/email-templates/package.json
index cd4650115..b71b6527a 100644
--- a/email-templates/package.json
+++ b/email-templates/package.json
@@ -5,6 +5,7 @@
"preinstall": "npx only-allow pnpm",
"build": "tsx build.ts",
"build:watch": "tsx watch build.ts",
+ "check": "tsc --noEmit",
"dev": "email dev --port 3030",
"export": "email export"
},
@@ -19,6 +20,7 @@
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"oxfmt": "^0.58.0",
- "tsx": "^4.23.1"
+ "tsx": "^4.23.1",
+ "typescript": "^6.0.3"
}
}
diff --git a/frontend/package.json b/frontend/package.json
index 5256f7a73..924249368 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -57,7 +57,7 @@
"@inlang/paraglide-js": "2.21.0",
"@internationalized/date": "^3.12.2",
"@prettier/plugin-oxc": "^0.2.1",
- "@sveltejs/adapter-static": "^4.0.0-next.0",
+ "@sveltejs/adapter-static": "^4.0.0-next.1",
"@sveltejs/vite-plugin-svelte": "^7.2.0",
"@tailwindcss/vite": "^4.3.2",
"@tanstack/svelte-query-devtools": "^6.1.36",
@@ -81,7 +81,7 @@
"tailwindcss": "^4.3.2",
"tsx": "^4.23.1",
"tw-animate-css": "^1.4.0",
- "typescript": "npm:@typescript/typescript6@^6.0.0",
+ "typescript": "npm:@typescript/typescript6@^6.0.2",
"typescript-7": "npm:typescript@rc",
"unplugin-icons": "^23.0.1",
"vaul-svelte": "1.0.0-next.7",
diff --git a/frontend/src/lib/hooks/use-url-tab.svelte.ts b/frontend/src/lib/hooks/use-url-tab.svelte.ts
index 39e3141d5..fd60cef40 100644
--- a/frontend/src/lib/hooks/use-url-tab.svelte.ts
+++ b/frontend/src/lib/hooks/use-url-tab.svelte.ts
@@ -11,7 +11,7 @@ type UseUrlTabOptions<T extends string> = {
export function useUrlTab<T extends string>({ validTabs, defaultTab, ready = () => true }: UseUrlTabOptions<T>) {
function currentUrl() {
const reactiveUrl = page.url;
- return typeof window === 'undefined' ? new URL(reactiveUrl) : new URL(window.location.href);
+ return typeof window === 'undefined' ? new URL(reactiveUrl.href) : new URL(window.location.href);
}
function resolveTab(url = currentUrl()) {
diff --git a/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte b/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte
index 0295d020a..de6e2c6f0 100644
--- a/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/gitops/+page.svelte
@@ -56,7 +56,7 @@
setTimeout(() => {
openCreateSyncDialog(typeQuery);
// Remove the query param so it doesn't reopen on refresh
- const newUrl = new URL(page.url);
+ const newUrl = new URL(page.url.href);
newUrl.searchParams.delete('action');
newUrl.searchParams.delete('targetType');
goto(newUrl.toString(), { replaceState: true, keepFocus: true });
diff --git a/frontend/src/routes/(app)/projects/+page.svelte b/frontend/src/routes/(app)/projects/+page.svelte
index d3b7be9c2..a0e18b7cb 100644
--- a/frontend/src/routes/(app)/projects/+page.svelte
+++ b/frontend/src/routes/(app)/projects/+page.svelte
@@ -171,7 +171,7 @@
}
async function toggleArchived(next: boolean) {
- const url = new URL(page.url);
+ const url = new URL(page.url.href);
if (next) {
url.searchParams.set('archived', 'true');
} else {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ba189bb65..16cea2739 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.7
- '@sveltejs/adapter-static': '>=4.0.0-next.0'
+ '@sveltejs/kit': ^3.0.0-next.8
+ '@sveltejs/adapter-static': '>=4.0.0-next.1'
dompurify: '>=3.4.11'
ts-deepmerge: '>=8.0.0'
joi: '>=17.13.4'
@@ -71,6 +71,9 @@ importers:
tsx:
specifier: ^4.23.1
version: 4.23.1
+ typescript:
+ specifier: ^6.0.3
+ version: 6.0.3
frontend:
dependencies:
@@ -117,8 +120,8 @@ importers:
specifier: ^1.2.3
version: 1.2.3
'@sveltejs/kit':
- specifier: ^3.0.0-next.7
+ specifier: ^3.0.0-next.8
'@tanstack/svelte-query':
specifier: ^6.1.36
version: 6.1.36([email protected])
@@ -188,7 +191,7 @@ importers:
version: 2.2.499
'@inlang/paraglide-js':
specifier: 2.21.0
- version: 2.21.0(@typescript/[email protected])
+ version: 2.21.0(@typescript/[email protected])
'@internationalized/date':
specifier: ^3.12.2
version: 3.12.2
@@ -196,8 +199,8 @@ importers:
specifier: ^0.2.1
version: 0.2.1
'@sveltejs/adapter-static':
- specifier: '>=4.0.0-next.0'
+ specifier: '>=4.0.0-next.1'
'@sveltejs/vite-plugin-svelte':
specifier: ^7.2.0
@@ -215,7 +218,7 @@ importers:
version: 7.0.0-dev.20260707.2
bits-ui:
specifier: ^2.18.1
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -224,7 +227,7 @@ importers:
version: 3.4.2
formsnap:
specifier: ^2.0.1
isomorphic-dompurify:
specifier: ^3.18.0
version: 3.18.0
@@ -236,7 +239,7 @@ importers:
version: 1.0.2([email protected])
runed:
specifier: ^0.37.1
shadcn-svelte:
specifier: ^1.4.1
version: 1.4.1([email protected])
@@ -248,10 +251,10 @@ importers:
version: 1.1.1([email protected])
svelte-toolbelt:
specifier: ^0.10.6
sveltekit-superforms:
specifier: ^2.30.2
tailwind-merge:
specifier: ^3.6.0
version: 3.6.0
@@ -268,8 +271,8 @@ importers:
specifier: ^1.4.0
version: 1.4.0
typescript:
- specifier: npm:@typescript/typescript6@^6.0.0
- version: '@typescript/[email protected]'
+ specifier: npm:@typescript/typescript6@^6.0.2
+ version: '@typescript/[email protected]'
typescript-7:
specifier: npm:typescript@rc
@@ -297,6 +300,9 @@ importers:
oxfmt:
specifier: ^0.58.0
version: 0.58.0([email protected])
+ typescript:
+ specifier: ^6.0.3
+ version: 6.0.3
packages:
@@ -1217,19 +1223,19 @@ packages:
peerDependencies:
acorn: ^8.9.0
- '@sveltejs/[email protected]':
- resolution: {integrity: sha512-M2qfNwcHQxHx2yKKvdg7iHeAaOzdKqhh9bs1ajPsETvtfaXCFXFlbkRoLBhtINnz7N4tP9hRtODOfyEaMkgaDQ==}
+ '@sveltejs/[email protected]':
+ resolution: {integrity: sha512-B8Go4HflODgz7wjwblL4KCg8nlIB5Twj0LZOTULai7ssfs/yKaPQxtQphwn5zrbo+k7gLL/ddf+Ak4BmsYYwmw==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.7
+ '@sveltejs/kit': ^3.0.0-next.8
- '@sveltejs/[email protected]':
- resolution: {integrity: sha512-AT1MpWiLGJTM113cSCyL3vQWspZt099ejZqDBnLRihl+ZIitmYMxl/m6HWO8veVfQdOfp6n5oBpEZuAAR/Vw9Q==}
+ '@sveltejs/[email protected]':
+ resolution: {integrity: sha512-DVTFPFAooqnG37ph5FR3CaUcilfqiqj68IsIW6hk+vZG8m6aOZTSJLdNA1mlNI2ji8xP/aNwD2Ejugdf+3Tm1g==}
engines: {node: '>=22'}
hasBin: true
peerDependencies:
'@opentelemetry/api': ^1.0.0
'@sveltejs/vite-plugin-svelte': ^7.0.0
- svelte: ^5.48.0
+ svelte: ^5.56.4
typescript: ^6.0.0
vite: ^8.0.12
peerDependenciesMeta:
@@ -1610,8 +1616,8 @@ packages:
cpu: [x64]
os: [win32]
- '@typescript/[email protected]':
- resolution: {integrity: sha512-JbesA1Y3wSOYpcw4b4XvG8KCk9AaStATxk1Vmc1qY0Y30fjovvcuRXX2fJ8eC2JRycKQi7V1VYKUljSVBJUzZA==}
+ '@typescript/[email protected]':
+ resolution: {integrity: sha512-mbCddXd+jm7hfx7w2YU64/Av4/NqqeG3GoRZgxPcgoTxYjhrcfJRw9ULch71SS4G+Q3bOXFhRvPqjguN0Hyp5w==}
hasBin: true
@@ -2587,7 +2593,7 @@ packages:
resolution: {integrity: sha512-2F4Q/FZzbeJTFdIS/PuOoPRSm92sA2LhzTnv6FXhCoENb3huf5+fDuNOg1LNvGOouy3u/225qxmuJvcV3IZK5Q==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.7
+ '@sveltejs/kit': ^3.0.0-next.8
svelte: ^5.7.0
peerDependenciesMeta:
'@sveltejs/kit':
@@ -2596,7 +2602,7 @@ packages:
resolution: {integrity: sha512-MeFY73xBW8IueWBm012nNFIGy19WUGPLtknavyUPMpnyt350M47PhGSGrGoSLbidwn+Zlt/O0cp8/OZE3LASWA==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.7
+ '@sveltejs/kit': ^3.0.0-next.8
svelte: ^5.7.0
zod: ^4.1.0
peerDependenciesMeta:
@@ -2754,7 +2760,7 @@ packages:
resolution: {integrity: sha512-6sR70ZfjFMAfdNure/Bu26o1rY32+WGxebko1L8jUFS+qZw5fxIHBPkUaTpNBkOIlJZ/UJwoNCYCm5xK2Z7Kqw==}
peerDependencies:
- '@sveltejs/kit': ^3.0.0-next.7
+ '@sveltejs/kit': ^3.0.0-next.8
svelte: 3.x || 4.x || >=5.0.0-next.51
@@ -3460,7 +3466,7 @@ snapshots:
'@iconify/types': 2.0.0
import-meta-resolve: 4.2.0
- '@inlang/[email protected](@typescript/[email protected])':
+ '@inlang/[email protected](@typescript/[email protected])':
dependencies:
'@inlang/recommend-sherlock': 0.2.1
'@inlang/sdk': 2.10.2
@@ -3470,7 +3476,7 @@ snapshots:
unplugin: 2.3.11
urlpattern-polyfill: 10.1.0
optionalDependencies:
- typescript: '@typescript/[email protected]'
+ typescript: '@typescript/[email protected]'
transitivePeerDependencies:
- babel-plugin-macros
@@ -3811,11 +3817,11 @@ snapshots:
dependencies:
acorn: 8.17.0
dependencies:
dependencies:
'@standard-schema/spec': 1.1.0
'@sveltejs/acorn-typescript': 1.0.10([email protected])
@@ -3830,7 +3836,7 @@ snapshots:
svelte: 5.56.4
optionalDependencies:
- typescript: '@typescript/[email protected]'
+ typescript: '@typescript/[email protected]'
dependencies:
@@ -4104,9 +4110,9 @@ snapshots:
'@typescript/[email protected]':
optional: true
- '@typescript/[email protected]':
+ '@typescript/[email protected]':
dependencies:
- typescript: 6.0.3
+ '@typescript/old': [email protected]
'@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
dependencies:
@@ -4114,9 +4120,9 @@ snapshots:
'@codemirror/state': 6.7.1
'@codemirror/view': 6.43.6
dependencies:
- valibot: 1.4.2(@typescript/[email protected])
+ valibot: 1.4.2(@typescript/[email protected])
optional: true
'@vinejs/[email protected]':
@@ -4217,15 +4223,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.4
tabbable: 6.4.0
transitivePeerDependencies:
- '@sveltejs/kit'
@@ -4536,11 +4542,11 @@ snapshots:
optionalDependencies:
picomatch: 4.0.5
dependencies:
svelte: 5.56.4
svelte-toolbelt: 0.5.0([email protected])
optional: true
@@ -5075,23 +5081,23 @@ snapshots:
esm-env: 1.2.2
svelte: 5.56.4
dependencies:
dequal: 2.0.3
esm-env: 1.2.2
lz-string: 1.5.0
svelte: 5.56.4
optionalDependencies:
dependencies:
dequal: 2.0.3
esm-env: 1.2.2
lz-string: 1.5.0
svelte: 5.56.4
optionalDependencies:
zod: 4.4.3
@@ -5230,10 +5236,10 @@ snapshots:
runed: 0.28.0([email protected])
svelte: 5.56.4
dependencies:
clsx: 2.1.1
style-to-object: 1.0.14
svelte: 5.56.4
transitivePeerDependencies:
@@ -5280,9 +5286,9 @@ snapshots:
transitivePeerDependencies:
- '@typescript-eslint/types'
dependencies:
devalue: 5.8.1
memoize-weak: 1.0.2
svelte: 5.56.4
@@ -5291,7 +5297,7 @@ snapshots:
'@exodus/schemasafe': 1.3.0
'@standard-schema/spec': 1.1.0
'@typeschema/class-validator': 0.3.0([email protected])
- '@valibot/to-json-schema': 1.7.1([email protected](@typescript/[email protected]))
+ '@valibot/to-json-schema': 1.7.1([email protected](@typescript/[email protected]))
'@vinejs/vine': 3.0.1
arktype: 2.2.3
class-validator: 0.14.4
@@ -5300,7 +5306,7 @@ snapshots:
json-schema-to-ts: 3.1.1
superstruct: 2.0.2
typebox: 1.3.4
- valibot: 1.4.2(@typescript/[email protected])
+ valibot: 1.4.2(@typescript/[email protected])
yup: 1.7.1
zod: 4.4.3
zod-v3-to-json-schema: 4.0.0([email protected])
@@ -5442,9 +5448,9 @@ snapshots:
optionalDependencies:
- typescript: '@typescript/[email protected]'
+ typescript: '@typescript/[email protected]'
optional: true
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3682e0139..6b28f9b13 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -26,8 +26,8 @@ overrides:
uuid: ">=11.1.1"
fast-uri: ">=3.1.2"
ws: ">=8.20.1"
- "@sveltejs/kit": "^3.0.0-next.7"
- "@sveltejs/adapter-static": ">=4.0.0-next.0"
+ "@sveltejs/kit": "^3.0.0-next.8"
+ "@sveltejs/adapter-static": ">=4.0.0-next.1"
dompurify: ">=3.4.11"
ts-deepmerge: ">=8.0.0"
joi: ">=17.13.4"
diff --git a/tests/package.json b/tests/package.json
index 35776bc2d..9d6af73ca 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -3,11 +3,13 @@
"name": "arcane-tests",
"scripts": {
"preinstall": "npx only-allow pnpm",
+ "check": "tsc --noEmit",
"test": "playwright test"
},
"devDependencies": {
"@playwright/test": "^1.61.1",
"@types/node": "^26.1.0",
- "oxfmt": "^0.58.0"
+ "oxfmt": "^0.58.0",
+ "typescript": "^6.0.3"
}
}
diff --git a/tests/spec/builds.spec.ts b/tests/spec/builds.spec.ts
index efb2e106e..11c474136 100644
--- a/tests/spec/builds.spec.ts
+++ b/tests/spec/builds.spec.ts
@@ -171,9 +171,9 @@ test.describe('Build workspace provider flows', () => {
.fill('https://git.sr.ht/~jordanreger/nws-alerts#main:docker/app');
await setRequiredBuildInputs(page, `e2e/remote:${Date.now()}`);
- let buildPayload: Record<string, unknown> | null = null;
+ const buildRequest = { payload: null as Record<string, unknown> | null };
await page.route('**/api/environments/*/images/build', async (route) => {
- buildPayload = route.request().postDataJSON() as Record<string, unknown>;
+ buildRequest.payload = route.request().postDataJSON() as Record<string, unknown>;
await route.fulfill({
status: 200,
contentType: 'application/x-ndjson',
@@ -182,11 +182,11 @@ test.describe('Build workspace provider flows', () => {
});
await getBuildButton(page).click();
- await expect.poll(() => buildPayload, { timeout: 10000 }).not.toBeNull();
+ await expect.poll(() => buildRequest.payload, { timeout: 10000 }).not.toBeNull();
- expect(buildPayload?.contextDir).toBe(
- 'https://git.sr.ht/~jordanreger/nws-alerts#main:docker/app'
- );
+ expect(buildRequest.payload).toMatchObject({
+ contextDir: 'https://git.sr.ht/~jordanreger/nws-alerts#main:docker/app'
+ });
});
test('submits local provider build payload from UI controls', async ({ page }) => {
@@ -202,10 +202,10 @@ test.describe('Build workspace provider flows', () => {
await ensureSwitchState(pushSwitch, true);
await ensureSwitchState(loadSwitch, true);
- let buildPayload: Record<string, unknown> | null = null;
+ const buildRequest = { payload: null as Record<string, unknown> | null };
await page.route('**/api/environments/*/images/build', async (route) => {
- buildPayload = route.request().postDataJSON() as Record<string, unknown>;
+ buildRequest.payload = route.request().postDataJSON() as Record<string, unknown>;
await route.fulfill({
status: 200,
contentType: 'application/x-ndjson',
@@ -215,11 +215,13 @@ test.describe('Build workspace provider flows', () => {
await page.getByRole('button', { name: 'Build', exact: true }).first().click();
- await expect.poll(() => buildPayload, { timeout: 10000 }).not.toBeNull();
+ await expect.poll(() => buildRequest.payload, { timeout: 10000 }).not.toBeNull();
- expect(buildPayload?.provider).toBe('local');
- expect(buildPayload?.push).toBe(true);
- expect(buildPayload?.load).toBe(true);
+ expect(buildRequest.payload).toMatchObject({
+ provider: 'local',
+ push: true,
+ load: true
+ });
await expect(page.getByText('Build completed').first()).toBeVisible();
});
@@ -234,10 +236,10 @@ test.describe('Build workspace provider flows', () => {
const loadSwitch = page.locator('#build-load');
await expect(loadSwitch).toBeDisabled();
- let buildPayload: Record<string, unknown> | null = null;
+ const buildRequest = { payload: null as Record<string, unknown> | null };
await page.route('**/api/environments/*/images/build', async (route) => {
- buildPayload = route.request().postDataJSON() as Record<string, unknown>;
+ buildRequest.payload = route.request().postDataJSON() as Record<string, unknown>;
await route.fulfill({
status: 200,
contentType: 'application/x-ndjson',
@@ -247,11 +249,13 @@ test.describe('Build workspace provider flows', () => {
await page.getByRole('button', { name: 'Build', exact: true }).first().click();
- await expect.poll(() => buildPayload, { timeout: 10000 }).not.toBeNull();
+ await expect.poll(() => buildRequest.payload, { timeout: 10000 }).not.toBeNull();
- expect(buildPayload?.provider).toBe('depot');
- expect(buildPayload?.push).toBe(true);
- expect(buildPayload?.load).toBe(false);
+ expect(buildRequest.payload).toMatchObject({
+ provider: 'depot',
+ push: true,
+ load: false
+ });
});
test('maps advanced local build options from UI into build request payload', async ({ page }) => {
diff --git a/tests/spec/containers.spec.ts b/tests/spec/containers.spec.ts
index 4ee8e10e7..d6f41f989 100644
--- a/tests/spec/containers.spec.ts
+++ b/tests/spec/containers.spec.ts
@@ -105,7 +105,7 @@ test.describe('Containers Page', () => {
await navigateToContainers(page);
if (running) {
- const runningName = running.names[0]?.replace(/^\/+/, '') ?? running.id;
+ const runningName = running.names?.[0]?.replace(/^\/+/, '') ?? running.id;
const row = page
.getByRole('row')
.filter({ has: page.getByRole('link', { name: runningName, exact: true }) });
@@ -121,7 +121,7 @@ test.describe('Containers Page', () => {
}
if (stopped) {
- const stoppedName = stopped.names[0]?.replace(/^\/+/, '') ?? stopped.id;
+ const stoppedName = stopped.names?.[0]?.replace(/^\/+/, '') ?? stopped.id;
const row = page
.getByRole('row')
.filter({ has: page.getByRole('link', { name: stoppedName, exact: true }) });
@@ -142,7 +142,7 @@ test.describe('Containers Page', () => {
await navigateToContainers(page);
- const containerName = any.names[0]?.replace(/^\/+/, '') ?? any.id;
+ const containerName = any.names?.[0]?.replace(/^\/+/, '') ?? any.id;
const row = page
.getByRole('row')
.filter({ has: page.getByRole('link', { name: containerName, exact: true }) });
diff --git a/tests/spec/docker-runtime-identity.spec.ts b/tests/spec/docker-runtime-identity.spec.ts
index 904bb62ce..4bc4aa4e9 100644
--- a/tests/spec/docker-runtime-identity.spec.ts
+++ b/tests/spec/docker-runtime-identity.spec.ts
@@ -145,7 +145,7 @@ async function waitForHealth(container: string) {
},
{
timeout: 120_000,
- interval: 2_000
+ intervals: [2_000]
}
)
.toBe('UP');
@@ -163,7 +163,7 @@ async function waitForFile(container: string, filePath: string) {
},
{
timeout: 60_000,
- interval: 1_000
+ intervals: [1_000]
}
)
.toBe('present');
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index c2d0ffb8c..1787de40d 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -132,7 +132,12 @@ async function findProjectWithDetailUpdateAction(page: Page): Promise<Project |
continue;
}
- const detail = await fetchProjectDetail(page, project.id || project.name);
+ const projectID = project.id || project.name;
+ if (!projectID) {
+ continue;
+ }
+
+ const detail = await fetchProjectDetail(page, projectID);
if ((detail?.updateInfo?.imageRefs?.length ?? 0) > 0) {
return detail;
}
diff --git a/tests/spec/system-upgrade.spec.ts b/tests/spec/system-upgrade.spec.ts
index ad2963187..ba645186c 100644
--- a/tests/spec/system-upgrade.spec.ts
+++ b/tests/spec/system-upgrade.spec.ts
@@ -67,13 +67,13 @@ async function registerReloadCounter(page: Page) {
async function registerTokenSeeding(page: Page) {
await page.addInitScript(
- ([tokenKey, expiryKey]: [string, string]) => {
+ ({ tokenKey, expiryKey }: { tokenKey: string; expiryKey: string }) => {
if (!sessionStorage.getItem(tokenKey)) {
sessionStorage.setItem(tokenKey, 'playwright-test-refresh-token');
sessionStorage.setItem(expiryKey, new Date(Date.now() + 3_600_000).toISOString());
}
},
- [REFRESH_TOKEN_KEY, TOKEN_EXPIRY_KEY]
+ { tokenKey: REFRESH_TOKEN_KEY, expiryKey: TOKEN_EXPIRY_KEY }
);
}
diff --git a/tests/spec/token-refresh.spec.ts b/tests/spec/token-refresh.spec.ts
index f6f2cd57a..038cda9f4 100644
--- a/tests/spec/token-refresh.spec.ts
+++ b/tests/spec/token-refresh.spec.ts
@@ -11,11 +11,11 @@ const REFRESH_COOKIE = 'arcane_refresh_test=complete';
*/
async function registerTokenSeeding(page: Page) {
await page.addInitScript(
- ([tokenKey, expiryKey]: [string, string]) => {
+ ({ tokenKey, expiryKey }: { tokenKey: string; expiryKey: string }) => {
sessionStorage.setItem(tokenKey, 'playwright-test-refresh-token');
sessionStorage.setItem(expiryKey, new Date(Date.now() + 3_600_000).toISOString());
},
- [REFRESH_TOKEN_KEY, TOKEN_EXPIRY_KEY]
+ { tokenKey: REFRESH_TOKEN_KEY, expiryKey: TOKEN_EXPIRY_KEY }
);
}
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
index 8de3d2831..b25726c10 100644
--- a/tests/tsconfig.json
+++ b/tests/tsconfig.json
@@ -1,10 +1,14 @@
{
"compilerOptions": {
"paths": { "*": ["./*"] },
- "lib": ["ES2022"],
+ "lib": ["ES2022", "DOM", "DOM.Iterable"],
"module": "ESNext",
+ "moduleResolution": "bundler",
"target": "ES2022",
"esModuleInterop": true,
- "skipLibCheck": true
+ "noEmit": true,
+ "skipLibCheck": true,
+ "strict": true,
+ "types": ["node"]
}
}