From e7983570d58fc5345be7ea24bc0beda4cb872a0d Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Sun, 27 Apr 2025 04:57:44 +0200 Subject: [PATCH] feat fix stuff --- package.json | 4 +- pnpm-lock.yaml | 21 +- src/lib/components/breadcrumbs.svelte | 21 +- src/lib/components/chat/(markdown)/Pre.svelte | 2 +- src/lib/components/chat/chat.svelte | 111 ++- src/lib/components/chat/conversation.svelte | 57 +- src/lib/components/chat/databaseDoc.txt | 34 - src/lib/components/chat/parser.test.ts | 32 +- src/lib/components/chat/parser.ts | 26 +- .../components/editor/(filesystem)/index.ts | 22 +- src/lib/components/editor/editor.svelte | 31 +- src/lib/components/editor/filesystem.svelte | 7 +- src/lib/components/editor/filesystem.ts | 4 +- src/lib/components/studio/terminal.svelte | 126 +++- src/lib/constants.ts | 3 +- src/lib/helpers/functions.ts | 18 +- src/lib/layout/shellStudio.svelte | 91 ++- src/lib/sdk/imagine.ts | 698 ++++++++++++++++++ src/lib/stores/chat.ts | 2 + src/lib/stores/sdk.ts | 4 +- src/routes/(console)/+layout.svelte | 2 +- .../(console)/project-[project]/+layout.ts | 23 - .../(console)/project-[project]/store.ts | 8 - .../project-[project]/studio/+layout.ts | 22 + .../project-[project]/studio/+page.svelte | 42 +- .../studio/artifact-[artifact]/+layout.svelte | 137 ++++ .../studio/artifact-[artifact]/+layout.ts | 8 + .../studio/artifact-[artifact]/+page.svelte | 164 +--- .../artifact-[artifact]/code/+page.svelte | 42 +- src/themes/dark-studio.json | 10 +- src/themes/light-studio.json | 8 +- svelte.config.js | 1 - vite.config.ts | 2 +- 33 files changed, 1346 insertions(+), 437 deletions(-) delete mode 100644 src/lib/components/chat/databaseDoc.txt create mode 100644 src/lib/sdk/imagine.ts create mode 100644 src/routes/(console)/project-[project]/studio/+layout.ts create mode 100644 src/routes/(console)/project-[project]/studio/artifact-[artifact]/+layout.svelte create mode 100644 src/routes/(console)/project-[project]/studio/artifact-[artifact]/+layout.ts diff --git a/package.json b/package.json index 280c3841f..d7988c84a 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,11 @@ "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", - "@xterm/xterm": "^5.5.0", "ai": "^2.2.37", "analytics": "^0.8.16", "cron-parser": "^4.9.0", "dayjs": "^1.11.13", "deep-equal": "^2.2.3", - "dotenv": "^16.4.7", "echarts": "^5.6.0", "envfile": "^7.1.0", "ignore": "^6.0.2", @@ -69,6 +67,8 @@ "@typescript-eslint/eslint-plugin": "^8.28.0", "@typescript-eslint/parser": "^8.28.0", "@vitest/ui": "^3.0.9", + "@xterm/addon-fit": "^0.10.0", + "@xterm/xterm": "^5.5.0", "eslint": "^9.23.0", "eslint-config-prettier": "^10.1.0", "eslint-plugin-svelte": "^3.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4fb650293..62ac98f64 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,9 +32,6 @@ importers: '@stripe/stripe-js': specifier: ^3.5.0 version: 3.5.0 - '@xterm/xterm': - specifier: ^5.5.0 - version: 5.5.0 ai: specifier: ^2.2.37 version: 2.2.37(react@18.3.1)(solid-js@1.9.5)(svelte@5.25.3)(vue@3.5.13(typescript@5.8.2)) @@ -50,9 +47,6 @@ importers: deep-equal: specifier: ^2.2.3 version: 2.2.3 - dotenv: - specifier: ^16.4.7 - version: 16.4.7 echarts: specifier: ^5.6.0 version: 5.6.0 @@ -147,6 +141,12 @@ importers: '@vitest/ui': specifier: ^3.0.9 version: 3.0.9(vitest@3.0.9) + '@xterm/addon-fit': + specifier: ^0.10.0 + version: 0.10.0(@xterm/xterm@5.5.0) + '@xterm/xterm': + specifier: ^5.5.0 + version: 5.5.0 eslint: specifier: ^9.23.0 version: 9.23.0 @@ -1495,6 +1495,11 @@ packages: '@vue/shared@3.5.13': resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} + '@xterm/addon-fit@0.10.0': + resolution: {integrity: sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==} + peerDependencies: + '@xterm/xterm': ^5.0.0 + '@xterm/xterm@5.5.0': resolution: {integrity: sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==} @@ -5153,6 +5158,10 @@ snapshots: '@vue/shared@3.5.13': {} + '@xterm/addon-fit@0.10.0(@xterm/xterm@5.5.0)': + dependencies: + '@xterm/xterm': 5.5.0 + '@xterm/xterm@5.5.0': {} acorn-import-attributes@1.9.5(acorn@8.14.1): diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte index f28bd3337..47ac898c9 100644 --- a/src/lib/components/breadcrumbs.svelte +++ b/src/lib/components/breadcrumbs.svelte @@ -15,7 +15,7 @@ import { newOrgModal } from '$lib/stores/organization'; import { Click, trackEvent } from '$lib/actions/analytics'; import { page } from '$app/stores'; - import { artifacts } from '$routes/(console)/project-[project]/store'; + import type { Artifact } from '$lib/sdk/imagine'; type Project = { name: string; @@ -73,13 +73,14 @@ export let organizations: Organization[] = []; - $: displayArtifacts = $page.url.pathname.includes('artifact') && isStudio ? $artifacts : []; - + $: displayArtifacts = ( + $page.url.pathname.includes('artifact') && isStudio ? $page.data.artifacts.artifacts : [] + ) as Artifact[]; $: selectedOrg = organizations.find((organization) => organization.isSelected); $: selectedProject = selectedOrg?.projects.find((project) => project.isSelected); - $: selectedArtifact = displayArtifacts.find((artifact) => - $page.url.pathname.endsWith(artifact.$id) - ); + $: selectedArtifact = displayArtifacts.find( + (artifact) => $page.params.artifact === artifact.$id + ) as Artifact; let organisationBottomSheetOpen = false; let projectsBottomSheetOpen = false; @@ -203,7 +204,7 @@ .map((artifact, index) => { if (index < 4) { return { - name: artifact.title, + name: artifact.name, href: `${base}/project-${selectedProject.$id}/studio/artifact-${artifact.$id}` }; } else if (index === 4) { @@ -417,7 +418,7 @@ class="trigger" use:melt={$triggerArtifacts} aria-label="Open artifacts tab"> - {selectedArtifact.title} + {selectedArtifact?.name} {:else} @@ -426,7 +427,7 @@ class="trigger" on:click={() => (artifactsBottomSheetOpen = true)} aria-label="Open artifacts tab"> - {selectedArtifact.title} + {selectedArtifact.name} {/if} @@ -440,7 +441,7 @@ {artifact.title}{artifact.name} {:else if index === 4} diff --git a/src/lib/components/chat/(markdown)/Pre.svelte b/src/lib/components/chat/(markdown)/Pre.svelte index 0385342ce..4fa864ce7 100644 --- a/src/lib/components/chat/(markdown)/Pre.svelte +++ b/src/lib/components/chat/(markdown)/Pre.svelte @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/lib/components/chat/chat.svelte b/src/lib/components/chat/chat.svelte index e40ac9041..6a5d4d9d7 100644 --- a/src/lib/components/chat/chat.svelte +++ b/src/lib/components/chat/chat.svelte @@ -1,22 +1,87 @@
- + {/if} -
+
- - + + + + + {#if sending} + + {:else} + + {/if} +
-
+
import 'highlight.js/styles/atom-one-light.css'; - import { createStreamParser } from './parser'; - import data from './text.txt?raw'; - import { - Badge, - Button, - Card, - Fieldset, - Icon, - Layout, - Tag, - Input - } from '@appwrite.io/pink-svelte'; + import { StreamParser } from './parser'; + import { Badge, Card, Icon, Layout, Tag } from '@appwrite.io/pink-svelte'; import Markdown, { type Plugin } from 'svelte-exmarkdown'; import Li from './(markdown)/Li.svelte'; import H1 from './(markdown)/H1.svelte'; @@ -23,10 +13,17 @@ import Ol from './(markdown)/Ol.svelte'; import rehypeHighlight from 'rehype-highlight'; import { IconArrowDown, IconCheck, IconClock } from '@appwrite.io/pink-icons-svelte'; - import type { UIEventHandler, WheelEventHandler } from 'svelte/elements'; import { slide } from 'svelte/transition'; - import { showPrompt } from '$lib/stores/chat'; + import type { UIEventHandler, WheelEventHandler } from 'svelte/elements'; + type Props = { + parser: StreamParser; + autoscroll?: boolean; + streaming?: boolean; + }; + let { parser, autoscroll = $bindable(true), streaming = $bindable(false) }: Props = $props(); + + const chunks = parser.parsed; const plugins: Plugin[] = [ { rehypePlugin: rehypeHighlight, @@ -43,40 +40,12 @@ } ]; - const parser = createStreamParser(); - const chunks = parser.parsed; - let autoscroll = true; - let streaming = false; - - $: if ($showPrompt) { - exampleStream(); - } - - let chunkSize = 40; - let delayMs = 25; function scrollToBottom(smooth: boolean = true) { document .getElementById('bottom') .scrollIntoView({ behavior: smooth ? 'smooth' : 'instant' }); } - function exampleStream(): void { - let position = 0; - const processNextChunk = () => { - if (position < data.length) { - streaming = true; - const chunk = data.substring(position, position + chunkSize); - parser.chunk(chunk); - position += chunkSize; - if (autoscroll) scrollToBottom(); - setTimeout(processNextChunk, delayMs); - } else { - streaming = false; - } - }; - processNextChunk(); - } - const onwheel: WheelEventHandler = (event) => { if (streaming) autoscroll = false; }; @@ -131,7 +100,7 @@ {/if} {/each} {#if !streaming} - + {/if}
diff --git a/src/lib/components/chat/databaseDoc.txt b/src/lib/components/chat/databaseDoc.txt deleted file mode 100644 index 02ffaaf9c..000000000 --- a/src/lib/components/chat/databaseDoc.txt +++ /dev/null @@ -1,34 +0,0 @@ -Databases are the largest organizational unit in Appwrite. -Each database contains a group of [collections](/docs/products/databases/collections). -In future versions, different databases may be backed by a different database technology of your choosing. - -## Create in Console -The easiest way to create a database using the Appwrite Console. -You can create a database by navigating to the **Databases** page and clicking **Create database**. - -## Create using Server SDKs -You can programmatically create databases using a [Server SDK](/docs/sdks#server). Appwrite [Server SDKs](/docs/sdks#server) require an [API key](/docs/advanced/platform/api-keys). - -```js -const sdk = require('node-appwrite'); - -// Init SDK -const client = new sdk.Client(); - -const databases = new sdk.Databases(client); - -client - .setEndpoint('https://cloud.appwrite.io/v1') - .setProject('') - .setKey('919c2d18fb5d4...a2ae413da83346ad2') -; - -const promise = databases.create('' -, '[NAME]'); - -promise.then(function (response) { - console.log(response); -}, function (error) { - console.log(error); -}); -``` \ No newline at end of file diff --git a/src/lib/components/chat/parser.test.ts b/src/lib/components/chat/parser.test.ts index 2dc49029e..ee8a7d39c 100644 --- a/src/lib/components/chat/parser.test.ts +++ b/src/lib/components/chat/parser.test.ts @@ -253,12 +253,12 @@ const client = new Client(); parser.chunk('console.log("test");'); parser.end(); - + let items: ParsedItem[] = []; parser.parsed.subscribe((value) => { items = value; })(); - + expect(items.length).toBe(1); const [item] = items; expectAction(item); @@ -267,14 +267,16 @@ const client = new Client(); }); it('should handle multiple adjacent actions without text between', () => { - parser.chunk('code1code2'); + parser.chunk( + 'code1code2' + ); parser.end(); - + let items: ParsedItem[] = []; parser.parsed.subscribe((value) => { items = value; })(); - + expect(items.length).toBe(2); const [action1, action2] = items; expectAction(action1); @@ -288,12 +290,12 @@ const client = new Client(); it('should handle empty action content correctly', () => { parser.chunk(''); parser.end(); - + let items: ParsedItem[] = []; parser.parsed.subscribe((value) => { items = value; })(); - + expect(items.length).toBe(1); const [item] = items; expectAction(item); @@ -304,12 +306,12 @@ const client = new Client(); it('should filter out empty text chunks', () => { parser.chunk(' \n command \n '); parser.end(); - + let items: ParsedItem[] = []; parser.parsed.subscribe((value) => { items = value; })(); - + // Only the action should remain, empty text chunks should be filtered expect(items.length).toBe(1); const [item] = items; @@ -321,12 +323,12 @@ const client = new Client(); parser.chunk('content'); parser.end(); - + let items: ParsedItem[] = []; parser.parsed.subscribe((value) => { items = value; })(); - + expect(items.length).toBe(1); const [item] = items; expectAction(item); @@ -340,12 +342,12 @@ const client = new Client(); parser.chunk(largeText); parser.chunk(''); parser.end(); - + let items: ParsedItem[] = []; parser.parsed.subscribe((value) => { items = value; })(); - + expect(items.length).toBe(2); const [text, action] = items; expectText(text); @@ -357,12 +359,12 @@ const client = new Client(); parser.chunk('content'); // No closing tag, but end() is called parser.end(); - + let items: ParsedItem[] = []; parser.parsed.subscribe((value) => { items = value; })(); - + expect(items.length).toBe(1); const [item] = items; expectAction(item); diff --git a/src/lib/components/chat/parser.ts b/src/lib/components/chat/parser.ts index 6d00b4f8d..77c9cea3d 100644 --- a/src/lib/components/chat/parser.ts +++ b/src/lib/components/chat/parser.ts @@ -30,10 +30,30 @@ export class StreamParser { private isFirstActionContent = false; private skipCurrentAction = false; private pendingText = ''; + private callbacksEnabled = true; + private callbacks: Record<'complete', Array<(action: Action) => void | Promise>> = { + complete: [] + }; public parsed: Readable = this.store; constructor() {} + private triggerCallbacks(event: keyof typeof this.callbacks, action: Action) { + if (!this.callbacksEnabled) return; + this.callbacks.complete.forEach((callback) => callback(action)); + } + + public on(event: 'complete', callback: (action: Action) => void | Promise): void { + this.callbacks[event].push(callback); + } + + public init(text: string): void { + this.reset(); + this.callbacksEnabled = false; + this.chunk(text); + this.callbacksEnabled = true; + } + public chunk(text: string): void { this.buffer += text; this.parse(); @@ -100,6 +120,7 @@ export class StreamParser { } this.currentAction.complete = true; + this.triggerCallbacks('complete', this.currentAction); this.updateStore(); } @@ -187,7 +208,7 @@ export class StreamParser { private parseAttributes(attributeString: string): Record { const attributes: Record = {}; const regex = /(\w+)=["']([^"']*)["']/g; - let match; + let match: RegExpExecArray; while ((match = regex.exec(attributeString)) !== null) { attributes[match[1]] = match[2]; @@ -206,6 +227,7 @@ export class StreamParser { // Reset the parser state public reset(): void { this.items = []; + this.callbacksEnabled = true; this.currentAction = null; this.currentTextChunk = null; this.isFirstActionContent = false; @@ -269,6 +291,7 @@ export class StreamParser { ); } this.currentAction.complete = true; + this.triggerCallbacks('complete', this.currentAction); } else { this.addToTextChunk(this.buffer); } @@ -286,6 +309,7 @@ export class StreamParser { ); } this.currentAction.complete = true; + this.triggerCallbacks('complete', this.currentAction); this.updateStore(); } diff --git a/src/lib/components/editor/(filesystem)/index.ts b/src/lib/components/editor/(filesystem)/index.ts index bf15a5d91..3917f2167 100644 --- a/src/lib/components/editor/(filesystem)/index.ts +++ b/src/lib/components/editor/(filesystem)/index.ts @@ -1,23 +1,27 @@ -import type { FileSystem } from '../filesystem'; +import type { ComponentType } from 'svelte'; import { IconArrowLeft, IconFolder, IconFolderOpen, IconJs, IconSvelte, - IconCss3 + IconCss3, + IconDocument, + IconHtml5 } from '@appwrite.io/pink-icons-svelte'; -export const icons = { +export const icons: Record = { svelte: IconSvelte, + file: IconDocument, folder: IconFolder, + html: IconHtml5, folderOpen: IconFolderOpen, js: IconJs, highlight: IconArrowLeft, css: IconCss3 }; -type Icon = 'svelte' | 'folder' | 'js' | 'css'; +type Icon = 'svelte' | 'folder' | 'folderOpen' | 'html' | 'js' | 'css' | 'file' | 'highlight'; export type TreeItem = { path: string; @@ -29,15 +33,17 @@ export type TreeItem = { function getIcon(filename: string): Icon { if (filename.endsWith('.js')) return 'js'; if (filename.endsWith('.ts')) return 'js'; - if (filename.endsWith('.html')) return 'svelte'; + if (filename.endsWith('.html')) return 'html'; if (filename.endsWith('.css')) return 'css'; - return 'folder'; + if (filename.endsWith('.svelte')) return 'svelte'; + + return 'file'; } -export function treeFromFilesystem(fs: FileSystem): TreeItem[] { +export function treeFromFilesystem(files: string[]): TreeItem[] { const tree: TreeItem[] = []; - for (const path of fs) { + for (const path of files) { const parts = path.split('/'); let currentLevel = tree; diff --git a/src/lib/components/editor/editor.svelte b/src/lib/components/editor/editor.svelte index f993ea358..a3d0d3b4d 100644 --- a/src/lib/components/editor/editor.svelte +++ b/src/lib/components/editor/editor.svelte @@ -6,6 +6,8 @@ import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker'; import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'; import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'; + import { throttle } from '$lib/helpers/functions'; + import { app } from '$lib/stores/app'; let editorElement: HTMLDivElement; let editor: monaco.editor.IStandaloneCodeEditor; @@ -18,6 +20,16 @@ editor.setModel(model); } + export function resize(height: number, width: number) { + editor?.layout( + { + height, + width + }, + true + ); + } + onMount(async () => { self.MonacoEnvironment = { getWorker(_workerId: string, label: string) { @@ -40,23 +52,36 @@ monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true); editor = monaco.editor.create(editorElement, { - automaticLayout: true, - theme: 'vs-light' + theme: $app.themeInUse === 'light' ? 'vs-light' : 'vs-dark' }); loadCode(code, 'typescript'); + + const resizer = throttle(() => { + if (!editorElement) return; + editor.layout({ + height: editorElement.offsetHeight, + width: editorElement.offsetWidth + }); + }, 50); + const observer = new ResizeObserver(resizer); + + observer.observe(editorElement); }); onDestroy(() => { monaco?.editor.getModels().forEach((model) => model.dispose()); editor?.dispose(); }); + + $: monaco.editor.setTheme($app.themeInUse === 'light' ? 'vs-light' : 'vs-dark');
diff --git a/src/lib/components/editor/filesystem.svelte b/src/lib/components/editor/filesystem.svelte index 167abf65b..8c9377c5e 100644 --- a/src/lib/components/editor/filesystem.svelte +++ b/src/lib/components/editor/filesystem.svelte @@ -2,14 +2,13 @@ import { createTreeView } from '@melt-ui/svelte'; import { setContext } from 'svelte'; import { treeFromFilesystem } from './(filesystem)'; - import type { FileSystem } from './filesystem'; import Tree from './(filesystem)/tree.svelte'; type Props = { - filesystem: FileSystem; + files: string[]; onopenfile?: (path: string) => void; }; - let { filesystem, onopenfile = null }: Props = $props(); + let { files, onopenfile = null }: Props = $props(); const ctx = createTreeView(); setContext('tree', ctx); @@ -19,7 +18,7 @@ states: { selectedItem } } = ctx; - const items = $derived(treeFromFilesystem(filesystem)); + const items = $derived(treeFromFilesystem(files)); $effect(() => { if ($selectedItem && onopenfile) { if ($selectedItem.dataset['file'] === 'true') { diff --git a/src/lib/components/editor/filesystem.ts b/src/lib/components/editor/filesystem.ts index e353ef02a..8cb1b1b47 100644 --- a/src/lib/components/editor/filesystem.ts +++ b/src/lib/components/editor/filesystem.ts @@ -1,5 +1,5 @@ import { writable } from 'svelte/store'; -export type FileSystem = string[]; +export type FileSystem = Record; -export const createFileSystem = (initial: FileSystem = []) => writable(initial); +export const filesystem = writable({}); diff --git a/src/lib/components/studio/terminal.svelte b/src/lib/components/studio/terminal.svelte index e5fca9d8b..fafad0bc3 100644 --- a/src/lib/components/studio/terminal.svelte +++ b/src/lib/components/studio/terminal.svelte @@ -1,21 +1,117 @@ -
- +
diff --git a/src/routes/(console)/project-[project]/studio/artifact-[artifact]/+layout.ts b/src/routes/(console)/project-[project]/studio/artifact-[artifact]/+layout.ts new file mode 100644 index 000000000..e752fb264 --- /dev/null +++ b/src/routes/(console)/project-[project]/studio/artifact-[artifact]/+layout.ts @@ -0,0 +1,8 @@ +import { sdk } from '$lib/stores/sdk'; +import type { LayoutLoad } from './$types'; + +export const load: LayoutLoad = async ({ params, parent }) => { + return { + artifact: await sdk.forProject.imagine.get(params.artifact) + }; +}; diff --git a/src/routes/(console)/project-[project]/studio/artifact-[artifact]/+page.svelte b/src/routes/(console)/project-[project]/studio/artifact-[artifact]/+page.svelte index 43454166b..16210da21 100644 --- a/src/routes/(console)/project-[project]/studio/artifact-[artifact]/+page.svelte +++ b/src/routes/(console)/project-[project]/studio/artifact-[artifact]/+page.svelte @@ -1,160 +1,30 @@ - - - - {#each tabs as tab} - - {tab.title} - - {/each} - - - - - - - - -
+ + + + + + -
- -
-
-
+
+ +
- diff --git a/src/routes/(console)/project-[project]/studio/artifact-[artifact]/code/+page.svelte b/src/routes/(console)/project-[project]/studio/artifact-[artifact]/code/+page.svelte index 631cc4e89..d6a91f245 100644 --- a/src/routes/(console)/project-[project]/studio/artifact-[artifact]/code/+page.svelte +++ b/src/routes/(console)/project-[project]/studio/artifact-[artifact]/code/+page.svelte @@ -1,40 +1,34 @@ - -
- -
-
- -
-
+
+ + +
+ + diff --git a/src/themes/dark-studio.json b/src/themes/dark-studio.json index 883e9cee7..ae71bdb51 100644 --- a/src/themes/dark-studio.json +++ b/src/themes/dark-studio.json @@ -1,6 +1,6 @@ { - "bgcolor-accent": "var(--neutral-50)", - "bgcolor-accent-secondary": "var(--neutral-100)", - "bgcolor-accent-tertiary": "var(--neutral-150)", - "fgcolor-on-accent": "var(--neutral-950)" -} \ No newline at end of file + "bgcolor-accent": "var(--neutral-50)", + "bgcolor-accent-secondary": "var(--neutral-100)", + "bgcolor-accent-tertiary": "var(--neutral-150)", + "fgcolor-on-accent": "var(--neutral-950)" +} diff --git a/src/themes/light-studio.json b/src/themes/light-studio.json index de1571df5..d33cc287b 100644 --- a/src/themes/light-studio.json +++ b/src/themes/light-studio.json @@ -1,5 +1,5 @@ { - "bgcolor-accent": "var(--neutral-1000)", - "bgcolor-accent-secondary": "var(--neutral-900)", - "bgcolor-accent-tertiary": "var(--neutral-850)" -} \ No newline at end of file + "bgcolor-accent": "var(--neutral-1000)", + "bgcolor-accent-secondary": "var(--neutral-900)", + "bgcolor-accent-tertiary": "var(--neutral-850)" +} diff --git a/svelte.config.js b/svelte.config.js index 71f6ccaf9..fa3ef0727 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,7 +1,6 @@ import adapter from '@sveltejs/adapter-static'; import { sveltePreprocess } from 'svelte-preprocess'; import { preprocessMeltUI, sequence } from '@melt-ui/pp'; -import 'dotenv/config'; /** @type {import('@sveltejs/kit').Config} */ const config = { diff --git a/vite.config.ts b/vite.config.ts index 47086a375..d0a9f9bf0 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -12,7 +12,7 @@ export default defineConfig({ project: 'console' } }), - sveltekit(), + sveltekit() ], optimizeDeps: { include: ['echarts', 'prismjs']