Skip to content

Modern Docker Management, Designed for Everyone

refactor: code editor rework (#396)

Kyle Mendelleee989da6352
diff --git a/frontend/package.json b/frontend/package.json
index 948291fc7..990a99d73 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,14 +14,18 @@
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch"
},
"dependencies": {
+ "@codemirror/commands": "^6.8.1",
"@codemirror/lang-yaml": "^6.1.2",
"@codemirror/language": "^6.11.3",
"@codemirror/legacy-modes": "^6.5.1",
"@codemirror/lint": "^6.8.5",
"@codemirror/state": "^6.5.2",
+ "@codemirror/view": "^6.38.2",
+ "@lezer/highlight": "^1.2.1",
"@sveltejs/adapter-static": "^3.0.9",
"@tanstack/table-core": "^8.21.3",
"@uiw/codemirror-theme-github": "^4.25.1",
+ "@uiw/codemirror-themes": "^4.25.1",
"axios": "^1.11.0",
"codemirror": "^6.0.2",
"date-fns": "^4.1.0",
@@ -29,12 +33,13 @@
"prettier": "^3.6.2",
"prettier-plugin-svelte": "^3.4.0",
"prettier-plugin-tailwindcss": "^0.6.14",
- "svelte-codemirror-editor": "^1.4.1"
+ "svelte-codemirror-editor": "^1.4.1",
+ "thememirror": "^2.0.1"
},
"devDependencies": {
"@eslint/compat": "^1.3.2",
"@eslint/js": "^9.33.0",
- "@internationalized/date": "^3.8.2",
+ "@internationalized/date": "^3.9.0",
"@lucide/svelte": "^0.542.0",
"@sveltejs/kit": "^2.31.0",
"@sveltejs/vite-plugin-svelte": "^6.1.2",
@@ -42,7 +47,7 @@
"@types/bytes": "^3.1.5",
"@types/dockerode": "^3.3.42",
"@types/js-yaml": "^4.0.9",
- "bits-ui": "^2.9.3",
+ "bits-ui": "^2.9.6",
"bytes": "^3.1.2",
"clsx": "^2.1.1",
"eslint": "^9.33.0",
diff --git a/frontend/src/lib/components/editor.svelte b/frontend/src/lib/components/code-editor/editor.svelte
similarity index 51%
rename from frontend/src/lib/components/editor.svelte
rename to frontend/src/lib/components/code-editor/editor.svelte
index 18afe6334..27ee705ce 100644
--- a/frontend/src/lib/components/editor.svelte
+++ b/frontend/src/lib/components/code-editor/editor.svelte
@@ -1,14 +1,16 @@
<script lang="ts">
import CodeMirror from 'svelte-codemirror-editor';
- import { browser } from '$app/environment';
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 { githubDark } from '@uiw/codemirror-theme-github';
- import type { EditorView } from 'codemirror';
+ import { arcaneDark } from './theme';
+ import type { EditorView } from '@codemirror/view';
import type { Extension } from '@codemirror/state';
+ import type { Diagnostic, LintSource } from '@codemirror/lint';
+ import { mode } from 'mode-watcher';
type CodeLanguage = 'yaml' | 'env';
@@ -18,7 +20,8 @@
placeholder = 'Enter code...',
readOnly = false,
height = '550px',
- fontSize = '11px'
+ fontSize = '11px',
+ class: className = ''
} = $props();
let editorView: EditorView;
@@ -41,48 +44,63 @@
return extensions;
}
- function yamlLinter(view: { state: { doc: { toString(): string } } }) {
- const diagnostics = [];
+ 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;
+ const end = err.mark?.position !== undefined ? Math.max(start + 1, err.mark.position + 1) : start + 1;
diagnostics.push({
from: start,
to: end,
- severity: 'error' as const,
+ severity: 'error',
message: err.message
});
}
return diagnostics;
+ };
+
+ const extensions = $derived([...getLanguageExtension(language), arcaneDark]);
+
+ const styles = $derived({
+ '&': {
+ height,
+ fontSize
+ },
+ '&.cm-editor[contenteditable=false]': {
+ cursor: 'not-allowed'
+ },
+ '.cm-content[contenteditable=false]': {
+ cursor: 'not-allowed'
+ }
+ });
+
+ function handleReady(view: EditorView) {
+ editorView = view;
}
</script>
-{#if browser}
- <div class="overflow-hidden rounded-md border">
- <CodeMirror
- bind:value
- on:ready={(e) => (editorView = e.detail)}
- theme={githubDark}
- extensions={getLanguageExtension(language)}
- styles={{
- '&': {
- height,
- fontSize
- },
- '&.cm-editor[contenteditable=false]': {
- cursor: 'not-allowed'
- },
- '.cm-content[contenteditable=false]': {
- cursor: 'not-allowed'
- }
- }}
- {placeholder}
- readonly={readOnly}
- nodebounce={true}
- />
- </div>
-{/if}
+<div class={`overflow-hidden rounded-md border ${className}`}>
+ <CodeMirror
+ bind:value
+ on:ready={(view) => handleReady(view.detail)}
+ {extensions}
+ {styles}
+ {placeholder}
+ readonly={readOnly}
+ nodebounce={true}
+ />
+</div>
+
+<style>
+ :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
new file mode 100644
index 000000000..2adc064cb
--- /dev/null
+++ b/frontend/src/lib/components/code-editor/theme.ts
@@ -0,0 +1,54 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
+
+export const arcaneDarkSettings: CreateThemeOptions['settings'] = {
+ // Higher-contrast dark base
+ background: '#0d1117',
+ foreground: '#c9d1d9',
+ caret: '#a78bfa',
+ selection: 'rgba(167,139,250,0.35)',
+ selectionMatch: 'rgba(167,139,250,0.20)',
+ lineHighlight: '#161b22',
+ gutterBackground: '#0d1117',
+ gutterForeground: '#8b949e',
+ gutterActiveForeground: '#c9d1d9',
+ gutterBorder: 'transparent',
+
+ // Typography
+ fontFamily: '"Geist Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+ fontSize: '13px'
+};
+
+export const arcaneDarkStyles: 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: '#79c0ff' },
+ { 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' },
+
+ // Make separators/punctuation (e.g., "=") visible
+ { 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' }
+];
+
+export const arcaneDarkInit = (options?: Partial<CreateThemeOptions>) => {
+ const { theme = 'dark', settings = {}, styles = [] } = options || {};
+ return createTheme({
+ theme,
+ settings: { ...arcaneDarkSettings, ...settings },
+ styles: [...arcaneDarkStyles, ...styles]
+ });
+};
+
+export const arcaneDark = arcaneDarkInit();
diff --git a/frontend/src/lib/components/ui/button/button.svelte b/frontend/src/lib/components/ui/button/button.svelte
index cb2c566a3..4daf4535c 100644
--- a/frontend/src/lib/components/ui/button/button.svelte
+++ b/frontend/src/lib/components/ui/button/button.svelte
@@ -1,128 +1,80 @@
-<!--
- Installed from @ieedan/shadcn-svelte-extras
--->
-
<script lang="ts" module>
- import type { WithChildren, WithoutChildren } from 'bits-ui';
- import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
- import { type VariantProps, tv } from 'tailwind-variants';
+ import { cn, type WithElementRef } from "$lib/utils.js";
+ import type { HTMLAnchorAttributes, HTMLButtonAttributes } from "svelte/elements";
+ import { type VariantProps, tv } from "tailwind-variants";
export const buttonVariants = tv({
- base: "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive focus-visible:border-ring focus-visible:ring-ring/50 relative inline-flex shrink-0 items-center justify-center gap-2 overflow-hidden rounded-md text-sm font-medium whitespace-nowrap outline-hidden transition-all select-none focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+ base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
variants: {
variant: {
- default: 'bg-primary text-primary-foreground hover:bg-primary/90 shadow-2xs',
+ default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
destructive:
- 'bg-destructive hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:bg-destructive/60 dark:focus-visible:ring-destructive/40 text-white shadow-2xs',
+ "bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white",
outline:
- 'bg-background hover:bg-accent hover:text-accent-foreground dark:border-input dark:bg-input/30 dark:hover:bg-input/50 border shadow-2xs',
- secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80 shadow-2xs',
- ghost: 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
- link: 'text-primary underline-offset-4 hover:underline'
+ "bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border",
+ secondary: "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
+ ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
+ link: "text-primary underline-offset-4 hover:underline",
},
size: {
- default: 'h-9 px-4 py-2 has-[>svg]:px-3',
- sm: 'h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5',
- lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
- icon: 'size-9'
- }
+ default: "h-9 px-4 py-2 has-[>svg]:px-3",
+ sm: "h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5",
+ lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
+ icon: "size-9",
+ },
},
defaultVariants: {
- variant: 'default',
- size: 'default'
- }
+ variant: "default",
+ size: "default",
+ },
});
- export type ButtonVariant = VariantProps<typeof buttonVariants>['variant'];
- export type ButtonSize = VariantProps<typeof buttonVariants>['size'];
-
- export type ButtonPropsWithoutHTML = WithChildren<{
- ref?: HTMLElement | null;
- variant?: ButtonVariant;
- size?: ButtonSize;
- loading?: boolean;
- onClickPromise?: (
- e: MouseEvent & {
- currentTarget: EventTarget & HTMLButtonElement;
- }
- ) => Promise<void>;
- }>;
+ export type ButtonVariant = VariantProps<typeof buttonVariants>["variant"];
+ export type ButtonSize = VariantProps<typeof buttonVariants>["size"];
- export type AnchorElementProps = ButtonPropsWithoutHTML &
- WithoutChildren<Omit<HTMLAnchorAttributes, 'href' | 'type'>> & {
- href: HTMLAnchorAttributes['href'];
- type?: never;
- disabled?: HTMLButtonAttributes['disabled'];
+ export type ButtonProps = WithElementRef<HTMLButtonAttributes> &
+ WithElementRef<HTMLAnchorAttributes> & {
+ variant?: ButtonVariant;
+ size?: ButtonSize;
};
-
- export type ButtonElementProps = ButtonPropsWithoutHTML &
- WithoutChildren<Omit<HTMLButtonAttributes, 'type' | 'href'>> & {
- type?: HTMLButtonAttributes['type'];
- href?: never;
- disabled?: HTMLButtonAttributes['disabled'];
- };
-
- export type ButtonProps = AnchorElementProps | ButtonElementProps;
</script>
<script lang="ts">
- import { cn } from '$lib/utils';
- import LoaderCircleIcon from '@lucide/svelte/icons/loader-circle';
-
let {
+ class: className,
+ variant = "default",
+ size = "default",
ref = $bindable(null),
- variant = 'default',
- size = 'default',
href = undefined,
- type = 'button',
- loading = false,
- disabled = false,
- tabindex = 0,
- onclick,
- onClickPromise,
- class: className,
+ type = "button",
+ disabled,
children,
- ...rest
+ ...restProps
}: ButtonProps = $props();
</script>
-<!-- This approach to disabled links is inspired by bits-ui see: https://github.com/huntabyte/bits-ui/pull/1055 -->
-<svelte:element
- this={href ? 'a' : 'button'}
- {...rest}
- data-slot="button"
- type={href ? undefined : type}
- href={href && !disabled ? href : undefined}
- disabled={href ? undefined : disabled || loading}
- aria-disabled={href ? disabled : undefined}
- role={href && disabled ? 'link' : undefined}
- tabindex={href && disabled ? -1 : tabindex}
- class={cn(buttonVariants({ variant, size }), className)}
- bind:this={ref}
- onclick={async (
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- e: any
- ) => {
- onclick?.(e);
-
- if (type === undefined) return;
-
- if (onClickPromise) {
- loading = true;
-
- await onClickPromise(e);
-
- loading = false;
- }
- }}
->
- {#if type !== undefined && loading}
- <div class="absolute flex size-full place-items-center justify-center bg-inherit">
- <div class="flex animate-spin place-items-center justify-center">
- <LoaderCircleIcon class="size-4" />
- </div>
- </div>
- <span class="sr-only">Loading</span>
- {/if}
- {@render children?.()}
-</svelte:element>
+{#if href}
+ <a
+ bind:this={ref}
+ data-slot="button"
+ class={cn(buttonVariants({ variant, size }), className)}
+ href={disabled ? undefined : href}
+ aria-disabled={disabled}
+ role={disabled ? "link" : undefined}
+ tabindex={disabled ? -1 : undefined}
+ {...restProps}
+ >
+ {@render children?.()}
+ </a>
+{:else}
+ <button
+ bind:this={ref}
+ data-slot="button"
+ class={cn(buttonVariants({ variant, size }), className)}
+ {type}
+ {disabled}
+ {...restProps}
+ >
+ {@render children?.()}
+ </button>
+{/if}
diff --git a/frontend/src/lib/components/ui/button/index.ts b/frontend/src/lib/components/ui/button/index.ts
index 34c3e590c..fb585d768 100644
--- a/frontend/src/lib/components/ui/button/index.ts
+++ b/frontend/src/lib/components/ui/button/index.ts
@@ -1,16 +1,9 @@
-/*
- Installed from @ieedan/shadcn-svelte-extras
-*/
-
import Root, {
type ButtonProps,
type ButtonSize,
type ButtonVariant,
- type AnchorElementProps,
- type ButtonElementProps,
- type ButtonPropsWithoutHTML,
- buttonVariants
-} from './button.svelte';
+ buttonVariants,
+} from "./button.svelte";
export {
Root,
@@ -21,7 +14,4 @@ export {
type ButtonProps,
type ButtonSize,
type ButtonVariant,
- type AnchorElementProps,
- type ButtonElementProps,
- type ButtonPropsWithoutHTML
};
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-content.svelte b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-content.svelte
index 69797fe62..52460dbc6 100644
--- a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-content.svelte
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-content.svelte
@@ -1,15 +1,19 @@
<script lang="ts" module>
- import { cn } from "$lib/utils.js";
- import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
+ import { cn } from '$lib/utils.js';
+ import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
export type DropdownButtonContentProps = DropdownMenuPrimitive.ContentProps;
</script>
<script lang="ts">
+ import { tryUseDropdownButtonRoot } from './dropdown-button.svelte.js';
+ const root = tryUseDropdownButtonRoot();
+
let {
ref = $bindable(null),
sideOffset = 4,
portalProps,
+ align = root?.align ?? 'end',
class: className,
children,
...restProps
@@ -22,12 +26,12 @@
<DropdownMenuPrimitive.Content
bind:ref
{sideOffset}
+ {align}
class={cn(
- "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-32 overflow-hidden rounded-md border p-1 shadow-md outline-none",
+ 'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-32 overflow-hidden rounded-md border p-1 shadow-md outline-none',
className
)}
- {...restProps}
- >
+ {...restProps}>
<DropdownMenuPrimitive.Arrow />
{@render children?.()}
</DropdownMenuPrimitive.Content>
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-item.svelte b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-item.svelte
index a5ea6fa2a..e720c14f0 100644
--- a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-item.svelte
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-item.svelte
@@ -1,8 +1,19 @@
-<script lang="ts">
- import { cn } from '$lib/utils.js';
- import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
+<script lang="ts" module>
+ import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
+ import { cn } from '$lib/utils.js';
+ export type DropdownButtonItemProps = DropdownMenuPrimitive.ItemProps;
+</script>
- let { ref = $bindable(null), class: className, ...restProps }: DropdownMenuPrimitive.ItemProps = $props();
+<script lang="ts">
+ let { ref = $bindable(null), class: className, children, ...restProps }: DropdownButtonItemProps = $props();
</script>
-<DropdownMenuPrimitive.Item bind:ref class={cn('data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0', className)} {...restProps} />
+<DropdownMenuPrimitive.Item
+ bind:ref
+ class={cn(
+ 'data-highlighted:bg-accent data-highlighted:text-accent-foreground relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
+ className
+ )}
+ {...restProps}>
+ {@render children?.()}
+</DropdownMenuPrimitive.Item>
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-main.svelte b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-main.svelte
index be84e5143..991256bc7 100644
--- a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-main.svelte
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-main.svelte
@@ -1,18 +1,36 @@
<script lang="ts" module>
- import { cn, type WithElementRef } from '$lib/utils.js';
- import type { HTMLButtonAttributes } from 'svelte/elements';
- import { buttonVariants, type ButtonVariant, type ButtonSize } from '$lib/components/ui/button/button.svelte';
+ import { cn, type WithElementRef } from '$lib/utils.js';
+ import type { HTMLButtonAttributes } from 'svelte/elements';
+ import { buttonVariants, type ButtonVariant, type ButtonSize } from '$lib/components/ui/button/button.svelte';
- export type DropdownButtonMainProps = WithElementRef<HTMLButtonAttributes> & {
- variant?: ButtonVariant;
- size?: ButtonSize;
- };
+ export type DropdownButtonMainProps = WithElementRef<HTMLButtonAttributes> & {
+ variant?: ButtonVariant;
+ size?: ButtonSize;
+ };
</script>
<script lang="ts">
- let { class: className, variant = 'default', size = 'default', ref = $bindable(null), type = 'button', disabled, children, ...restProps }: DropdownButtonMainProps = $props();
+ import { tryUseDropdownButtonRoot } from './dropdown-button.svelte.js';
+ const root = tryUseDropdownButtonRoot();
+
+ let {
+ class: className,
+ variant = root?.variant ?? 'default',
+ size = root?.size ?? 'default',
+ ref = $bindable(null),
+ type = 'button',
+ disabled = root?.disabled ?? undefined,
+ children,
+ ...restProps
+ }: DropdownButtonMainProps = $props();
</script>
-<button bind:this={ref} data-slot="dropdown-button-main" class={cn(buttonVariants({ variant, size }), 'rounded-r-none border-r-0', className)} {type} {disabled} {...restProps}>
- {@render children?.()}
+<button
+ bind:this={ref}
+ data-slot="dropdown-button-main"
+ class={cn(buttonVariants({ variant, size }), 'rounded-r-none border-r-0', className)}
+ {type}
+ {disabled}
+ {...restProps}>
+ {@render children?.()}
</button>
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-separator.svelte b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-separator.svelte
index a22739f84..6177f75c5 100644
--- a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-separator.svelte
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-separator.svelte
@@ -1,22 +1,13 @@
<script lang="ts" module>
- import { cn } from "$lib/utils.js";
+ import { cn } from '$lib/utils.js';
- export type DropdownButtonSeparatorProps =
- DropdownMenuPrimitive.SeparatorProps;
+ export type DropdownButtonSeparatorProps = DropdownMenuPrimitive.SeparatorProps;
</script>
<script lang="ts">
- import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
+ import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
- let {
- ref = $bindable(null),
- class: className,
- ...restProps
- }: DropdownMenuPrimitive.SeparatorProps = $props();
+ let { ref = $bindable(null), class: className, ...restProps }: DropdownMenuPrimitive.SeparatorProps = $props();
</script>
-<DropdownMenuPrimitive.Separator
- bind:ref
- class={cn("bg-muted -mx-1 my-1 h-px", className)}
- {...restProps}
-/>
+<DropdownMenuPrimitive.Separator bind:ref class={cn('bg-muted -mx-1 my-1 h-px', className)} {...restProps} />
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte
index 91ab61c20..4e3775cf6 100644
--- a/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button-trigger.svelte
@@ -12,11 +12,30 @@
<script lang="ts">
import ChevronDown from '@lucide/svelte/icons/chevron-down';
+ import { tryUseDropdownButtonRoot } from './dropdown-button.svelte.js';
+ const root = tryUseDropdownButtonRoot();
- let { class: className, variant = 'default', size = 'default', ref = $bindable(null), type = 'button', disabled, builders = [], children, ...restProps }: DropdownButtonTriggerProps = $props();
+ let {
+ class: className,
+ variant = root?.variant ?? 'default',
+ size = root?.size ?? 'default',
+ ref = $bindable(null),
+ type = 'button',
+ disabled = root?.disabled ?? undefined,
+ builders = [],
+ children,
+ ...restProps
+ }: DropdownButtonTriggerProps = $props();
</script>
-<button bind:this={ref} use:builders[0] data-slot="dropdown-button-trigger" class={cn(buttonVariants({ variant, size }), 'rounded-l-none px-2 border-l border-l-background/20', className)} {type} {disabled} {...restProps}>
+<button
+ bind:this={ref}
+ use:builders[0]
+ data-slot="dropdown-button-trigger"
+ class={cn(buttonVariants({ variant, size }), 'rounded-l-none px-2 border-l border-l-background/20', className)}
+ {type}
+ {disabled}
+ {...restProps}>
{#if children}
{@render children()}
{:else}
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button.svelte b/frontend/src/lib/components/ui/dropdown-button/dropdown-button.svelte
index b9c5e5648..1648bf848 100644
--- a/frontend/src/lib/components/ui/dropdown-button/dropdown-button.svelte
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button.svelte
@@ -3,92 +3,31 @@
import type { HTMLAttributes } from 'svelte/elements';
import type { ButtonVariant, ButtonSize } from '$lib/components/ui/button/button.svelte';
- export type DropdownButtonOption = {
- label: string;
- value: string;
- disabled?: boolean;
- onclick?: () => void;
- };
-
export type DropdownButtonProps = WithElementRef<HTMLAttributes<HTMLDivElement>> & {
- // Simple mode props
- mainButtonText?: string;
- options?: DropdownButtonOption[];
- onMainButtonClick?: () => void;
variant?: ButtonVariant;
size?: ButtonSize;
align?: 'start' | 'center' | 'end';
disabled?: boolean;
- // Composable mode
- simple?: boolean;
};
</script>
<script lang="ts">
- import { DropdownMenu as DropdownMenuPrimitive } from 'bits-ui';
- import Main from './dropdown-button-main.svelte';
- import Trigger from './dropdown-button-trigger.svelte';
- import Content from './dropdown-button-content.svelte';
- import Item from './dropdown-button-item.svelte';
+ import { provideDropdownButtonRoot } from './dropdown-button.svelte.js';
let {
class: className,
ref = $bindable(null),
children,
- // Simple mode props
- mainButtonText,
- options,
- onMainButtonClick,
variant = 'default',
size = 'default',
align = 'end',
disabled = false,
- simple = false,
...restProps
}: DropdownButtonProps = $props();
- // Determine if we're in simple mode
- const isSimpleMode = $derived(simple || (mainButtonText && options));
-
- function handleMainClick() {
- if (onMainButtonClick) {
- onMainButtonClick();
- }
- }
-
- function handleOptionClick(option: DropdownButtonOption) {
- if (option.onclick) {
- option.onclick();
- }
- }
+ provideDropdownButtonRoot({ variant, size, align, disabled });
</script>
-{#if isSimpleMode && mainButtonText && options}
- <!-- Simple Mode: All-in-one component -->
- <DropdownMenuPrimitive.Root>
- <div bind:this={ref} data-slot="dropdown-button" class={cn('flex', className)} {...restProps}>
- <Main {variant} {size} {disabled} onclick={handleMainClick}>
- {mainButtonText}
- </Main>
-
- <DropdownMenuPrimitive.Trigger>
- {#snippet child({ props })}
- <Trigger {variant} {size} {disabled} {...props} />
- {/snippet}
- </DropdownMenuPrimitive.Trigger>
- </div>
-
- <Content {align} class="min-w-[200px]">
- {#each options as option (option.value)}
- <Item disabled={option.disabled} onclick={() => handleOptionClick(option)}>
- {option.label}
- </Item>
- {/each}
- </Content>
- </DropdownMenuPrimitive.Root>
-{:else}
- <!-- Composable Mode: Just the wrapper div -->
- <div bind:this={ref} data-slot="dropdown-button" class={cn('flex', className)} {...restProps}>
- {@render children?.()}
- </div>
-{/if}
+<div bind:this={ref} data-slot="dropdown-button" class={cn('flex', className)} {...restProps}>
+ {@render children?.()}
+</div>
diff --git a/frontend/src/lib/components/ui/dropdown-button/dropdown-button.svelte.ts b/frontend/src/lib/components/ui/dropdown-button/dropdown-button.svelte.ts
new file mode 100644
index 000000000..0b2930cd5
--- /dev/null
+++ b/frontend/src/lib/components/ui/dropdown-button/dropdown-button.svelte.ts
@@ -0,0 +1,27 @@
+import { Context } from 'runed';
+import type { ButtonSize, ButtonVariant } from '$lib/components/ui/button/button.svelte';
+
+export type DropdownButtonCtx = {
+ variant: ButtonVariant;
+ size: ButtonSize;
+ disabled: boolean;
+ align: 'start' | 'center' | 'end';
+};
+
+const ctx = new Context<DropdownButtonCtx>('dropdown-button-root');
+
+export function provideDropdownButtonRoot(props: DropdownButtonCtx) {
+ return ctx.set(props);
+}
+
+export function useDropdownButtonRoot() {
+ return ctx.get();
+}
+
+export function tryUseDropdownButtonRoot(): DropdownButtonCtx | null {
+ try {
+ return ctx.get();
+ } catch {
+ return null;
+ }
+}
diff --git a/frontend/src/lib/components/ui/dropdown-button/index.ts b/frontend/src/lib/components/ui/dropdown-button/index.ts
index 739ff7f55..c539e6212 100644
--- a/frontend/src/lib/components/ui/dropdown-button/index.ts
+++ b/frontend/src/lib/components/ui/dropdown-button/index.ts
@@ -29,5 +29,4 @@ export {
DropdownTrigger as DropdownButtonPrimitiveTrigger,
};
-// Re-export types
-export type { DropdownButtonOption, DropdownButtonProps } from './dropdown-button.svelte';
+export type { DropdownButtonProps } from './dropdown-button.svelte';
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 5c9a62a19..710c8077e 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -51,7 +51,7 @@
<Sidebar.Provider>
<AppSidebar {versionInformation} {user} />
<main class="flex-1">
- <section class="p-10">
+ <section class="p-5">
{@render children()}
</section>
</main>
diff --git a/frontend/src/routes/compose/[projectId]/+page.svelte b/frontend/src/routes/compose/[projectId]/+page.svelte
index e5dc55d74..23095c693 100644
--- a/frontend/src/routes/compose/[projectId]/+page.svelte
+++ b/frontend/src/routes/compose/[projectId]/+page.svelte
@@ -22,7 +22,7 @@
import { capitalizeFirstLetter } from '$lib/utils/string.utils';
import { invalidateAll } from '$app/navigation';
import { toast } from 'svelte-sonner';
- import CodeEditor from '$lib/components/editor.svelte';
+ import CodeEditor from '$lib/components/code-editor/editor.svelte';
import { tryCatch } from '$lib/utils/try-catch';
import { environmentAPI } from '$lib/services/api';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
@@ -47,7 +47,6 @@
saving: false
});
- // Remove local name/composeContent/envContent state; use form inputs instead
let originalName = $derived(editorState.originalName);
let originalComposeContent = $derived(editorState.originalComposeContent);
let originalEnvContent = $derived(editorState.originalEnvContent || '');
@@ -117,7 +116,6 @@
onSuccess: async (updatedStack: Project) => {
toast.success('Project updated successfully!');
- // Keep local "original" snapshots in sync so hasChanges resets
originalName = updatedStack.name;
originalComposeContent = $inputs.composeContent.value;
originalEnvContent = $inputs.envContent.value;
diff --git a/frontend/src/routes/compose/new/+page.svelte b/frontend/src/routes/compose/new/+page.svelte
index 67dc85980..baff6fa1a 100644
--- a/frontend/src/routes/compose/new/+page.svelte
+++ b/frontend/src/routes/compose/new/+page.svelte
@@ -4,23 +4,26 @@
import TerminalIcon from '@lucide/svelte/icons/terminal';
import CopyIcon from '@lucide/svelte/icons/copy';
import LoaderCircleIcon from '@lucide/svelte/icons/loader-circle';
+ import LayoutTemplateIcon from '@lucide/svelte/icons/layout-template';
import WandIcon from '@lucide/svelte/icons/wand';
import { Input } from '$lib/components/ui/input/index.js';
import { Label } from '$lib/components/ui/label/index.js';
import { goto, invalidateAll } from '$app/navigation';
import { toast } from 'svelte-sonner';
- import CodeEditor from '$lib/components/editor.svelte';
+ import CodeEditor from '$lib/components/code-editor/editor.svelte';
import { preventDefault, createForm } from '$lib/utils/form.utils';
import { tryCatch } from '$lib/utils/try-catch';
import { handleApiResultWithCallbacks } from '$lib/utils/api.util';
import { defaultComposeTemplate } from '$lib/constants';
- import { ArcaneButton } from '$lib/components/arcane-button/index.js';
import { Textarea } from '$lib/components/ui/textarea/index.js';
import * as Dialog from '$lib/components/ui/dialog/index.js';
import TemplateSelectionDialog from '$lib/components/dialogs/template-selection-dialog.svelte';
import { environmentAPI, converterAPI } from '$lib/services/api';
import type { Template } from '$lib/types/template.type';
+ import * as DropdownButton from '$lib/components/ui/dropdown-button/index.js';
import { z } from 'zod/v4';
+ import { arcaneButtonVariants, actionConfigs } from '$lib/components/arcane-button/variants';
+ import PlusCircleIcon from '@lucide/svelte/icons/plus-circle';
let { data } = $props();
@@ -30,9 +33,6 @@
let showConverterDialog = $state(false);
let isLoadingTemplateContent = $state(false);
- // Removed local name/compose/env variables in favor of form inputs
-
- // Form schema + initial values
const formSchema = z.object({
name: z
.string()
@@ -118,35 +118,47 @@
function useExample(command: string) {
dockerRunCommand = command;
}
+
+ const templateBtnClass = arcaneButtonVariants({
+ tone: actionConfigs.template?.tone ?? 'outline-primary',
+ size: 'default'
+ });
+
+ const dropdownContentClass =
+ 'arcane-dd-content min-w-[220px] overflow-visible rounded-lg border border-primary/30 bg-background/95 ' +
+ 'backdrop-blur supports-[backdrop-filter]:bg-background/80 ring-1 ring-inset ring-primary/20 shadow-sm p-1';
+
+ const dropdownItemClass =
+ 'flex cursor-pointer select-none items-center gap-2 rounded-md px-3 py-2 text-sm ' +
+ 'text-foreground/90 outline-none transition-colors ' +
+ 'hover:bg-primary/10 focus:bg-primary/10 ' +
+ 'data-[disabled]:opacity-50 data-[disabled]:pointer-events-none';
</script>
<div class="bg-background min-h-screen">
- <div class="bg-background/95 sticky top-0 z-20 border-b backdrop-blur">
+ <!-- Sticky header: softer glass effect without changing spacing -->
+ <div class="bg-background/80 supports-[backdrop-filter]:bg-background/60 sticky top-0 z-20 border-b backdrop-blur">
<div class="max-w-full px-4 py-3">
<div class="flex items-center justify-between">
<div class="flex items-center gap-3">
- <Button variant="ghost" size="sm" href="/compose">
+ <Button variant="ghost" size="sm" href="/compose" class="gap-2">
<ArrowLeftIcon class="size-4" />
Back
</Button>
<div class="bg-border h-4 w-px"></div>
<div class="flex items-center gap-2">
- <h1 class="text-lg font-semibold">Create New Project</h1>
+ <h1 class="text-lg font-semibold leading-none">Create New Project</h1>
</div>
</div>
+
<div class="flex items-center gap-2">
<Dialog.Root bind:open={showConverterDialog}>
- <Dialog.Trigger>
- <Button variant="outline" class="arcane-button-restart" disabled={saving || converting || isLoadingTemplateContent}>
- <TerminalIcon class="mr-2 size-4" />
- Convert Docker Run
- </Button>
- </Dialog.Trigger>
<Dialog.Content class="max-h-[80vh] sm:max-w-[800px]">
<Dialog.Header>
<Dialog.Title>Docker Run to Compose Converter</Dialog.Title>
<Dialog.Description>Convert existing docker run commands to Docker Compose format</Dialog.Description>
</Dialog.Header>
+
<div class="max-h-[60vh] space-y-4 overflow-y-auto">
<div class="space-y-2">
<Label for="dockerRunCommand">Docker Run Command</Label>
@@ -172,12 +184,13 @@
onclick={() => useExample(command)}
>
<CopyIcon class="mr-2 size-3 shrink-0" />
- <span class="truncate">{command}</span>
+ <span class=""> {command} </span>
</Button>
{/each}
</div>
</div>
</div>
+
<div class="flex w-full justify-end pt-4">
<Button type="button" disabled={!dockerRunCommand.trim() || converting} onclick={handleConvertDockerRun}>
{#if converting}
@@ -191,23 +204,63 @@
</div>
</Dialog.Content>
</Dialog.Root>
- <ArcaneButton
- action="template"
- onclick={() => (showTemplateDialog = true)}
- loading={saving || isLoadingTemplateContent}
- disabled={saving || converting || isLoadingTemplateContent}
- />
- <ArcaneButton
- action="create"
- onclick={() => handleSubmit()}
- loading={saving}
- disabled={!$inputs.name.value || !$inputs.composeContent.value || saving || converting || isLoadingTemplateContent}
- />
+
+ <DropdownButton.DropdownRoot>
+ <DropdownButton.Root align="center" class="inline-flex">
+ <DropdownButton.Main
+ disabled={!$inputs.name.value ||
+ !$inputs.composeContent.value ||
+ saving ||
+ converting ||
+ isLoadingTemplateContent}
+ onclick={() => handleSubmit()}
+ class={`${templateBtnClass} gap-2 rounded-r-none hover:!translate-y-0 focus-visible:!translate-y-0 active:!translate-y-0`}
+ >
+ {#if saving}
+ <LoaderCircleIcon class="size-4 animate-spin" />
+ Creating...
+ {:else}
+ <PlusCircleIcon class="size-4" />
+ Create Project
+ {/if}
+ </DropdownButton.Main>
+
+ <DropdownButton.DropdownTrigger>
+ {#snippet child({ props })}
+ <DropdownButton.Trigger
+ {...props}
+ class={[
+ props.class,
+ templateBtnClass,
+ '-ml-px rounded-l-none px-2',
+ 'hover:!translate-y-0 focus-visible:!translate-y-0 active:!translate-y-0'
+ ].join(' ')}
+ />
+ {/snippet}
+ </DropdownButton.DropdownTrigger>
+ </DropdownButton.Root>
+
+ <DropdownButton.Content class={dropdownContentClass}>
+ <DropdownButton.Item
+ class={dropdownItemClass}
+ disabled={saving || converting || isLoadingTemplateContent}
+ onclick={() => (showTemplateDialog = true)}
+ >
+ <LayoutTemplateIcon class="size-4" />
+ Use Template
+ </DropdownButton.Item>
+ <DropdownButton.Item class={dropdownItemClass} onclick={() => (showConverterDialog = true)}>
+ <TerminalIcon class="size-4" />
+ Convert from Docker Run
+ </DropdownButton.Item>
+ </DropdownButton.Content>
+ </DropdownButton.DropdownRoot>
</div>
</div>
</div>
</div>
+ <!-- Keep existing page padding -->
<div class="max-w-none p-6">
<div class="space-y-8">
<form class="space-y-6" onsubmit={preventDefault(handleSubmit)}>
@@ -226,15 +279,21 @@
/>
{#if $inputs.name.error}
<p class="text-destructive mt-1 text-xs">{$inputs.name.error}</p>
+ {:else}
+ <p class="text-muted-foreground mt-1 text-xs">Use letters, numbers, and hyphens only.</p>
{/if}
</div>
</div>
<div class="grid grid-cols-1 gap-6 lg:grid-cols-3">
+ <!-- Compose -->
<div class="lg:col-span-2">
<div class="space-y-4">
- <h3 class="text-lg font-semibold">Docker Compose File</h3>
- <div class="h-[590px] w-full overflow-hidden rounded-md">
+ <div class="flex items-center justify-between">
+ <h3 class="text-lg font-semibold">Docker Compose File</h3>
+ <span class="text-muted-foreground text-xs">YAML</span>
+ </div>
+ <div class="h-[590px] w-full">
<CodeEditor
bind:value={$inputs.composeContent.value}
language="yaml"
@@ -248,10 +307,14 @@
</div>
</div>
+ <!-- Env -->
<div class="lg:col-span-1">
<div class="space-y-4">
- <h3 class="text-lg font-semibold">Environment (.env)</h3>
- <div class="h-[590px] w-full overflow-hidden rounded-md">
+ <div class="flex items-center justify-between">
+ <h3 class="text-lg font-semibold">Environment (.env)</h3>
+ <span class="text-muted-foreground text-xs">Key=Value</span>
+ </div>
+ <div class="h-[590px] w-full">
<CodeEditor
bind:value={$inputs.envContent.value}
language="env"
@@ -276,3 +339,12 @@
onSelect={handleTemplateSelect}
onDownloadSuccess={invalidateAll}
/>
+
+<style>
+ :global(.arcane-dd-content [data-arrow]) {
+ background: color-mix(in srgb, var(--background), transparent 5%);
+ border: 1px solid color-mix(in srgb, var(--primary), transparent 70%);
+ box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.12);
+ z-index: 10;
+ }
+</style>
diff --git a/package.json b/package.json
index 025944263..47bddb9ea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "arcane-repo",
"private": true,
- "packageManager": "[email protected]",
+ "packageManager": "[email protected]",
"workspaces": [
"frontend",
"tests"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 85e6a97ec..0435d74f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,6 +10,9 @@ importers:
frontend:
dependencies:
+ '@codemirror/commands':
+ specifier: ^6.8.1
+ version: 6.8.1
'@codemirror/lang-yaml':
specifier: ^6.1.2
version: 6.1.2
@@ -25,6 +28,12 @@ importers:
'@codemirror/state':
specifier: ^6.5.2
version: 6.5.2
+ '@codemirror/view':
+ specifier: ^6.38.2
+ version: 6.38.2
+ '@lezer/highlight':
+ specifier: ^1.2.1
+ version: 1.2.1
'@sveltejs/adapter-static':
specifier: ^3.0.9
@@ -33,7 +42,10 @@ importers:
version: 8.21.3
'@uiw/codemirror-theme-github':
specifier: ^4.25.1
- version: 4.25.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
+ version: 4.25.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
+ '@uiw/codemirror-themes':
+ specifier: ^4.25.1
+ version: 4.25.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
axios:
specifier: ^1.11.0
version: 1.11.0
@@ -58,6 +70,9 @@ importers:
svelte-codemirror-editor:
specifier: ^1.4.1
+ thememirror:
+ specifier: ^2.0.1
+ version: 2.0.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
devDependencies:
'@eslint/compat':
specifier: ^1.3.2
@@ -66,11 +81,11 @@ importers:
specifier: ^9.33.0
version: 9.33.0
'@internationalized/date':
- specifier: ^3.8.2
- version: 3.8.2
+ specifier: ^3.9.0
+ version: 3.9.0
'@lucide/svelte':
- specifier: ^0.542.0
- version: 0.542.0([email protected])
+ specifier: ^0.525.0
+ version: 0.525.0([email protected])
'@sveltejs/kit':
specifier: ^2.31.0
@@ -90,8 +105,8 @@ importers:
specifier: ^4.0.9
version: 4.0.9
bits-ui:
- specifier: ^2.9.3
- version: 2.9.3(@internationalized/[email protected])([email protected])
+ specifier: ^2.9.6
+ version: 2.9.6(@internationalized/[email protected])([email protected])
bytes:
specifier: ^3.1.2
version: 3.1.2
@@ -213,8 +228,8 @@ packages:
'@codemirror/[email protected]':
resolution: {integrity: sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==}
- '@codemirror/[email protected]':
- resolution: {integrity: sha512-RmTOkE7hRU3OVREqFVITWHz6ocgBjv08GoePscAakgVQfciA3SGCEk7mb9IzwW61cKKmlTpHXG6DUE5Ubx+MGQ==}
+ '@codemirror/[email protected]':
+ resolution: {integrity: sha512-bTWAJxL6EOFLPzTx+O5P5xAO3gTqpatQ2b/ARQ8itfU/v2LlpS3pH2fkL0A3E/Fx8Y2St2KES7ZEV0sHTsSW/A==}
'@csstools/[email protected]':
resolution: {integrity: sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==}
@@ -489,8 +504,8 @@ packages:
resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
engines: {node: '>=18.18'}
- '@internationalized/[email protected]':
- resolution: {integrity: sha512-/wENk7CbvLbkUvX1tu0mwq49CVkkWpkXubGel6birjRPyo6uQ4nQpnq5xZu823zRCwwn82zgHrvgF1vZyvmVgA==}
+ '@internationalized/[email protected]':
+ resolution: {integrity: sha512-yaN3brAnHRD+4KyyOsJyk49XUvj2wtbNACSqg0bz3u8t2VuzhC8Q5dfRnrSxjnnbDb+ienBnkn1TzQfE154vyg==}
'@isaacs/[email protected]':
resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
@@ -524,8 +539,8 @@ packages:
resolution: {integrity: sha512-GuBLekbw9jDBDhGur82nuwkxKQ+a3W5H0GfaAthDXcAu+XdpS43VlnxA9E9hllkpSP5ellRDKjLLj7Lu9Wr6xA==}
- '@lucide/[email protected]':
- resolution: {integrity: sha512-NuWttxTVfMSURpOxcKiKvoCtma3JtEpcJWzF/0cO69saZfXlv6G8NYAvEEGLmk75YPl+I+ROe+F97WhddM8r2A==}
+ '@lucide/[email protected]':
+ resolution: {integrity: sha512-dyUxkXzepagLUzL8jHQNdeH286nC66ClLACsg+Neu/bjkRJWPWMzkT+H0DKlE70QdkicGCfs1ZGmXCc351hmZA==}
peerDependencies:
svelte: ^5
@@ -978,8 +993,8 @@ packages:
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
- resolution: {integrity: sha512-jSoi3U1pfhLQVKZ3j+1GbeuvT1w6cMbnrVWhObVE+DRuV+zcpKeUnd6zpz7NYF47HsSXVNjI1rJdZH+A5sNsOQ==}
+ resolution: {integrity: sha512-OzHktsQRsIz/hIMk5VwHo96Wpp/KY68q/ebUPUzTbvuFBrALB/X+QvO4KLgdczj5dfb3xHs9zpWq8yMH8ZbZlA==}
engines: {node: '>=20'}
peerDependencies:
'@internationalized/date': ^3.8.1
@@ -1990,6 +2005,13 @@ packages:
resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
engines: {node: '>=18'}
+ resolution: {integrity: sha512-d5i6FVvWWPkwrm4cHLI3t9AT1OrkAt7Ig8dtdYSofgF7C/eiyNuq6zQzSTusWTde3jpW9WLvA9J/fzNKMUsd0w==}
+ peerDependencies:
+ '@codemirror/language': ^6.0.0
+ '@codemirror/state': ^6.0.0
+ '@codemirror/view': ^6.0.0
+
resolution: {integrity: sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==}
@@ -2255,14 +2277,14 @@ snapshots:
dependencies:
'@codemirror/language': 6.11.3
'@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.1
+ '@codemirror/view': 6.38.2
'@lezer/common': 1.2.3
'@codemirror/[email protected]':
dependencies:
'@codemirror/language': 6.11.3
'@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.1
+ '@codemirror/view': 6.38.2
'@lezer/common': 1.2.3
'@codemirror/[email protected]':
@@ -2278,7 +2300,7 @@ snapshots:
'@codemirror/[email protected]':
dependencies:
'@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.1
+ '@codemirror/view': 6.38.2
'@lezer/common': 1.2.3
'@lezer/highlight': 1.2.1
'@lezer/lr': 1.4.2
@@ -2291,20 +2313,20 @@ snapshots:
'@codemirror/[email protected]':
dependencies:
'@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.1
+ '@codemirror/view': 6.38.2
crelt: 1.0.6
'@codemirror/[email protected]':
dependencies:
'@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.1
+ '@codemirror/view': 6.38.2
crelt: 1.0.6
'@codemirror/[email protected]':
dependencies:
'@marijn/find-cluster-break': 1.0.2
- '@codemirror/[email protected]':
+ '@codemirror/[email protected]':
dependencies:
'@codemirror/state': 6.5.2
crelt: 1.0.6
@@ -2503,7 +2525,7 @@ snapshots:
'@humanwhocodes/[email protected]': {}
- '@internationalized/[email protected]':
+ '@internationalized/[email protected]':
dependencies:
'@swc/helpers': 0.5.17
@@ -2546,7 +2568,7 @@ snapshots:
'@lezer/highlight': 1.2.1
'@lezer/lr': 1.4.2
dependencies:
svelte: 5.38.1
@@ -2921,19 +2943,19 @@ snapshots:
'@typescript-eslint/types': 8.39.1
eslint-visitor-keys: 4.2.1
- '@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
+ '@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
dependencies:
- '@uiw/codemirror-themes': 4.25.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
+ '@uiw/codemirror-themes': 4.25.1(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
transitivePeerDependencies:
- '@codemirror/language'
- '@codemirror/state'
- '@codemirror/view'
- '@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
+ '@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.1
+ '@codemirror/view': 6.38.2
'@vinejs/[email protected]':
optional: true
@@ -2993,11 +3015,11 @@ snapshots:
dependencies:
'@floating-ui/core': 1.7.3
'@floating-ui/dom': 1.7.3
- '@internationalized/date': 3.8.2
+ '@internationalized/date': 3.9.0
esm-env: 1.2.2
runed: 0.29.2([email protected])
svelte: 5.38.1
@@ -3060,7 +3082,7 @@ snapshots:
'@codemirror/lint': 6.8.5
'@codemirror/search': 6.5.11
'@codemirror/state': 6.5.2
- '@codemirror/view': 6.38.1
+ '@codemirror/view': 6.38.2
dependencies:
@@ -3996,6 +4018,12 @@ snapshots:
mkdirp: 3.0.1
yallist: 5.0.0
+ dependencies:
+ '@codemirror/language': 6.11.3
+ '@codemirror/state': 6.5.2
+ '@codemirror/view': 6.38.2
+
optional: true