Skip to content

Modern Docker Management, Designed for Everyone

refactor: switch from code-mirror to monaco editor (#1123)

Kyle Mendellc5a5c8a4bee2
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 0cb2716b5..c919cc1cb 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -103,12 +103,6 @@ jobs:
restore-keys: |
${{ runner.os }}-playwright-
- - name: Create Docker Test Resources
- run: |
- docker volume create my-app-data || true
- docker volume create cache || true
- docker network create my-test-network || true
-
- name: Download Arcane Docker image artifact
uses: actions/download-artifact@v7
with:
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 88334ffa2..3ed14d681 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1499,5 +1499,6 @@
"environments_agent_address_description": "The URL where your agent will be accessible",
"environments_generate_config": "Generate Agent Configuration",
"environments_connect_existing_agent": "Connect to Existing Agent",
- "environments_connect_existing_agent_description": "Connect to an already-running agent using a bootstrap token."
+ "environments_connect_existing_agent_description": "Connect to an already-running agent using a bootstrap token.",
+ "project_files": "Project Files"
}
diff --git a/frontend/package.json b/frontend/package.json
index 02c77c689..2d3ba017c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,33 +21,27 @@
"i18n:mark": "i18n-unused mark-unused"
},
"dependencies": {
- "@codemirror/lang-yaml": "^6.1.2",
- "@codemirror/language": "^6.11.3",
- "@codemirror/legacy-modes": "^6.5.2",
- "@codemirror/lint": "^6.9.1",
- "@codemirror/state": "^6.5.2",
- "@codemirror/view": "^6.38.8",
- "@lezer/highlight": "^1.2.3",
"@sveltejs/adapter-static": "^3.0.10",
"@tanstack/table-core": "^8.21.3",
- "@uiw/codemirror-themes": "^4.25.2",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
+ "@shikijs/monaco": "^3.20.0",
+ "shiki": "^3.20.0",
"ansi-to-html": "^0.7.2",
"axios": "^1.13.1",
- "codemirror": "^6.0.2",
"date-fns": "^4.1.0",
"js-yaml": "^4.1.1",
+ "monaco-editor": "^0.55.1",
"prettier": "^3.7.4",
"prettier-plugin-svelte": "^3.4.0",
"prettier-plugin-tailwindcss": "^0.7.2",
- "svelte-codemirror-editor": "^2.1.0"
+ "svelte": "^5.46.0",
+ "@sveltejs/kit": "^2.49.2"
},
"devDependencies": {
"@iconify/json": "^2.2.417",
"@inlang/paraglide-js": "2.7.0",
"@internationalized/date": "^3.10.0",
- "@sveltejs/kit": "^2.49.2",
"@sveltejs/vite-plugin-svelte": "^6.2.1",
"@tailwindcss/vite": "^4.1.18",
"@types/bytes": "^3.1.5",
@@ -63,7 +57,6 @@
"mode-watcher": "^1.1.0",
"paneforge": "^1.0.2",
"runed": "^0.37.0",
- "svelte": "^5.46.0",
"svelte-check": "^4.3.4",
"svelte-sonner": "^1.0.7",
"svelte-toolbelt": "^0.10.6",
diff --git a/frontend/src/lib/components/code-editor/editor.svelte b/frontend/src/lib/components/code-editor/editor.svelte
deleted file mode 100644
index 13966c9a8..000000000
--- a/frontend/src/lib/components/code-editor/editor.svelte
+++ /dev/null
@@ -1,115 +0,0 @@
-<script lang="ts">
- import CodeMirror from 'svelte-codemirror-editor';
- import { yaml } from '@codemirror/lang-yaml';
- import { StreamLanguage } from '@codemirror/language';
- import { properties } from '@codemirror/legacy-modes/mode/properties';
- import { linter, lintGutter } from '@codemirror/lint';
- import jsyaml from 'js-yaml';
- import { arcaneDarkInit } from './theme';
- import type { EditorView } from '@codemirror/view';
- import type { Extension } from '@codemirror/state';
- import type { Diagnostic, LintSource } from '@codemirror/lint';
- import { m } from '$lib/paraglide/messages';
- import configStore from '$lib/stores/config-store';
-
- type CodeLanguage = 'yaml' | 'env';
-
- let {
- value = $bindable(''),
- language = 'yaml' as CodeLanguage,
- placeholder = m.editor_placeholder(),
- readOnly = false,
- fontSize = '12px'
- } = $props();
-
- let editorView: EditorView;
-
- function getLanguageExtension(lang: CodeLanguage): Extension[] {
- const extensions: Extension[] = [];
-
- switch (lang) {
- case 'yaml':
- extensions.push(yaml());
- if (!readOnly) {
- extensions.push(lintGutter(), linter(yamlLinter));
- }
- break;
- case 'env':
- extensions.push(StreamLanguage.define(properties));
- break;
- }
-
- return extensions;
- }
-
- const yamlLinter: LintSource = (view): Diagnostic[] => {
- const diagnostics: Diagnostic[] = [];
- try {
- jsyaml.load(view.state.doc.toString());
- } catch (e: unknown) {
- const err = e as { mark?: { position: number }; message: string };
- const start = err.mark?.position || 0;
- const end = err.mark?.position !== undefined ? Math.max(start + 1, err.mark.position + 1) : start + 1;
- diagnostics.push({
- from: start,
- to: end,
- severity: 'error',
- message: err.message
- });
- }
- return diagnostics;
- };
-
- const theme = $derived.by(() => {
- $configStore;
- return arcaneDarkInit();
- });
-
- const extensions = $derived([...getLanguageExtension(language), theme]);
-
- const styles = $derived({
- '&': {
- fontSize
- },
- '&.cm-editor[contenteditable=false]': {
- cursor: 'not-allowed'
- },
- '.cm-content[contenteditable=false]': {
- cursor: 'not-allowed'
- }
- });
-
- function handleReady(view: EditorView) {
- editorView = view;
- }
-</script>
-
-<CodeMirror
- bind:value
- onready={(view) => handleReady(view)}
- {extensions}
- {styles}
- {placeholder}
- readonly={readOnly}
- nodebounce={true}
-/>
-
-<style>
- :global(.cm-editor) {
- height: 100%;
- }
- :global(.codemirror-wrapper) {
- height: 100%;
- }
- :global(.cm-editor .cm-scroller) {
- overflow: auto;
- }
- :global(.cm-editor .cm-gutters) {
- background-color: #18181b;
- border-right: none;
- }
- :global(.cm-editor .cm-activeLineGutter) {
- background-color: #2c313a;
- color: #e5e7eb;
- }
-</style>
diff --git a/frontend/src/lib/components/code-editor/theme.ts b/frontend/src/lib/components/code-editor/theme.ts
deleted file mode 100644
index 2df6680fd..000000000
--- a/frontend/src/lib/components/code-editor/theme.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { tags as t } from '@lezer/highlight';
-import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
-
-function getAccentColor(): string {
- const primaryColor = getComputedStyle(document.documentElement).getPropertyValue('--primary').trim();
-
- return primaryColor || 'oklch(0.606 0.25 292.717)';
-}
-
-function getAccentColorWithAlpha(alpha: number): string {
- const accentColor = getAccentColor();
-
- if (accentColor.startsWith('oklch')) {
- const hasAlpha = accentColor.includes('/');
- if (hasAlpha) {
- return accentColor.replace(/\/\s*[\d.]+\s*\)/, ` / ${alpha})`);
- }
- return accentColor.replace(')', ` / ${alpha})`);
- }
-
- if (accentColor.startsWith('#')) {
- const r = parseInt(accentColor.slice(1, 3), 16);
- const g = parseInt(accentColor.slice(3, 5), 16);
- const b = parseInt(accentColor.slice(5, 7), 16);
- return `rgba(${r}, ${g}, ${b}, ${alpha})`;
- }
-
- return accentColor;
-}
-
-export const arcaneDarkInit = (options?: Partial<CreateThemeOptions>) => {
- const { theme = 'dark', settings = {}, styles = [] } = options || {};
-
- const accentColor = getAccentColor();
- const accentWithAlpha35 = getAccentColorWithAlpha(0.35);
- const accentWithAlpha15 = getAccentColorWithAlpha(0.15);
- const accentWithAlpha05 = getAccentColorWithAlpha(0.05);
-
- const dynamicSettings: CreateThemeOptions['settings'] = {
- background: '#0d1117',
- foreground: '#c9d1d9',
- caret: accentColor,
- selection: accentWithAlpha35,
- selectionMatch: accentWithAlpha15,
- lineHighlight: accentWithAlpha05,
- gutterBackground: '#0d1117',
- gutterForeground: '#8b949e',
- gutterActiveForeground: '#c9d1d9',
- gutterBorder: 'transparent',
-
- fontFamily:
- '"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
- fontSize: '13px'
- };
-
- const dynamicStyles: CreateThemeOptions['styles'] = [
- { tag: [t.comment, t.meta], color: '#8b949e' },
- { tag: [t.keyword, t.modifier, t.operatorKeyword], color: '#ff7b72' },
-
- { tag: [t.typeName, t.namespace, t.number, t.atom, t.bool], color: '#ffa657' },
- { tag: [t.function(t.variableName), t.labelName], color: accentColor },
- {
- tag: [t.className, t.definition(t.variableName), t.propertyName, t.attributeName],
- color: '#d2a8ff'
- },
-
- { tag: [t.variableName, t.name], color: '#e6edf3' },
- { tag: [t.string, t.inserted, t.regexp, t.special(t.string)], color: '#7ee787' },
- { tag: [t.operator, t.url, t.link, t.escape], color: '#a5d6ff' },
-
- { tag: [t.separator, t.punctuation], color: '#6e7681' },
-
- { tag: t.heading, color: '#e6edf3', fontWeight: 'bold' },
- { tag: t.strong, fontWeight: 'bold' },
- { tag: t.emphasis, fontStyle: 'italic' },
- { tag: t.strikethrough, textDecoration: 'line-through' },
- { tag: t.invalid, color: '#f85149' },
- { tag: t.link, textDecoration: 'underline' }
- ];
-
- return createTheme({
- theme,
- settings: { ...dynamicSettings, ...settings },
- styles: [...dynamicStyles, ...styles]
- });
-};
-
-export const arcaneDark = arcaneDarkInit();
diff --git a/frontend/src/lib/components/monaco-code-editor/editor.svelte b/frontend/src/lib/components/monaco-code-editor/editor.svelte
new file mode 100644
index 000000000..2c6838ff2
--- /dev/null
+++ b/frontend/src/lib/components/monaco-code-editor/editor.svelte
@@ -0,0 +1,148 @@
+<script lang="ts">
+ import { onDestroy, onMount } from 'svelte';
+ import { monaco, initShiki } from './monaco';
+ import { mode } from 'mode-watcher';
+ import jsyaml from 'js-yaml';
+
+ function getCurrentTheme(): string {
+ const isDark = mode.current === 'dark';
+ return isDark ? 'catppuccin-mocha' : 'catppuccin-latte';
+ }
+
+ type CodeLanguage = 'yaml' | 'env';
+
+ let {
+ value = $bindable(''),
+ language = 'yaml' as CodeLanguage,
+ readOnly = false,
+ fontSize = '12px',
+ fileUri = undefined
+ }: {
+ value: string;
+ language: CodeLanguage;
+ readOnly?: boolean;
+ fontSize?: string;
+ fileUri?: string;
+ } = $props();
+
+ let editorElement: HTMLDivElement;
+ let editor: monaco.editor.IStandaloneCodeEditor;
+ let resizeObserver: ResizeObserver | null = null;
+ let model: monaco.editor.ITextModel | null = null;
+ let ownsModel = false;
+
+ function validateYaml() {
+ if (!model || language !== 'yaml' || readOnly) {
+ if (model) monaco.editor.setModelMarkers(model, 'yaml-linter', []);
+ return;
+ }
+
+ const content = model.getValue();
+ try {
+ jsyaml.load(content);
+ monaco.editor.setModelMarkers(model, 'yaml-linter', []);
+ } catch (e: unknown) {
+ const markers: monaco.editor.IMarkerData[] = [];
+ const err = e as { mark?: { line: number; column: number }; reason?: string; message?: string };
+ const mark = err.mark;
+
+ if (mark) {
+ markers.push({
+ severity: monaco.MarkerSeverity.Error,
+ message: err.reason || err.message || 'YAML error',
+ startLineNumber: mark.line + 1,
+ startColumn: mark.column + 1,
+ endLineNumber: mark.line + 1,
+ endColumn: model.getLineMaxColumn(mark.line + 1)
+ });
+ } else {
+ markers.push({
+ severity: monaco.MarkerSeverity.Error,
+ message: err.message || 'YAML error',
+ startLineNumber: 1,
+ startColumn: 1,
+ endLineNumber: 1,
+ endColumn: 1
+ });
+ }
+ monaco.editor.setModelMarkers(model, 'yaml-linter', markers);
+ }
+ }
+
+ onMount(async () => {
+ const langId = language === 'env' ? 'ini' : language;
+
+ await initShiki(monaco);
+
+ // Wait for container to be properly sized
+ await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
+
+ // Create or get model with proper URI for LSP features
+ const uri = fileUri ? monaco.Uri.parse(fileUri) : monaco.Uri.parse(`inmemory://model-${Date.now()}.${langId}`);
+ const existingModel = monaco.editor.getModel(uri);
+ ownsModel = !existingModel;
+ model = existingModel || monaco.editor.createModel(value, langId, uri);
+
+ editor = monaco.editor.create(editorElement, {
+ model: model,
+ automaticLayout: true,
+ theme: getCurrentTheme(),
+ readOnly: readOnly,
+ fontSize: parseInt(fontSize.replace('px', '')),
+ minimap: { enabled: false },
+ scrollBeyondLastLine: false,
+ fontFamily:
+ '"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+ padding: { top: 10, bottom: 10 }
+ });
+
+ model.onDidChangeContent(() => {
+ value = model?.getValue() || '';
+ validateYaml();
+ });
+
+ resizeObserver = new ResizeObserver(() => {
+ editor?.layout();
+ });
+ resizeObserver.observe(editorElement);
+
+ // Force layout update
+ editor.layout();
+ validateYaml();
+ });
+
+ $effect(() => {
+ if (model && value !== model.getValue()) {
+ model.setValue(value);
+ }
+ });
+
+ $effect(() => {
+ if (model) {
+ const langId = language === 'env' ? 'ini' : language;
+ monaco.editor.setModelLanguage(model, langId);
+ validateYaml();
+ }
+ });
+
+ $effect(() => {
+ if (editor) {
+ editor.updateOptions({ readOnly });
+ validateYaml();
+ }
+ });
+
+ // Watch for theme changes and update globally
+ $effect(() => {
+ monaco.editor.setTheme(getCurrentTheme());
+ });
+
+ onDestroy(() => {
+ resizeObserver?.disconnect();
+ resizeObserver = null;
+ editor?.dispose();
+ if (ownsModel) model?.dispose();
+ });
+</script>
+
+<div class="relative h-full min-h-0 w-full overflow-visible" bind:this={editorElement}></div>
diff --git a/frontend/src/lib/components/monaco-code-editor/monaco.ts b/frontend/src/lib/components/monaco-code-editor/monaco.ts
new file mode 100644
index 000000000..ae912379e
--- /dev/null
+++ b/frontend/src/lib/components/monaco-code-editor/monaco.ts
@@ -0,0 +1,62 @@
+import * as monaco from 'monaco-editor';
+import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
+
+// Configure Monaco to use Vite's native web worker support
+// Only the base editor worker is needed for YAML and INI (basic languages)
+self.MonacoEnvironment = {
+ getWorker: () => new editorWorker()
+};
+
+// Register basic languages for syntax highlighting
+import 'monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/ini/ini.contribution.js';
+
+// Import editor implementation
+import 'monaco-editor/esm/vs/editor/editor.all.js';
+
+// Import YAML providers for Docker Compose
+import { registerYamlProviders } from './yaml-providers';
+import { shikiToMonaco } from '@shikijs/monaco';
+import { createHighlighter } from 'shiki';
+
+
+/**
+ * Initialize Shiki highlighter for Monaco
+ */
+let shikiPromise: Promise<void> | null = null;
+
+export async function initShiki(monacoInstance: typeof monaco) {
+ if (shikiPromise) return shikiPromise;
+
+ shikiPromise = (async () => {
+ const highlighter = await createHighlighter({
+ themes: ['catppuccin-mocha', 'catppuccin-latte'],
+ langs: ['yaml', 'ini']
+ });
+
+ // Register the languageIds first. Only registered languages will be highlighted.
+ const registeredLanguages = monacoInstance.languages.getLanguages().map((lang) => lang.id);
+ const langsToRegister = ['yaml', 'ini'];
+
+ for (const lang of langsToRegister) {
+ if (!registeredLanguages.includes(lang)) {
+ monacoInstance.languages.register({ id: lang });
+ }
+ }
+
+ // Register the themes from Shiki, and provide syntax highlighting for Monaco.
+ shikiToMonaco(highlighter, monacoInstance);
+ })();
+
+ return shikiPromise;
+}
+
+// Register YAML language providers
+registerYamlProviders(monaco);
+
+if (typeof window !== 'undefined') {
+ (window as unknown as { monaco: typeof monaco }).monaco = monaco;
+}
+
+export { monaco };
+export type Monaco = typeof monaco;
diff --git a/frontend/src/lib/components/monaco-code-editor/yaml-providers.ts b/frontend/src/lib/components/monaco-code-editor/yaml-providers.ts
new file mode 100644
index 000000000..5ed8a6d3e
--- /dev/null
+++ b/frontend/src/lib/components/monaco-code-editor/yaml-providers.ts
@@ -0,0 +1,151 @@
+import type * as Monaco from 'monaco-editor';
+
+/**
+ * Docker Compose schema definitions for auto-completion and validation
+ */
+const composeSchema = {
+ version: ['3.8', '3.9', '3'],
+ services: {
+ image: 'Image name (e.g., nginx:latest)',
+ container_name: 'Custom container name',
+ ports: 'Port mappings (e.g., "8080:80")',
+ volumes: 'Volume mounts',
+ environment: 'Environment variables',
+ networks: 'Networks to attach',
+ depends_on: 'Service dependencies',
+ command: 'Override default command',
+ entrypoint: 'Override entrypoint',
+ restart: ['no', 'always', 'on-failure', 'unless-stopped'],
+ build: 'Build configuration',
+ labels: 'Container labels',
+ healthcheck: 'Health check configuration',
+ deploy: 'Deploy configuration (Swarm mode)',
+ configs: 'Configuration references',
+ secrets: 'Secret references'
+ },
+ networks: 'Network definitions',
+ volumes: 'Volume definitions',
+ configs: 'Config definitions',
+ secrets: 'Secret definitions'
+};
+
+/**
+ * Register YAML completion provider for Docker Compose files
+ */
+export function registerYamlCompletionProvider(monaco: typeof Monaco) {
+ return monaco.languages.registerCompletionItemProvider('yaml', {
+ triggerCharacters: [' ', ':'],
+ provideCompletionItems: (model, position) => {
+ const lineContent = model.getLineContent(position.lineNumber);
+ const lineUntilPosition = lineContent.substring(0, position.column - 1);
+ const word = model.getWordUntilPosition(position);
+
+ const range = {
+ startLineNumber: position.lineNumber,
+ endLineNumber: position.lineNumber,
+ startColumn: word.startColumn,
+ endColumn: word.endColumn
+ };
+
+ const suggestions: Monaco.languages.CompletionItem[] = [];
+
+ // Root level suggestions
+ if (!lineUntilPosition.trim() || lineUntilPosition.match(/^\s*$/)) {
+ suggestions.push(
+ {
+ label: 'version',
+ kind: monaco.languages.CompletionItemKind.Property,
+ documentation: 'Docker Compose file version',
+ insertText: 'version: "3.8"',
+ range
+ },
+ {
+ label: 'services',
+ kind: monaco.languages.CompletionItemKind.Property,
+ documentation: 'Service definitions',
+ insertText: 'services:\n ${1:service_name}:\n image: ${2:image_name}',
+ insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+ range
+ },
+ {
+ label: 'networks',
+ kind: monaco.languages.CompletionItemKind.Property,
+ documentation: 'Network definitions',
+ insertText: 'networks:\n ${1:network_name}:\n driver: ${2:bridge}',
+ insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+ range
+ },
+ {
+ label: 'volumes',
+ kind: monaco.languages.CompletionItemKind.Property,
+ documentation: 'Volume definitions',
+ insertText: 'volumes:\n ${1:volume_name}:',
+ insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+ range
+ }
+ );
+ }
+
+ // Service property suggestions
+ if (lineUntilPosition.match(/^\s{2,}\w*$/) && model.getValue().includes('services:')) {
+ Object.entries(composeSchema.services).forEach(([key, value]) => {
+ const isArray = Array.isArray(value);
+ suggestions.push({
+ label: key,
+ kind: monaco.languages.CompletionItemKind.Property,
+ documentation: isArray ? `Options: ${value.join(', ')}` : value,
+ insertText: isArray ? `${key}: ${value[0]}` : `${key}: `,
+ range
+ });
+ });
+ }
+
+ return { suggestions };
+ }
+ });
+}
+
+/**
+ * Register YAML hover provider for documentation
+ */
+export function registerYamlHoverProvider(monaco: typeof Monaco) {
+ return monaco.languages.registerHoverProvider('yaml', {
+ provideHover: (model, position) => {
+ const word = model.getWordAtPosition(position);
+ if (!word) return null;
+
+ const docs: Record<string, string> = {
+ version: '**Docker Compose version**\n\nRecommended: `3.8` or `3.9`',
+ services: '**Services**\n\nDefine containers that make up your application',
+ image: '**Image**\n\nDocker image to use (e.g., `nginx:latest`, `postgres:13`)',
+ container_name: '**Container Name**\n\nCustom name for the container',
+ ports: '**Ports**\n\nPort mappings between host and container\n\nFormat: `"HOST:CONTAINER"`',
+ volumes: '**Volumes**\n\nBind mounts or named volumes\n\nFormat: `"./local:/container"`',
+ environment: '**Environment Variables**\n\nSet environment variables in the container',
+ networks: '**Networks**\n\nNetworks to attach this service to',
+ depends_on: '**Dependencies**\n\nServices that must start before this one',
+ restart: '**Restart Policy**\n\nOptions: `no`, `always`, `on-failure`, `unless-stopped`',
+ build: '**Build**\n\nBuild configuration for custom images',
+ command: '**Command**\n\nOverride the default command',
+ healthcheck: '**Health Check**\n\nConfigure container health monitoring'
+ };
+
+ const documentation = docs[word.word];
+ if (documentation) {
+ return {
+ range: new monaco.Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn),
+ contents: [{ value: documentation }]
+ };
+ }
+
+ return null;
+ }
+ });
+}
+
+/**
+ * Register all YAML providers for Docker Compose editing
+ */
+export function registerYamlProviders(monaco: typeof Monaco) {
+ return [registerYamlCompletionProvider(monaco), registerYamlHoverProvider(monaco)];
+}
diff --git a/frontend/src/lib/components/ui/card/card-header.svelte b/frontend/src/lib/components/ui/card/card-header.svelte
index 5b7fd41a7..206f9400e 100644
--- a/frontend/src/lib/components/ui/card/card-header.svelte
+++ b/frontend/src/lib/components/ui/card/card-header.svelte
@@ -25,16 +25,16 @@
> = $props();
const iconVariantClasses = {
- primary: 'from-primary to-primary/80 shadow-primary/25',
- emerald: 'from-emerald-500 to-emerald-600 shadow-emerald-500/25',
- red: 'from-red-500 to-red-600 shadow-red-500/25',
- amber: 'from-amber-500 to-amber-600 shadow-amber-500/25',
- blue: 'from-blue-500 to-blue-600 shadow-blue-500/25',
- purple: 'from-purple-500 to-purple-600 shadow-purple-500/25',
- cyan: 'from-cyan-500 to-cyan-600 shadow-cyan-500/25',
- orange: 'from-orange-500 to-orange-600 shadow-orange-500/25',
- indigo: 'from-indigo-500 to-indigo-600 shadow-indigo-500/25',
- pink: 'from-pink-500 to-pink-600 shadow-pink-500/25'
+ primary: 'from-primary to-primary/80 shadow-primary/25 border border-primary/20',
+ emerald: 'from-emerald-500 to-emerald-600 shadow-emerald-500/25 border border-emerald-400/20',
+ red: 'from-red-500 to-red-600 shadow-red-500/25 border border-red-400/20',
+ amber: 'from-amber-500 to-amber-600 shadow-amber-500/25 border border-amber-400/20',
+ blue: 'from-blue-500 to-blue-600 shadow-blue-500/25 border border-blue-400/20',
+ purple: 'from-purple-500 to-purple-600 shadow-purple-500/25 border border-purple-400/20',
+ cyan: 'from-cyan-500 to-cyan-600 shadow-cyan-500/25 border border-cyan-400/20',
+ orange: 'from-orange-500 to-orange-600 shadow-orange-500/25 border border-orange-400/20',
+ indigo: 'from-indigo-500 to-indigo-600 shadow-indigo-500/25 border border-indigo-400/20',
+ pink: 'from-pink-500 to-pink-600 shadow-pink-500/25 border border-pink-400/20'
};
const isDarkMode = $derived(mode.current === 'dark');
@@ -50,24 +50,37 @@
bind:this={ref}
data-slot="card-header"
class={cn(
- '@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-[[data-slot=card-action]]:grid-cols-[1fr_auto]',
- icon && 'from-primary/3 flex flex-row items-start space-y-0 bg-linear-to-br to-transparent',
- icon && compact ? 'gap-2 p-2' : icon ? 'gap-3 p-3.5' : '',
+ '@container/card-header relative grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-[[data-slot=card-action]]:grid-cols-[1fr_auto]',
+ 'from-muted/60 to-muted/20 dark:from-muted/20 bg-linear-to-b dark:to-transparent',
+ icon && 'flex flex-row items-start space-y-0',
+ icon && compact ? 'gap-2 p-2' : icon ? 'gap-3 p-4' : 'py-5',
icon && enableHover && `transition-colors ${headerHoverClass}`,
className
)}
{...restProps}
>
+ <!-- Top highlight for edge definition -->
+ <div class="pointer-events-none absolute inset-x-0 top-0 h-px bg-white/15 dark:bg-white/5"></div>
+
+ <!-- Subtle inner shadow for depth -->
+ <div
+ class="pointer-events-none absolute inset-x-0 top-0 h-12 bg-linear-to-b from-black/[0.03] to-transparent dark:from-black/[0.15]"
+ ></div>
+
{#if icon}
{@const IconComponent = loading ? Spinner : icon}
- <div
- class={cn(
- 'flex shrink-0 items-center justify-center rounded-full bg-linear-to-br shadow-lg transition-transform group-[&:not(:has(button:hover,a:hover,[role=button]:hover))]:hover:scale-105',
- iconVariantClasses[iconVariant],
- compact ? 'size-8 sm:size-10' : 'size-10'
- )}
- >
- <IconComponent class={cn('text-white', compact ? 'size-4 sm:size-5' : 'size-5')} />
+ <div class="relative shrink-0">
+ <div
+ class={cn(
+ 'relative flex items-center justify-center rounded-xl bg-linear-to-br shadow-[0_1px_2px_rgba(0,0,0,0.1),0_4px_12px_-2px_rgba(0,0,0,0.15)] ring-1 ring-black/10 transition-all duration-300 group-[&:not(:has(button:hover,a:hover,[role=button]:hover))]:hover:scale-105 dark:ring-white/20',
+ iconVariantClasses[iconVariant],
+ compact ? 'size-8 sm:size-10' : 'size-10'
+ )}
+ >
+ <!-- Inner bevel for the icon container -->
+ <div class="pointer-events-none absolute inset-0 rounded-xl border-t border-white/20"></div>
+ <IconComponent class={cn('text-white drop-shadow-md', compact ? 'size-4 sm:size-5' : 'size-5')} />
+ </div>
</div>
{/if}
{@render children?.()}
diff --git a/frontend/src/lib/layouts/tabbed-page-layout.svelte b/frontend/src/lib/layouts/tabbed-page-layout.svelte
index 64eee1e3e..0ad061f3d 100644
--- a/frontend/src/lib/layouts/tabbed-page-layout.svelte
+++ b/frontend/src/lib/layouts/tabbed-page-layout.svelte
@@ -35,18 +35,23 @@
showFloatingHeader = false
}: Props = $props();
+ let scrollContainer = $state<HTMLDivElement | null>(null);
+
$effect(() => {
- if (browser) {
- const onScroll = () => {
- showFloatingHeader = window.scrollY > 100;
- };
- window.addEventListener('scroll', onScroll);
- return () => window.removeEventListener('scroll', onScroll);
- }
+ if (!browser) return;
+ const getScrollTop = () => (scrollContainer ? scrollContainer.scrollTop : window.scrollY);
+ const onScroll = () => {
+ showFloatingHeader = getScrollTop() > 100;
+ };
+
+ const target: Window | HTMLDivElement = scrollContainer ?? window;
+ target.addEventListener('scroll', onScroll as EventListener);
+ onScroll();
+ return () => target.removeEventListener('scroll', onScroll as EventListener);
});
</script>
-<div class={cn('bg-background flex min-h-0 flex-col', className)}>
+<div class={cn('bg-background flex h-dvh min-h-0 flex-col', className)}>
<Tabs.Root value={selectedTab} class="flex min-h-0 w-full flex-1 flex-col">
<div
class="sticky top-0 border-b transition-all duration-300"
@@ -96,8 +101,8 @@
</div>
{/if}
- <div class="min-h-0 flex-1 overflow-hidden">
- <div class="h-full px-1 py-4 sm:px-4">
+ <div class="min-h-0 flex-1 overflow-y-auto" bind:this={scrollContainer}>
+ <div class="h-full px-1 py-4 pb-2 sm:px-4">
{@render tabContent(selectedTab)}
</div>
</div>
diff --git a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
index 885337cc8..6d60cc9e8 100644
--- a/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/[id]/+page.svelte
@@ -3,7 +3,7 @@
import * as Card from '$lib/components/ui/card';
import { Badge } from '$lib/components/ui/badge';
import { Spinner } from '$lib/components/ui/spinner';
- import CodeEditor from '$lib/components/code-editor/editor.svelte';
+ import CodeEditor from '$lib/components/monaco-code-editor/editor.svelte';
import { goto, invalidateAll } from '$app/navigation';
import { m } from '$lib/paraglide/messages.js';
import { templateService } from '$lib/services/template-service';
@@ -212,9 +212,9 @@
<Card.Description>{m.templates_service_definitions()}</Card.Description>
</div>
</Card.Header>
- <Card.Content class="min-h-[500px] flex-grow p-0 lg:h-full">
- <div class="h-full rounded-t-none rounded-b-xl [&_.cm-content]:text-xs sm:[&_.cm-content]:text-sm">
- <CodeEditor bind:value={compose} language="yaml" readOnly={true} />
+ <Card.Content class="flex min-h-[500px] min-w-0 flex-grow flex-col p-0 lg:h-full">
+ <div class="min-h-0 min-w-0 flex-1 rounded-t-none rounded-b-xl">
+ <CodeEditor bind:value={compose} language="yaml" readOnly={true} fontSize="13px" />
</div>
</Card.Content>
</Card.Root>
@@ -282,9 +282,9 @@
<Card.Description>{m.templates_raw_env_config()}</Card.Description>
</div>
</Card.Header>
- <Card.Content class="h-[500px] flex-grow p-0 lg:h-full">
- <div class="h-full rounded-b-xl [&_.cm-content]:text-xs sm:[&_.cm-content]:text-sm">
- <CodeEditor bind:value={env} language="env" readOnly={true} />
+ <Card.Content class="flex h-[500px] min-w-0 flex-grow flex-col p-0 lg:h-full">
+ <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
+ <CodeEditor bind:value={env} language="env" readOnly={true} fontSize="13px" />
</div>
</Card.Content>
</Card.Root>
diff --git a/frontend/src/routes/(app)/customize/templates/default/+page.svelte b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
index d7e3bf209..082d40442 100644
--- a/frontend/src/routes/(app)/customize/templates/default/+page.svelte
+++ b/frontend/src/routes/(app)/customize/templates/default/+page.svelte
@@ -2,7 +2,7 @@
import { Button } from '$lib/components/ui/button';
import * as Card from '$lib/components/ui/card';
import { toast } from 'svelte-sonner';
- import CodeEditor from '$lib/components/code-editor/editor.svelte';
+ import CodeEditor from '$lib/components/monaco-code-editor/editor.svelte';
import { createForm } from '$lib/utils/form.utils';
import { tryCatch } from '$lib/utils/try-catch';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
@@ -84,7 +84,7 @@
}
</script>
-<div class="container mx-auto max-w-full space-y-6 overflow-hidden p-2 sm:p-6">
+<div class="container mx-auto flex h-dvh min-h-0 max-w-full flex-col gap-6 overflow-hidden p-2 pb-10 sm:p-6 sm:pb-10">
<div class="space-y-3 sm:space-y-4">
<Button variant="ghost" onclick={() => goto('/customize/templates')} class="w-fit gap-2">
<ArrowLeftIcon class="size-4" />
@@ -113,8 +113,8 @@
</div>
</div>
- <div class="grid grid-cols-1 gap-6 lg:grid-cols-5 lg:items-stretch">
- <Card.Root class="flex min-w-0 flex-col lg:col-span-3">
+ <div class="grid min-h-0 flex-1 grid-cols-1 gap-6 lg:grid-cols-5 lg:items-stretch">
+ <Card.Root class="flex h-full min-h-0 min-w-0 flex-col lg:col-span-3">
<Card.Header icon={CodeIcon} class="shrink-0">
<div class="flex flex-col space-y-1.5">
<Card.Title>
@@ -123,9 +123,14 @@
<Card.Description>{m.templates_service_definitions()}</Card.Description>
</div>
</Card.Header>
- <Card.Content class="min-h-[500px] grow p-0 lg:h-full">
- <div class="h-full rounded-b-xl [&_.cm-content]:text-xs sm:[&_.cm-content]:text-sm">
- <CodeEditor bind:value={$inputs.composeContent.value} language="yaml" readOnly={saving || isLoadingTemplate} />
+ <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
+ <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
+ <CodeEditor
+ bind:value={$inputs.composeContent.value}
+ language="yaml"
+ readOnly={saving || isLoadingTemplate}
+ fontSize="13px"
+ />
</div>
</Card.Content>
{#if $inputs.composeContent.error}
@@ -137,7 +142,7 @@
{/if}
</Card.Root>
- <Card.Root class="flex min-w-0 flex-col lg:col-span-2">
+ <Card.Root class="flex h-full min-h-0 min-w-0 flex-col lg:col-span-2">
<Card.Header icon={VariableIcon} class="shrink-0">
<div class="flex flex-col space-y-1.5">
<Card.Title>
@@ -146,9 +151,14 @@
<Card.Description>{m.templates_default_config_values()}</Card.Description>
</div>
</Card.Header>
- <Card.Content class="min-h-[500px] grow p-0 lg:h-full">
- <div class="h-full rounded-b-xl [&_.cm-content]:text-xs sm:[&_.cm-content]:text-sm">
- <CodeEditor bind:value={$inputs.envContent.value} language="env" readOnly={saving || isLoadingTemplate} />
+ <Card.Content class="flex min-h-0 min-w-0 flex-1 flex-col p-0">
+ <div class="min-h-0 min-w-0 flex-1 rounded-b-xl">
+ <CodeEditor
+ bind:value={$inputs.envContent.value}
+ language="env"
+ readOnly={saving || isLoadingTemplate}
+ fontSize="13px"
+ />
</div>
</Card.Content>
{#if $inputs.envContent.error}
diff --git a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
index 7b4767868..390f0b42f 100644
--- a/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
+++ b/frontend/src/routes/(app)/projects/[projectId]/+page.svelte
@@ -3,6 +3,7 @@
import { Button } from '$lib/components/ui/button/index.js';
import * as Tabs from '$lib/components/ui/tabs/index.js';
import * as TreeView from '$lib/components/ui/tree-view/index.js';
+ import * as Card from '$lib/components/ui/card';
import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { ArrowLeftIcon, ProjectsIcon, LayersIcon, SettingsIcon, FileTextIcon } from '$lib/icons';
import { type TabItem } from '$lib/components/tab-bar/index.js';
@@ -311,168 +312,167 @@
<ServicesGrid services={project.runtimeServices} {projectId} />
</Tabs.Content>
- <Tabs.Content value="compose" class="h-full">
- <div class="mb-4">
- <SwitchWithLabel
- id="layout-mode-toggle"
- checked={layoutMode === 'tree'}
- label={layoutMode === 'tree' ? m.tree_view() : m.classic()}
- description={m.project_view_description()}
- onCheckedChange={(checked) => {
- layoutMode = checked ? 'tree' : 'classic';
- if (checked) {
- selectedFile = 'compose';
- selectedIncludeTab = null;
- }
- persistPrefs();
- }}
- />
- </div>
+ <Tabs.Content value="compose" class="h-full min-h-0">
+ <div class="flex h-full min-h-0 flex-col">
+ <div class="mb-4 flex-shrink-0">
+ <SwitchWithLabel
+ id="layout-mode-toggle"
+ checked={layoutMode === 'tree'}
+ label={layoutMode === 'tree' ? m.tree_view() : m.classic()}
+ description={m.project_view_description()}
+ onCheckedChange={(checked) => {
+ layoutMode = checked ? 'tree' : 'classic';
+ if (checked) {
+ selectedFile = 'compose';
+ selectedIncludeTab = null;
+ }
+ persistPrefs();
+ }}
+ />
+ </div>
- {#if layoutMode === 'tree'}
- <div class="flex h-full flex-col gap-4 lg:flex-row">
- <div
- class="border-border bg-card flex w-full flex-col overflow-y-auto rounded-lg border lg:h-full lg:w-fit lg:max-w-xs lg:min-w-48"
- >
- <div class="border-border border-b p-3">
- <h3 class="text-sm font-medium">Project Files</h3>
+ <div class="min-h-0 flex-1">
+ {#if layoutMode === 'tree'}
+ <div class="flex h-full min-h-0 flex-col gap-4 lg:flex-row">
+ <Card.Root class="mb-10 flex min-h-0 w-full flex-1 flex-col overflow-hidden lg:w-fit lg:max-w-xs lg:min-w-48">
+ <Card.Header icon={FileTextIcon} class="flex-shrink-0 items-center">
+ <Card.Title>
+ <h2>{m.project_files()}</h2>
+ </Card.Title>
+ </Card.Header>
+ <Card.Content class="min-h-0 flex-1 overflow-y-auto p-2">
+ <TreeView.Root class="p-2">
+ <TreeView.File
+ name="compose.yaml"
+ onclick={() => (selectedFile = 'compose')}
+ class={selectedFile === 'compose' ? 'bg-accent' : ''}
+ >
+ {#snippet icon()}
+ <FileTextIcon class="size-4 text-blue-500" />
+ {/snippet}
+ </TreeView.File>
+
+ <TreeView.File
+ name=".env"
+ onclick={() => (selectedFile = 'env')}
+ class={selectedFile === 'env' ? 'bg-accent' : ''}
+ >
+ {#snippet icon()}
+ <FileTextIcon class="size-4 text-green-500" />
+ {/snippet}
+ </TreeView.File>
+
+ {#if project?.includeFiles && project.includeFiles.length > 0}
+ <TreeView.Folder name="Includes">
+ {#each project.includeFiles as includeFile}
+ <TreeView.File
+ name={includeFile.relativePath}
+ onclick={() => (selectedFile = includeFile.relativePath)}
+ class={selectedFile === includeFile.relativePath ? 'bg-accent' : ''}
+ >
+ {#snippet icon()}
+ <FileTextIcon class="size-4 text-amber-500" />
+ {/snippet}
+ </TreeView.File>
+ {/each}
+ </TreeView.Folder>
+ {/if}
+ </TreeView.Root>
+ </Card.Content>
+ </Card.Root>
+
+ <div class="flex h-full min-h-0 flex-1 flex-col">
+ {#if selectedFile === 'compose'}
+ <CodePanel
+ bind:open={composeOpen}
+ title="compose.yaml"
+ language="yaml"
+ bind:value={$inputs.composeContent.value}
+ error={$inputs.composeContent.error ?? undefined}
+ />
+ {:else if selectedFile === 'env'}
+ <CodePanel
+ bind:open={envOpen}
+ title=".env"
+ language="env"
+ bind:value={$inputs.envContent.value}
+ error={$inputs.envContent.error ?? undefined}
+ />
+ {:else}
+ {@const includeFile = project?.includeFiles?.find((f) => f.relativePath === selectedFile)}
+ {#if includeFile}
+ <CodePanel
+ bind:open={includeFilesPanelStates[includeFile.relativePath]}
+ title={includeFile.relativePath}
+ language="yaml"
+ bind:value={includeFilesState[includeFile.relativePath]}
+ />
+ {/if}
+ {/if}
+ </div>
</div>
- <div class="p-2">
- <TreeView.Root class="p-2">
- <TreeView.File
- name="compose.yaml"
- onclick={() => (selectedFile = 'compose')}
- class={selectedFile === 'compose' ? 'bg-accent' : ''}
- >
- {#snippet icon()}
- <FileTextIcon class="size-4 text-blue-500" />
- {/snippet}
- </TreeView.File>
-
- <TreeView.File
- name=".env"
- onclick={() => (selectedFile = 'env')}
- class={selectedFile === 'env' ? 'bg-accent' : ''}
- >
- {#snippet icon()}
- <FileTextIcon class="size-4 text-green-500" />
- {/snippet}
- </TreeView.File>
-
- {#if project?.includeFiles && project.includeFiles.length > 0}
- <TreeView.Folder name="Includes">
+ {:else}
+ <div class="flex h-full min-h-0 flex-col gap-4">
+ {#if project?.includeFiles && project.includeFiles.length > 0}
+ <div class="border-border bg-card rounded-lg border">
+ <div class="border-border scrollbar-hide flex gap-2 overflow-x-auto border-b p-2">
{#each project.includeFiles as includeFile}
- <TreeView.File
- name={includeFile.relativePath}
- onclick={() => (selectedFile = includeFile.relativePath)}
- class={selectedFile === includeFile.relativePath ? 'bg-accent' : ''}
+ <Button
+ variant={selectedIncludeTab === includeFile.relativePath ? 'default' : 'ghost'}
+ size="sm"
+ class="flex-shrink-0"
+ onclick={() => {
+ selectedIncludeTab =
+ selectedIncludeTab === includeFile.relativePath ? null : includeFile.relativePath;
+ }}
>
- {#snippet icon()}
- <FileTextIcon class="size-4 text-amber-500" />
- {/snippet}
- </TreeView.File>
+ <FileTextIcon class="mr-2 size-4 text-amber-500" />
+ {includeFile.relativePath}
+ </Button>
{/each}
- </TreeView.Folder>
- {/if}
- </TreeView.Root>
- </div>
- </div>
-
- <div class="flex h-full flex-1 flex-col">
- {#if selectedFile === 'compose'}
- <CodePanel
- bind:open={composeOpen}
- title="compose.yaml"
- language="yaml"
- bind:value={$inputs.composeContent.value}
- placeholder={m.compose_compose_placeholder()}
- error={$inputs.composeContent.error ?? undefined}
- />
- {:else if selectedFile === 'env'}
- <CodePanel
- bind:open={envOpen}
- title=".env"
- language="env"
- bind:value={$inputs.envContent.value}
- placeholder={m.compose_env_placeholder()}
- error={$inputs.envContent.error ?? undefined}
- />
- {:else}
- {@const includeFile = project?.includeFiles?.find((f) => f.relativePath === selectedFile)}
- {#if includeFile}
- <CodePanel
- bind:open={includeFilesPanelStates[includeFile.relativePath]}
- title={includeFile.relativePath}
- language="yaml"
- bind:value={includeFilesState[includeFile.relativePath]}
- placeholder="# Include file content"
- />
+ </div>
+ </div>
{/if}
- {/if}
- </div>
- </div>
- {:else}
- <div class="flex h-full flex-col gap-4">
- {#if project?.includeFiles && project.includeFiles.length > 0}
- <div class="border-border bg-card rounded-lg border">
- <div class="border-border scrollbar-hide flex gap-2 overflow-x-auto border-b p-2">
- {#each project.includeFiles as includeFile}
- <Button
- variant={selectedIncludeTab === includeFile.relativePath ? 'default' : 'ghost'}
- size="sm"
- class="flex-shrink-0"
- onclick={() => {
- selectedIncludeTab = selectedIncludeTab === includeFile.relativePath ? null : includeFile.relativePath;
- }}
- >
- <FileTextIcon class="mr-2 size-4 text-amber-500" />
- {includeFile.relativePath}
- </Button>
- {/each}
- </div>
- </div>
- {/if}
-
- {#if selectedIncludeTab}
- {@const includeFile = project?.includeFiles?.find((f) => f.relativePath === selectedIncludeTab)}
- {#if includeFile}
- <div class="flex-1">
- <CodePanel
- bind:open={includeFilesPanelStates[includeFile.relativePath]}
- title={includeFile.relativePath}
- language="yaml"
- bind:value={includeFilesState[includeFile.relativePath]}
- placeholder="# Include file content"
- />
- </div>
- {/if}
- {:else}
- <div class="grid h-full flex-1 grid-cols-1 gap-4 lg:grid-cols-5">
- <div class="flex h-full flex-col lg:col-span-3">
- <CodePanel
- bind:open={composeOpen}
- title="compose.yaml"
- language="yaml"
- bind:value={$inputs.composeContent.value}
- placeholder={m.compose_compose_placeholder()}
- error={$inputs.composeContent.error ?? undefined}
- />
- </div>
- <div class="flex h-full flex-col lg:col-span-2">
- <CodePanel
- bind:open={envOpen}
- title=".env"
- language="env"
- bind:value={$inputs.envContent.value}
- placeholder={m.compose_env_placeholder()}
- error={$inputs.envContent.error ?? undefined}
- />
- </div>
+ {#if selectedIncludeTab}
+ {@const includeFile = project?.includeFiles?.find((f) => f.relativePath === selectedIncludeTab)}
+ {#if includeFile}
+ <div class="flex-1">
+ <CodePanel
+ bind:open={includeFilesPanelStates[includeFile.relativePath]}
+ title={includeFile.relativePath}
+ language="yaml"
+ bind:value={includeFilesState[includeFile.relativePath]}
+ />
+ </div>
+ {/if}
+ {:else}
+ <div class="grid min-h-0 flex-1 grid-cols-1 gap-4 lg:grid-cols-5">
+ <div class="flex min-h-0 flex-col lg:col-span-3">
+ <CodePanel
+ bind:open={composeOpen}
+ title="compose.yaml"
+ language="yaml"
+ bind:value={$inputs.composeContent.value}
+ error={$inputs.composeContent.error ?? undefined}
+ />
+ </div>
+
+ <div class="flex min-h-0 flex-col lg:col-span-2">
+ <CodePanel
+ bind:open={envOpen}
+ title=".env"
+ language="env"
+ bind:value={$inputs.envContent.value}
+ error={$inputs.envContent.error ?? undefined}
+ />
+ </div>
+ </div>
+ {/if}
</div>
{/if}
</div>
- {/if}
+ </div>
</Tabs.Content>
<Tabs.Content value="logs" class="h-full">
diff --git a/frontend/src/routes/(app)/projects/components/CodePanel.svelte b/frontend/src/routes/(app)/projects/components/CodePanel.svelte
index 3a75c0e05..c96ed88e2 100644
--- a/frontend/src/routes/(app)/projects/components/CodePanel.svelte
+++ b/frontend/src/routes/(app)/projects/components/CodePanel.svelte
@@ -1,6 +1,6 @@
<script lang="ts">
import * as Card from '$lib/components/ui/card';
- import CodeEditor from '$lib/components/code-editor/editor.svelte';
+ import CodeEditor from '$lib/components/monaco-code-editor/editor.svelte';
import { CodeIcon } from '$lib/icons';
type CodeLanguage = 'yaml' | 'env';
@@ -10,32 +10,28 @@
open = $bindable(),
language,
value = $bindable(),
- placeholder,
error
}: {
title: string;
open: boolean;
language: CodeLanguage;
value: string;
- placeholder?: string;
error?: string;
} = $props();
</script>
-<Card.Root class="flex h-full flex-col">
+<Card.Root class="mb-10 flex h-full min-h-0 flex-col overflow-hidden">
<Card.Header icon={CodeIcon} class="flex-shrink-0 items-center">
<Card.Title>
- <h2>
- {title}
- </h2>
+ <h2>{title}</h2>
</Card.Title>
</Card.Header>
- <Card.Content class="flex-grow p-0">
- <div class="h-full [&_.cm-content]:text-xs sm:[&_.cm-content]:text-sm">
- <CodeEditor bind:value {language} {placeholder} />
- {#if error}
- <p class="text-destructive mt-2 text-xs">{error}</p>
- {/if}
+ <Card.Content class="relative z-0 flex min-h-0 flex-1 flex-col overflow-visible p-0">
+ <div class="relative z-10 min-h-0 w-full min-w-0 flex-1">
+ <CodeEditor bind:value {language} fontSize="13px" />
</div>
+ {#if error}
+ <p class="text-destructive px-4 py-2 text-xs">{error}</p>
+ {/if}
</Card.Content>
</Card.Root>
diff --git a/frontend/src/routes/(app)/projects/new/+page.svelte b/frontend/src/routes/(app)/projects/new/+page.svelte
index 979d8471a..56f609974 100644
--- a/frontend/src/routes/(app)/projects/new/+page.svelte
+++ b/frontend/src/routes/(app)/projects/new/+page.svelte
@@ -161,7 +161,7 @@
'data-[disabled]:opacity-50 data-[disabled]:pointer-events-none';
</script>
-<div class="bg-background flex min-h-0 flex-col">
+<div class="bg-background flex h-dvh min-h-0 flex-col">
<div class="sticky top-0 border-b">
<div class="mx-auto flex h-16 max-w-full items-center justify-between gap-4 px-6">
<div class="flex items-center gap-4">
@@ -272,10 +272,10 @@
</div>
</div>
- <div class="flex-1 overflow-hidden">
- <div class="mx-auto h-full max-w-full">
- <div class="flex h-full flex-col gap-4 p-6">
- <div class="block sm:hidden">
+ <div class="flex min-h-0 flex-1 overflow-hidden">
+ <div class="mx-auto h-full w-full max-w-full min-w-0">
+ <div class="flex h-full min-h-0 flex-col gap-4 p-6 pb-10">
+ <div class="block flex-shrink-0 sm:hidden">
<EditableName
bind:value={$inputs.name.value}
bind:ref={nameInputRef}
@@ -288,28 +288,26 @@
</div>
<form
- class="grid h-full grid-cols-1 gap-4 lg:grid-cols-5 lg:items-stretch"
+ class="grid min-h-0 flex-1 grid-cols-1 gap-4 lg:grid-cols-5 lg:items-stretch"
style="grid-template-rows: 1fr;"
onsubmit={preventDefault(handleSubmit)}
>
- <div class="flex h-full flex-col lg:col-span-3">
+ <div class="flex min-h-0 flex-col lg:col-span-3">
<CodePanel
bind:open={composeOpen}
title={m.compose_compose_file_title()}
language="yaml"
bind:value={$inputs.composeContent.value}
- placeholder={m.compose_compose_placeholder()}
error={$inputs.composeContent.error ?? undefined}
/>
</div>
- <div class="flex h-full flex-col lg:col-span-2">
+ <div class="flex min-h-0 flex-col lg:col-span-2">
<CodePanel
bind:open={envOpen}
title={m.compose_env_title()}
language="env"
bind:value={$inputs.envContent.value}
- placeholder={m.compose_env_placeholder()}
error={$inputs.envContent.error ?? undefined}
/>
</div>
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 8359eeab7..dcc86dfd3 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -6,7 +6,6 @@ import { defineConfig } from 'vite';
import Icons from 'unplugin-icons/vite';
export default defineConfig({
- optimizeDeps: { exclude: ['@lucide/svelte'] },
plugins: [
tailwindcss(),
sveltekit(),
@@ -23,9 +22,7 @@ export default defineConfig({
})
],
build: {
- target: 'es2022',
- // Disable gzip reporting to speed up builds
- reportCompressedSize: false
+ target: 'es2022'
},
server: {
host: process.env.HOST,
diff --git a/go.work.sum b/go.work.sum
index 0f195f342..b5332acf7 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -229,6 +229,7 @@ github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sa
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-co-op/gocron/v2 v2.18.2/go.mod h1:Zii6he+Zfgy5W9B+JKk/KwejFOW0kZTFvHtwIpR4aBI=
github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
@@ -357,6 +358,7 @@ github.com/knqyf263/go-plugin v0.9.0 h1:CQs2+lOPIlkZVtcb835ZYDEoyyWJWLbSTWeCs0Ew
github.com/knqyf263/go-plugin v0.9.0/go.mod h1:2z5lCO1/pez6qGo8CvCxSlBFSEat4MEp1DrnA+f7w8Q=
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
github.com/ktrysmt/go-bitbucket v0.6.4 h1:C8dUGp0qkwncKtAnozHCbbqhptefzEd1I0sfnuy9rYQ=
github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
@@ -372,6 +374,7 @@ github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYt
github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
github.com/markbates/pkger v0.15.1 h1:3MPelV53RnGSW07izx5xGxl4e/sdRD6zqseIk0rMASY=
github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
@@ -433,12 +436,14 @@ github.com/pierrec/lz4/v4 v4.1.16/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFu
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0=
github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79 h1:V7x0hCAgL8lNGezuex1RW1sh7VXXCqfw8nXZti66iFg=
github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79/go.mod h1:xF/KoXmrRyahPfo5L7Szb5cAAUl53dMWBh9cMruGEZg=
github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
@@ -548,8 +553,12 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 h1:UGZ1QwZWY67Z6Bm
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0/go.mod h1:fcwWuDuaObkkChiDlhEpSq9+X1C0omv+s5mBtToAQ64=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
+golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -562,6 +571,8 @@ golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c23a0da4d..35a34d09f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -51,36 +51,18 @@ importers:
frontend:
dependencies:
- '@codemirror/lang-yaml':
- specifier: ^6.1.2
- version: 6.1.2
- '@codemirror/language':
- specifier: ^6.11.3
- version: 6.11.3
- '@codemirror/legacy-modes':
- specifier: ^6.5.2
- version: 6.5.2
- '@codemirror/lint':
- specifier: ^6.9.1
- version: 6.9.2
- '@codemirror/state':
- specifier: ^6.5.2
- version: 6.5.2
- '@codemirror/view':
- specifier: ^6.38.8
- version: 6.38.8
- '@lezer/highlight':
- specifier: ^1.2.3
- version: 1.2.3
+ '@shikijs/monaco':
+ specifier: ^3.20.0
+ version: 3.20.0
'@sveltejs/adapter-static':
specifier: ^3.0.10
+ '@sveltejs/kit':
+ specifier: ^2.49.2
'@tanstack/table-core':
specifier: ^8.21.3
version: 8.21.3
- '@uiw/codemirror-themes':
- specifier: ^4.25.2
- version: 4.25.3(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
'@xterm/addon-fit':
specifier: ^0.10.0
version: 0.10.0(@xterm/[email protected])
@@ -93,15 +75,15 @@ importers:
axios:
specifier: ^1.13.1
version: 1.13.2
- codemirror:
- specifier: ^6.0.2
- version: 6.0.2
date-fns:
specifier: ^4.1.0
version: 4.1.0
js-yaml:
specifier: ^4.1.1
version: 4.1.1
+ monaco-editor:
+ specifier: ^0.55.1
+ version: 0.55.1
prettier:
specifier: ^3.7.4
version: 3.7.4
@@ -111,9 +93,12 @@ importers:
prettier-plugin-tailwindcss:
specifier: ^0.7.2
- svelte-codemirror-editor:
- specifier: ^2.1.0
+ shiki:
+ specifier: ^3.20.0
+ version: 3.20.0
+ svelte:
+ specifier: ^5.46.0
+ version: 5.46.0
devDependencies:
'@iconify/json':
specifier: ^2.2.417
@@ -124,9 +109,6 @@ importers:
'@internationalized/date':
specifier: ^3.10.0
version: 3.10.0
- '@sveltejs/kit':
- specifier: ^2.49.2
'@sveltejs/vite-plugin-svelte':
specifier: ^6.2.1
@@ -172,9 +154,6 @@ importers:
runed:
specifier: ^0.37.0
- svelte:
- specifier: ^5.46.0
- version: 5.46.0
svelte-check:
specifier: ^4.3.4
@@ -294,33 +273,6 @@ packages:
resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
engines: {node: '>=6.9.0'}
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-61Hfv3cF07XvUxNeC3E7jhG8XNi1Yom1G0lRC936oLnlF+jrbrv8rc/J98XlYzcsAoTVupfsf5fLej1aI8kyIg==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-2xUIc5mHXQzT16JnyOFkh8PvfeXuIut3pslWGfsGOhxP/lpgRm9HOl/mpzLErgt5mXDovqA0d11P21gofRLb9w==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-dxrfG8w5Ce/QbT7YID7mWZFKhdhsaTNOYjOkSIMt1qmC4VQnXSDSYVHHHn8k6kJUfIhtLo8t1JJgltlxWdsITw==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-9HBM2XnwDj7fnu0551HkGdrUrrqmYq/WC5iv6nbY2WdicXdGbhR/gfbZOH73Aqj4351alY1+aoG9rCNfiwS1RA==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-/jJbwSTazlQEDOQw2FJ8LEEKVS72pU0lx6oM54kGpL8t/NJ2Jda3CZ4pcltiKTdqYSRk3ug1B3pil1gsjA6+8Q==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-sv3DylBiIyi+xKwRCJAAsBZZZWo82shJ/RTMymLabAdtbkV5cSKwWDeCgtUq3v8flTaXS2y1kKkICuRYtUswyQ==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==}
-
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-XcE9fcnkHCbWkjeKyi0lllwXmBLtyYb5dt89dJyx23I9+LSh5vZDIuk7OLG4VM1lgrXZQcY6cxyZyk5WVPRv/A==}
-
'@csstools/[email protected]':
resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==}
engines: {node: '>=18'}
@@ -1041,18 +993,6 @@ packages:
'@jridgewell/[email protected]':
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
- '@lezer/[email protected]':
- resolution: {integrity: sha512-L9X8uHCYU310o99L3/MpJKYxPzXPOS7S0NmBaM7UO/x2Kb2WbmMLSkfvdr1KxRIFYOpbY0Jhn7CfLSUDzL8arQ==}
-
- '@lezer/[email protected]':
- resolution: {integrity: sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==}
-
- '@lezer/[email protected]':
- resolution: {integrity: sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==}
-
- '@lezer/[email protected]':
- resolution: {integrity: sha512-GuBLekbw9jDBDhGur82nuwkxKQ+a3W5H0GfaAthDXcAu+XdpS43VlnxA9E9hllkpSP5ellRDKjLLj7Lu9Wr6xA==}
-
'@lix-js/[email protected]':
resolution: {integrity: sha512-pRbW+joG12L0ULfMiWYosIW0plmW4AsUdiPCp+Z8rAsElJ+wJ6in58zhD3UwUcd4BNcpldEGjg6PdA7e0RgsDQ==}
engines: {node: '>=18'}
@@ -1060,9 +1000,6 @@ packages:
'@lix-js/[email protected]':
resolution: {integrity: sha512-jBeALB6prAbtr5q4vTuxnRZZv1M2rKe8iNqRQhFJ4Tv7150unEa0vKyz0hs8Gl3fUGsWaNJBh3J8++fpbrpRBQ==}
- '@marijn/[email protected]':
- resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==}
-
'@napi-rs/[email protected]':
resolution: {integrity: sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==}
@@ -1513,6 +1450,30 @@ packages:
'@selderee/[email protected]':
resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-f2ED7HYV4JEk827mtMDwe/yQ25pRiXZmtHjWF8uzZKuKiEsJR7Ce1nuQ+HhV9FzDcbIo4ObBCD9GPTzNuy9S1g==}
+
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-OFx8fHAZuk7I42Z9YAdZ95To6jDePQ9Rnfbw9uSRTSbBhYBp1kEOKv/3jOimcj3VRUKusDYM6DswLauwfhboLg==}
+
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-Yx3gy7xLzM0ZOjqoxciHjA7dAt5tyzJE3L4uQoM83agahy+PlW244XJSrmJRSBvGYELDhYXPacD4R/cauV5bzQ==}
+
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-le+bssCxcSHrygCWuOrYJHvjus6zhQ2K7q/0mgjiffRbkhM4o1EWu2m+29l0yEsHDbWaWPNnDUTRVVBvBBeKaA==}
+
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-p2sUd6j/kxSzerL/rYpOgLOg+ssfFPeUjKxxKhK2SiMMKJTkw+Y84BmXMwNqFsdXr/4q3OMEjQ8ptRXHWpzdKQ==}
+
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-U1NSU7Sl26Q7ErRvJUouArxfM2euWqq1xaSrbqMu2iqa+tSp0D1Yah8216sDYbdDHw4C8b75UpE65eWorm2erQ==}
+
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-lhYAATn10nkZcBQ0BlzSbJA3wcmL5MXUUF8d2Zzon6saZDlToKaiRX60n2+ZaHJCmXEcZRWNzn+k9vplr8Jhsw==}
+
+ '@shikijs/[email protected]':
+ resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
+
'@sideway/[email protected]':
resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==}
@@ -1691,12 +1652,18 @@ packages:
resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
+
resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
+
resolution: {integrity: sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==}
@@ -1711,6 +1678,9 @@ packages:
resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
+
resolution: {integrity: sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==}
@@ -1730,12 +1700,8 @@ packages:
'@types/json-schema':
optional: true
- resolution: {integrity: sha512-k7/B7Vf4jU/WcdewgJWP9tMFxbjB6UpUymZ3fx/TsbGwt2JXAouw0uyqCn1RlYBfr7YQnvEs3Ju9ECkd2sKzdg==}
- peerDependencies:
- '@codemirror/language': '>=6.0.0'
- '@codemirror/state': '>=6.0.0'
- '@codemirror/view': '>=6.0.0'
+ '@ungap/[email protected]':
+ resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
'@valibot/[email protected]':
resolution: {integrity: sha512-GE7DmSr1C2UCWPiV0upRH6mv0cCPsqYGs819fb6srCS1tWhyXrkGGe+zxUiwzn/L1BOfADH4sNjY/YHCuP8phQ==}
@@ -1868,10 +1834,19 @@ packages:
resolution: {integrity: sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==}
+ resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
+
resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}
engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+ resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}
+
+ resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==}
+
resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
engines: {node: '>= 14.16.0'}
@@ -1897,9 +1872,6 @@ packages:
resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
engines: {node: '>=6'}
- resolution: {integrity: sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==}
-
resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
engines: {node: '>=7.0.0'}
@@ -1911,6 +1883,9 @@ packages:
resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
engines: {node: '>= 0.8'}
+ resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
+
resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
engines: {node: '>=14'}
@@ -1959,9 +1934,6 @@ packages:
resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
engines: {node: '>= 0.10'}
- resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
-
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
engines: {node: '>= 8'}
@@ -2043,6 +2015,9 @@ packages:
resolution: {integrity: sha512-jDwizj+IlEZBunHcOuuFVBnIMPAEHvTsJj0BcIp94xYguLRVBcXO853px/MyIJvbVzWdsGvrRweIUWJw8hBP7A==}
+ resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
+
resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
@@ -2056,6 +2031,9 @@ packages:
resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
engines: {node: '>= 4'}
+ resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}
+
resolution: {integrity: sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==}
@@ -2279,6 +2257,12 @@ packages:
resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==}
+
+ resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
+
resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
engines: {node: '>=18'}
@@ -2287,6 +2271,9 @@ packages:
resolution: {integrity: sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==}
engines: {node: '>=14'}
+ resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
+
resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
@@ -2533,6 +2520,11 @@ packages:
resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
+ resolution: {integrity: sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==}
+ engines: {node: '>= 18'}
+ hasBin: true
+
resolution: {integrity: sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==}
engines: {node: '>= 18'}
@@ -2542,6 +2534,9 @@ packages:
resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==}
+
resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
@@ -2552,6 +2547,21 @@ packages:
resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
engines: {node: '>= 8'}
+ resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
+
+ resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}
+
+ resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==}
+
+ resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==}
+
+ resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==}
+
resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
engines: {node: '>=8.6'}
@@ -2595,6 +2605,9 @@ packages:
peerDependencies:
svelte: ^5.27.0
+ resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==}
+
resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
engines: {node: '>=4'}
@@ -2658,6 +2671,12 @@ packages:
resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
engines: {node: '>=18'}
+ resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==}
+
+ resolution: {integrity: sha512-3VhUGN3w2eYxnTzHn+ikMI+fp/96KoRSVK9/kMTcFqj1NRDh2IhQCKvYxDnWePKRXY/AqH+Fuiyb7VHSzBjHfA==}
+
resolution: {integrity: sha512-a0oW0AMaP/Uqk1gU7s3unE83wzs/MACy3wsCnNREn4wqp4KCcxRdulRjf0d2FeIxENbGJ4EBGtHTQ6J30XB6Cw==}
@@ -2811,6 +2830,9 @@ packages:
resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==}
+ resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
+
resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
@@ -2845,6 +2867,15 @@ packages:
resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
engines: {node: '>= 14.18.0'}
+ resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==}
+
+ resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==}
+
+ resolution: {integrity: sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==}
+
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
@@ -2946,6 +2977,9 @@ packages:
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
engines: {node: '>=8'}
+ resolution: {integrity: sha512-kgCOlsnyWb+p0WU+01RjkCH+eBVsjL1jOwUYWv0YDWkM2/A46+LDKVs5yZCUXjJG6bj4ndFoAg5iLIIue6dulg==}
+
resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
engines: {node: '>=14'}
@@ -2983,6 +3017,9 @@ packages:
resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
engines: {node: '>=0.10.0'}
+ resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
+
resolution: {integrity: sha512-TzjBNv7KwRw6E3pdKdlRyZiTmUIE0UttT/Sl56MVwVARl/u5gp978KepazCJZewFUnlWHz9i3NQd4kOtP/Afdg==}
peerDependencies:
@@ -3004,6 +3041,9 @@ packages:
resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
engines: {node: '>=18'}
+ resolution: {integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==}
+
resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
engines: {node: '>=8'}
@@ -3026,12 +3066,6 @@ packages:
resolution: {integrity: sha512-zOh9jPYI+xrNOyisSelgym4tolKTJCQd5GBhK0+0xJvcYDcwlOoxF/rnFKQ2KRZknXSG9jWAp66fwP6AxN9STg==}
- resolution: {integrity: sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==}
-
- resolution: {integrity: sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==}
-
resolution: {integrity: sha512-5A560JmXr7wDyGLK12Nq/EYS38VkGlglVzkis1JEdbGWSnbQIEhZzTJhzURXN5/8WwwFCs/f/VVcmkTppbXLow==}
@@ -3060,12 +3094,6 @@ packages:
svelte: ^4.0.0 || ^5.0.0-next.0
typescript: '>=5.0.0'
- resolution: {integrity: sha512-WGkSsIYNpVcOVxaQPkmdBQhaGyKLmg6pgaS/b+7guRb4eikrbXYtvNFuW2AzKJi8ZbLhSngrf3SRiZOuwuskrQ==}
- peerDependencies:
- codemirror: ^6.0.0
- svelte: ^5.0.0
-
resolution: {integrity: sha512-1EUFYmd7q/xfs2qCHwJzGPh9n5VJ3X6QjBN10fof2vxgy8fYE7kVfZ7uGnd7i6fQaWIr5KvXcwYXE/cmTEjk5A==}
peerDependencies:
@@ -3180,6 +3208,9 @@ packages:
resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
engines: {node: '>=20'}
+ resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
+
resolution: {integrity: sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==}
@@ -3232,6 +3263,21 @@ packages:
resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+ resolution: {integrity: sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==}
+
+ resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
+
+ resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
+
+ resolution: {integrity: sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==}
+
+ resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
+
resolution: {integrity: sha512-MBlMtT5RuMYZy4TZgqUL2OTtOdTUVsS1Mhj6G1pEzMlFJlEnq6mhUfoIt45gBWxHcsOdXJDWLg3pRZ+YmvAVWQ==}
peerDependencies:
@@ -3292,6 +3338,12 @@ packages:
peerDependencies:
svelte: ^5.0.0
+ resolution: {integrity: sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==}
+
+ resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
+
resolution: {integrity: sha512-MobvwqX76Vqt/O4AbnNMNWoXWGrKUqZbphCUle/J2KXH82yKQiunOeKnz/nqEPosPsoWWPP9FtNuPBSYpiiwkw==}
peerDependencies:
@@ -3345,9 +3397,6 @@ packages:
vite:
optional: true
- resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
-
resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
engines: {node: '>=18'}
@@ -3445,6 +3494,9 @@ packages:
resolution: {integrity: sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==}
+ resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
+
snapshots:
'@acemir/[email protected]': {}
@@ -3530,66 +3582,6 @@ snapshots:
'@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.28.5
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/language': 6.11.3
- '@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.8
- '@lezer/common': 1.3.0
-
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/language': 6.11.3
- '@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.8
- '@lezer/common': 1.3.0
-
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/autocomplete': 6.19.0
- '@codemirror/language': 6.11.3
- '@codemirror/state': 6.5.2
- '@lezer/common': 1.3.0
- '@lezer/highlight': 1.2.3
- '@lezer/lr': 1.4.2
- '@lezer/yaml': 1.0.3
-
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.8
- '@lezer/common': 1.3.0
- '@lezer/highlight': 1.2.3
- '@lezer/lr': 1.4.2
- style-mod: 4.1.2
-
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/language': 6.11.3
-
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.8
- crelt: 1.0.6
-
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.8
- crelt: 1.0.6
-
- '@codemirror/[email protected]':
- dependencies:
- '@marijn/find-cluster-break': 1.0.2
-
- '@codemirror/[email protected]':
- dependencies:
- '@codemirror/state': 6.5.2
- crelt: 1.0.6
- style-mod: 4.1.3
- w3c-keyname: 2.2.8
-
'@csstools/[email protected]': {}
'@csstools/[email protected](@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])':
@@ -4066,22 +4058,6 @@ snapshots:
'@jridgewell/resolve-uri': 3.1.2
'@jridgewell/sourcemap-codec': 1.5.5
- '@lezer/[email protected]': {}
-
- '@lezer/[email protected]':
- dependencies:
- '@lezer/common': 1.3.0
-
- '@lezer/[email protected]':
- dependencies:
- '@lezer/common': 1.3.0
-
- '@lezer/[email protected]':
- dependencies:
- '@lezer/common': 1.3.0
- '@lezer/highlight': 1.2.3
- '@lezer/lr': 1.4.2
-
'@lix-js/[email protected]':
dependencies:
'@lix-js/server-protocol-schema': 0.1.1
@@ -4096,8 +4072,6 @@ snapshots:
'@lix-js/[email protected]': {}
- '@marijn/[email protected]': {}
-
'@napi-rs/[email protected]':
dependencies:
'@emnapi/core': 1.7.1
@@ -4422,6 +4396,45 @@ snapshots:
domhandler: 5.0.3
selderee: 0.11.0
+ '@shikijs/[email protected]':
+ dependencies:
+ '@shikijs/types': 3.20.0
+ '@shikijs/vscode-textmate': 10.0.2
+ '@types/hast': 3.0.4
+ hast-util-to-html: 9.0.5
+
+ '@shikijs/[email protected]':
+ dependencies:
+ '@shikijs/types': 3.20.0
+ '@shikijs/vscode-textmate': 10.0.2
+ oniguruma-to-es: 4.3.4
+
+ '@shikijs/[email protected]':
+ dependencies:
+ '@shikijs/types': 3.20.0
+ '@shikijs/vscode-textmate': 10.0.2
+
+ '@shikijs/[email protected]':
+ dependencies:
+ '@shikijs/types': 3.20.0
+
+ '@shikijs/[email protected]':
+ dependencies:
+ '@shikijs/core': 3.20.0
+ '@shikijs/types': 3.20.0
+ '@shikijs/vscode-textmate': 10.0.2
+
+ '@shikijs/[email protected]':
+ dependencies:
+ '@shikijs/types': 3.20.0
+
+ '@shikijs/[email protected]':
+ dependencies:
+ '@shikijs/vscode-textmate': 10.0.2
+ '@types/hast': 3.0.4
+
+ '@shikijs/[email protected]': {}
+
'@sideway/[email protected]':
dependencies:
'@hapi/hoek': 9.3.0
@@ -4585,11 +4598,19 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]':
+ dependencies:
+ '@types/unist': 3.0.3
+
'@types/[email protected]': {}
optional: true
+ '@types/[email protected]':
+ dependencies:
+ '@types/unist': 3.0.3
+
dependencies:
undici-types: 7.16.0
@@ -4605,6 +4626,8 @@ snapshots:
optional: true
+ '@types/[email protected]': {}
+
optional: true
@@ -4622,11 +4645,7 @@ snapshots:
'@types/json-schema': 7.0.15
optional: true
- '@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
- dependencies:
- '@codemirror/language': 6.11.3
- '@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.8
+ '@ungap/[email protected]': {}
dependencies:
@@ -4761,8 +4780,14 @@ snapshots:
+
+
+
dependencies:
readdirp: 4.1.2
@@ -4788,16 +4813,6 @@ snapshots:
- dependencies:
- '@codemirror/autocomplete': 6.19.0
- '@codemirror/commands': 6.10.0
- '@codemirror/language': 6.11.3
- '@codemirror/lint': 6.9.2
- '@codemirror/search': 6.5.11
- '@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.8
-
dependencies:
color-name: 1.1.4
@@ -4808,6 +4823,8 @@ snapshots:
dependencies:
delayed-stream: 1.0.0
+
@@ -4852,8 +4869,6 @@ snapshots:
object-assign: 4.1.1
vary: 1.1.2
-
dependencies:
path-key: 3.1.1
@@ -4913,6 +4928,10 @@ snapshots:
+ dependencies:
+ dequal: 2.0.3
+
optional: true
@@ -4928,6 +4947,10 @@ snapshots:
dependencies:
domelementtype: 2.3.0
+ optionalDependencies:
+ '@types/trusted-types': 2.0.7
+
optionalDependencies:
'@types/trusted-types': 2.0.7
@@ -5224,6 +5247,24 @@ snapshots:
dependencies:
function-bind: 1.1.2
+ dependencies:
+ '@types/hast': 3.0.4
+ '@types/unist': 3.0.3
+ ccount: 2.0.1
+ comma-separated-tokens: 2.0.3
+ hast-util-whitespace: 3.0.0
+ html-void-elements: 3.0.0
+ mdast-util-to-hast: 13.2.1
+ property-information: 7.1.0
+ space-separated-tokens: 2.0.2
+ stringify-entities: 4.0.4
+ zwitch: 2.0.4
+
+ dependencies:
+ '@types/hast': 3.0.4
+
dependencies:
whatwg-encoding: 3.1.1
@@ -5236,6 +5277,8 @@ snapshots:
htmlparser2: 8.0.2
selderee: 0.11.0
+
dependencies:
domelementtype: 2.3.0
@@ -5480,16 +5523,47 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.5
+
+ dependencies:
+ '@types/hast': 3.0.4
+ '@types/mdast': 4.0.4
+ '@ungap/structured-clone': 1.3.0
+ devlop: 1.1.0
+ micromark-util-sanitize-uri: 2.0.1
+ trim-lines: 3.0.1
+ unist-util-position: 5.0.0
+ unist-util-visit: 5.0.0
+ vfile: 6.0.3
+
+ dependencies:
+ micromark-util-symbol: 2.0.1
+ micromark-util-types: 2.0.2
+
+
+ dependencies:
+ micromark-util-character: 2.1.1
+ micromark-util-encode: 2.0.1
+ micromark-util-symbol: 2.0.1
+
+
+
dependencies:
braces: 3.0.3
@@ -5530,6 +5604,11 @@ snapshots:
svelte: 5.46.0
svelte-toolbelt: 0.7.1([email protected])
+ dependencies:
+ dompurify: 3.2.7
+ marked: 14.0.0
+
@@ -5583,6 +5662,14 @@ snapshots:
dependencies:
mimic-function: 5.0.1
+
+ dependencies:
+ oniguruma-parser: 0.12.1
+ regex: 6.1.0
+ regex-recursion: 6.0.2
+
@@ -5711,6 +5798,8 @@ snapshots:
optional: true
+
@@ -5755,6 +5844,16 @@ snapshots:
+ dependencies:
+ regex-utilities: 2.3.0
+
+
+ dependencies:
+ regex-utilities: 2.3.0
+
@@ -5895,6 +5994,17 @@ snapshots:
+ dependencies:
+ '@shikijs/core': 3.20.0
+ '@shikijs/engine-javascript': 3.20.0
+ '@shikijs/engine-oniguruma': 3.20.0
+ '@shikijs/langs': 3.20.0
+ '@shikijs/themes': 3.20.0
+ '@shikijs/types': 3.20.0
+ '@shikijs/vscode-textmate': 10.0.2
+ '@types/hast': 3.0.4
+
@@ -5948,6 +6058,8 @@ snapshots:
optional: true
+
dependencies:
'@sqlite.org/sqlite-wasm': 3.48.0-build4
@@ -5973,6 +6085,11 @@ snapshots:
get-east-asian-width: 1.4.0
strip-ansi: 7.1.2
+ dependencies:
+ character-entities-html4: 2.1.0
+ character-entities-legacy: 3.0.0
+
dependencies:
ansi-regex: 5.0.1
@@ -5991,10 +6108,6 @@ snapshots:
-
-
dependencies:
inline-style-parser: 0.2.4
@@ -6019,11 +6132,6 @@ snapshots:
transitivePeerDependencies:
- picomatch
- dependencies:
- codemirror: 6.0.2
- svelte: 5.46.0
-
dependencies:
runed: 0.28.0([email protected])
@@ -6164,6 +6272,8 @@ snapshots:
dependencies:
punycode: 2.3.1
+
optional: true
@@ -6208,6 +6318,29 @@ snapshots:
+ dependencies:
+ '@types/unist': 3.0.3
+
+ dependencies:
+ '@types/unist': 3.0.3
+
+ dependencies:
+ '@types/unist': 3.0.3
+
+ dependencies:
+ '@types/unist': 3.0.3
+ unist-util-is: 6.0.1
+
+ dependencies:
+ '@types/unist': 3.0.3
+ unist-util-is: 6.0.1
+ unist-util-visit-parents: 6.0.2
+
dependencies:
'@antfu/install-pkg': 1.1.0
@@ -6249,6 +6382,16 @@ snapshots:
svelte: 5.46.0
svelte-toolbelt: 0.7.1([email protected])
+ dependencies:
+ '@types/unist': 3.0.3
+ unist-util-stringify-position: 4.0.0
+
+ dependencies:
+ '@types/unist': 3.0.3
+ vfile-message: 4.0.3
+
dependencies:
uuid: 11.1.0
@@ -6275,8 +6418,6 @@ snapshots:
optionalDependencies:
-
dependencies:
xml-name-validator: 5.0.0
@@ -6345,3 +6486,5 @@ snapshots:
optional: true
+
diff --git a/tests/spec/network.spec.ts b/tests/spec/network.spec.ts
index 5cfb46e85..c3b79bbed 100644
--- a/tests/spec/network.spec.ts
+++ b/tests/spec/network.spec.ts
@@ -29,8 +29,6 @@ test.describe('Networks Page', () => {
// Fetch counts directly in the test to ensure we have fresh data
const counts = await fetchNetworksCountsWithRetry(page);
- console.log('Network Counts:', counts);
-
// Use the new stat card structure with h3 for values
const totalValue = page.locator('div:has(> p:has-text("Total Networks")) h3').first();
const unusedValue = page.locator('div:has(> p:has-text("Unused Networks")) h3').first();
@@ -77,9 +75,22 @@ test.describe('Networks Page', () => {
});
test('Remove Network from table', async ({ page }) => {
- const networkName = 'my-test-network';
+ const networkName = `test-remove-network-${Date.now()}`;
await navigateToNetworks(page);
+ // 1. Create the network first
+ await page.locator('button:has-text("Create Network")').first().click();
+ const nameInput = page.getByLabel('Name').first();
+ if (await nameInput.isVisible().catch(() => false)) {
+ await nameInput.fill(networkName);
+ } else {
+ await page.locator('input[id^="network-name-"]').first().fill(networkName);
+ }
+ await page.getByRole('dialog').locator('button:has-text("Create Network")').click();
+ await expect(page.locator('li[data-sonner-toast][data-type="success"] div[data-title]')).toBeVisible();
+
+ // 2. Find and remove it
+ await navigateToNetworks(page);
const row = page.locator('tbody tr', { has: page.getByText(networkName) }).first();
await expect(row).toBeVisible();
diff --git a/tests/spec/project.spec.ts b/tests/spec/project.spec.ts
index 84168be59..255cfc2fe 100644
--- a/tests/spec/project.spec.ts
+++ b/tests/spec/project.spec.ts
@@ -115,6 +115,7 @@ test.describe('New Compose Project Page', () => {
await expect(page.getByRole('button', { name: 'My New Project' })).toBeVisible();
await expect(page.getByRole('heading', { name: 'Docker Compose File' })).toBeVisible();
await expect(page.getByRole('heading', { name: 'Environment (.env)' })).toBeVisible();
+
});
test('should validate required fields', async ({ page }) => {
@@ -157,24 +158,45 @@ test.describe('New Compose Project Page', () => {
await page.getByRole('textbox', { name: 'My New Project' }).fill(projectName);
await page.getByRole('textbox', { name: 'My New Project' }).press('Enter');
- const composeEditor = page.locator('.cm-editor').first();
+ const composeEditor = page.locator('.monaco-editor').first();
await expect(composeEditor).toBeVisible();
- const composeContent = composeEditor.locator('.cm-content[contenteditable]');
- await composeContent.focus();
- await page.keyboard.press('ControlOrMeta+A');
- await page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
- await page.evaluate((text) => navigator.clipboard.writeText(text), TEST_COMPOSE_YAML);
- await page.keyboard.press('ControlOrMeta+V');
+ // Wait for Monaco to actually render its view before attempting input.
+ await expect(composeEditor.locator('.view-line').first()).toBeVisible();
- const envEditor = page.locator('.cm-editor').nth(1);
+ // Monaco may create the internal input textarea lazily (e.g. only after focus).
+ // Click first, then wait for textarea.inputarea to appear.
+ await composeEditor.click({ position: { x: 20, y: 20 } });
+ await expect(composeEditor.locator('textarea')).toHaveCount(1);
+
+ // Use page.evaluate to set the value directly in Monaco to avoid auto-indentation issues during typing
+ await page.evaluate(({ text, lang }) => {
+ const models = (window as any).monaco.editor.getModels();
+ const model = models.find((m: any) => m.getLanguageId() === lang);
+ if (!model) throw new Error(`No ${lang} model found`);
+ model.setValue(text);
+ }, { text: TEST_COMPOSE_YAML, lang: 'yaml' });
+
+ // Basic sanity check that the new content rendered.
+ await expect(composeEditor.locator('.view-lines')).toContainText(/redis/i);
+
+ const envEditor = page.locator('.monaco-editor').nth(1);
await expect(envEditor).toBeVisible();
- const envContent = envEditor.locator('.cm-content[contenteditable]');
- await envContent.focus();
- await page.keyboard.press('ControlOrMeta+A');
- await page.evaluate((text) => navigator.clipboard.writeText(text), TEST_ENV_FILE);
- await page.keyboard.press('ControlOrMeta+V');
+ await expect(envEditor.locator('.view-line').first()).toBeVisible();
+
+ await envEditor.click({ position: { x: 20, y: 20 } });
+ await expect(envEditor.locator('textarea')).toHaveCount(1);
+
+ // Use page.evaluate to set the value directly in Monaco
+ await page.evaluate(({ text, lang }) => {
+ const models = (window as any).monaco.editor.getModels();
+ const model = models.find((m: any) => m.getLanguageId() === lang);
+ if (!model) throw new Error(`No ${lang} model found`);
+ model.setValue(text);
+ }, { text: TEST_ENV_FILE, lang: 'ini' });
+
+ await expect(envEditor.locator('.view-lines')).toContainText(/redis/i);
await page.route('/api/environments/*/projects', async (route) => {
if (route.request().method() === 'POST') {
@@ -211,7 +233,7 @@ test.describe('New Compose Project Page', () => {
await expect(page.getByRole('button', { name: projectName })).toBeVisible();
- await page.getByRole('tab', { name: /Services/i }).click();
+ await page.getByRole('tab', { name: 'Services' }).click();
await page.waitForLoadState('networkidle');
const serviceNameWhenStopped = page.getByRole('heading', { name: 'redis', exact: true });
@@ -228,12 +250,57 @@ test.describe('New Compose Project Page', () => {
const containerNameElement = page.getByRole('link', { name: 'test-redis-container redis' });
await expect(containerNameElement).toBeVisible({ timeout: 15000 });
+ });
+
+ test('should destroy the project and remove files from disk', async ({ page }) => {
+ const projectName = `test-destroy-${Date.now()}`;
+
+ // 1. Create the project first
+ await page.getByRole('button', { name: 'My New Project' }).click();
+ await page.getByRole('textbox', { name: 'My New Project' }).fill(projectName);
+ await page.getByRole('textbox', { name: 'My New Project' }).press('Enter');
+
+ const composeEditor = page.locator('.monaco-editor').first();
+ await expect(composeEditor).toBeVisible();
+ await expect(composeEditor.locator('.view-line').first()).toBeVisible();
+ await composeEditor.click({ position: { x: 20, y: 20 } });
+
+ await page.evaluate(
+ ({ text, lang }) => {
+ const models = (window as any).monaco.editor.getModels();
+ const model = models.find((m: any) => m.getLanguageId() === lang);
+ if (!model) throw new Error(`No ${lang} model found`);
+ model.setValue(text);
+ },
+ { text: TEST_COMPOSE_YAML, lang: 'yaml' }
+ );
+
+ const createButton = page.locator('button[data-slot="button"]').filter({ hasText: 'Create Project' });
+ await createButton.click();
+
+ await page.waitForURL(/\/projects\/.+/, { timeout: 10000 });
+ await expect(page.getByRole('button', { name: projectName })).toBeVisible();
+
+ // 2. Destroy the project
+ const destroyButton = page.getByRole('button', { name: 'Destroy', exact: true });
+ await expect(destroyButton).toBeVisible();
+ await destroyButton.click();
+
+ // 3. Handle the confirmation dialog
+ const dialog = page.getByRole('dialog');
+ await expect(dialog).toBeVisible();
+
+ // Check "Remove project files"
+ const removeFilesCheckbox = dialog.getByLabel(/Remove project files/i);
+ await removeFilesCheckbox.check();
- const serviceBadge = page.locator('text=redis').first();
- await expect(serviceBadge).toBeVisible();
+ // Click "Destroy" in the dialog
+ const confirmDestroyButton = dialog.getByRole('button', { name: 'Destroy', exact: true });
+ await confirmDestroyButton.click();
- const statusBadge = page.locator('text=Running').first();
- await expect(statusBadge).toBeVisible();
+ // 4. Verify redirection and project removal
+ await page.waitForURL(ROUTES.page, { timeout: 10000 });
+ await expect(page.getByRole('link', { name: projectName })).not.toBeVisible();
});
});
@@ -272,7 +339,7 @@ test.describe('Project Detail Page', () => {
await page.getByRole('tab', { name: /Services/i }).click();
- const nginxService = page.getByText(/nginx/i);
+ const nginxService = page.getByRole('heading', { name: /nginx/i });
const emptyState = page.getByText(/No services found/i);
if ((await nginxService.count()) > 0) {
@@ -301,6 +368,7 @@ test.describe('Project Detail Page', () => {
// - classic (default): side-by-side compose.yaml + .env panels
// - tree view: file list on the left and a single code panel on the right
await expect(page.getByRole('heading', { name: 'compose.yaml' })).toBeVisible();
+
const projectFilesHeading = page.getByRole('heading', { name: /Project Files/i });
const isTreeView = await projectFilesHeading.isVisible();
diff --git a/tests/spec/volumes.spec.ts b/tests/spec/volumes.spec.ts
index 9aa0eef58..9341224c9 100644
--- a/tests/spec/volumes.spec.ts
+++ b/tests/spec/volumes.spec.ts
@@ -79,11 +79,22 @@ test.describe('Volumes Page', () => {
});
test('Remove Volume', async ({ page }) => {
+ const volumeName = `test-remove-volume-${Date.now()}`;
await page.goto('/volumes');
await page.waitForLoadState('networkidle');
- const firstRow = await page.getByRole('row', { name: 'my-app-data' });
- await firstRow.getByRole('button', { name: 'Open menu' }).click();
+ // 1. Create the volume first
+ await page.locator('button:has-text("Create Volume")').first().click();
+ await page.locator('input[id="volume-name-*"]').fill(volumeName);
+ await page.getByRole('dialog').locator('button:has-text("Create Volume")').click();
+ await expect(page.locator('li[data-sonner-toast][data-type="success"] div[data-title]')).toBeVisible();
+
+ // 2. Find and remove it
+ await page.goto('/volumes');
+ await page.waitForLoadState('networkidle');
+
+ const row = await page.getByRole('row', { name: volumeName });
+ await row.getByRole('button', { name: 'Open menu' }).click();
await page.getByRole('menuitem', { name: 'Remove' }).click();
@@ -111,29 +122,6 @@ test.describe('Volumes Page', () => {
).toBeVisible();
});
- test('Disable remove action when volume is in use', async ({ page }) => {
- const volumeInUse = realVolumes.find((vol) => vol.inUse);
- test.skip(!volumeInUse, 'No volumes in use available for this test');
-
- await page.goto('/volumes');
- await page.waitForLoadState('networkidle');
-
- // Volume names can be truncated in the table (e.g. long hashes), so we anchor on the link title
- // which preserves the full name.
- const searchInput = page.getByPlaceholder('Search…');
- if (await searchInput.count()) {
- await searchInput.fill(volumeInUse.name);
- }
-
- const volumeLink = page.locator(`table a[title="${volumeInUse.name}"]`).first();
- await expect(volumeLink).toBeVisible();
-
- const volumeRow = volumeLink.locator('xpath=ancestor::tr[1]');
- await volumeRow.getByRole('button', { name: 'Open menu' }).click();
-
- await expect(page.getByRole('menuitem', { name: 'Remove' })).toBeDisabled();
- });
-
test('Display correct volume usage badge', async ({ page }) => {
await page.goto('/volumes');
await page.waitForLoadState('networkidle');
diff --git a/tests/utils/onboarding.util.ts b/tests/utils/onboarding.util.ts
deleted file mode 100644
index 0d9ee2035..000000000
--- a/tests/utils/onboarding.util.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { createTestApiKeys, deleteTestApiKeys } from './playwright.util';