diff --git a/src/livecodes/editor/codejar/prism-themes.ts b/src/livecodes/editor/codejar/prism-themes.ts index 57bd7e77d..53fe0a1bc 100644 --- a/src/livecodes/editor/codejar/prism-themes.ts +++ b/src/livecodes/editor/codejar/prism-themes.ts @@ -3,6 +3,7 @@ import { prismOfficialThemesBaseUrl, prismThemesBaseUrl, prismThemesLaserWaveUrl, + vendorsBaseUrl, } from '../../vendors'; const changeLineNumberColor = (color: string) => @@ -21,6 +22,26 @@ export const prismThemes: Array<{ title: 'Base16 Ateliersulphurpool Light', url: prismThemesBaseUrl + 'prism-base16-ateliersulphurpool.light.css', }, + { + name: 'catppuccin-latte', + title: 'Catppuccin Latte', + url: vendorsBaseUrl + 'catppuccin/prism/latte.css', + }, + { + name: 'catppuccin-frappe', + title: 'Catppuccin Frappe', + url: vendorsBaseUrl + 'catppuccin/prism/frappe.css', + }, + { + name: 'catppuccin-macchiato', + title: 'Catppuccin Macchiato', + url: vendorsBaseUrl + 'catppuccin/prism/macchiato.css', + }, + { + name: 'catppuccin-mocha', + title: 'Catppuccin Mocha', + url: vendorsBaseUrl + 'catppuccin/prism/mocha.css', + }, { name: 'cb', title: 'CB', url: prismThemesBaseUrl + 'prism-cb.css' }, { name: 'coldark-cold', diff --git a/src/livecodes/editor/codemirror/codemirror-themes.ts b/src/livecodes/editor/codemirror/codemirror-themes.ts index 4c22ad0b0..d7de0d9fc 100644 --- a/src/livecodes/editor/codemirror/codemirror-themes.ts +++ b/src/livecodes/editor/codemirror/codemirror-themes.ts @@ -13,6 +13,7 @@ import { cm6ThemeSolarizedLightUrl, ddietrCmThemesBaseUrl, thememirrorBaseUrl, + vendorsBaseUrl, } from '../../vendors'; export const codemirrorThemes: Array<{ @@ -75,6 +76,30 @@ export const codemirrorThemes: Array<{ url: thememirrorBaseUrl + 'boys-and-girls.js', exportName: 'boysAndGirls', }, + { + name: 'catppuccin-latte', + title: 'Catppuccin Latte', + url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js', + exportName: 'catppuccinLatte', + }, + { + name: 'catppuccin-frappe', + title: 'Catppuccin Frappe', + url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js', + exportName: 'catppuccinFrappe', + }, + { + name: 'catppuccin-macchiato', + title: 'Catppuccin Macchiato', + url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js', + exportName: 'catppuccinMacchiato', + }, + { + name: 'catppuccin-mocha', + title: 'Catppuccin Mocha', + url: vendorsBaseUrl + 'catppuccin/codemirror/codemirror-theme-catppuccin.js', + exportName: 'catppuccinMocha', + }, { name: 'clouds', title: 'Clouds', diff --git a/src/livecodes/editor/monaco/monaco-themes.ts b/src/livecodes/editor/monaco/monaco-themes.ts index f5f5fd1e5..831ef0267 100644 --- a/src/livecodes/editor/monaco/monaco-themes.ts +++ b/src/livecodes/editor/monaco/monaco-themes.ts @@ -1,6 +1,6 @@ import type * as Monaco from 'monaco-editor'; import type { MonacoTheme } from '../../models'; -import { monacoThemesBaseUrl } from '../../vendors'; +import { monacoThemesBaseUrl, vendorsBaseUrl } from '../../vendors'; export const monacoThemes: Array<{ name: MonacoTheme; title: string; url?: string }> = [ { @@ -38,6 +38,26 @@ export const monacoThemes: Array<{ name: MonacoTheme; title: string; url?: strin title: 'Brilliance Dull', url: monacoThemesBaseUrl + 'Brilliance Dull.json', }, + { + name: 'catppuccin-latte', + title: 'Catppuccin Latte', + url: vendorsBaseUrl + 'catppuccin/monaco/latte.json', + }, + { + name: 'catppuccin-frappe', + title: 'Catppuccin Frappe', + url: vendorsBaseUrl + 'catppuccin/monaco/frappe.json', + }, + { + name: 'catppuccin-macchiato', + title: 'Catppuccin Macchiato', + url: vendorsBaseUrl + 'catppuccin/monaco/macchiato.json', + }, + { + name: 'catppuccin-mocha', + title: 'Catppuccin Mocha', + url: vendorsBaseUrl + 'catppuccin/monaco/mocha.json', + }, { name: 'chrome-devtools', title: 'Chrome DevTools', diff --git a/src/livecodes/vendors.ts b/src/livecodes/vendors.ts index 2a2e5bd57..736c73f3e 100644 --- a/src/livecodes/vendors.ts +++ b/src/livecodes/vendors.ts @@ -4,7 +4,7 @@ import { modulesService } from './services/modules'; const { getUrl, getModuleUrl } = modulesService; export const vendorsBaseUrl = // 'http://127.0.0.1:8081/'; - /* @__PURE__ */ getUrl('@live-codes/browser-compilers@0.17.0/dist/'); + /* @__PURE__ */ getUrl('@live-codes/browser-compilers@0.18.0/dist/'); export const acornUrl = /* @__PURE__ */ getUrl('acorn@8.12.1/dist/acorn.js'); diff --git a/src/sdk/models.ts b/src/sdk/models.ts index c681397aa..cf8ef0aea 100644 --- a/src/sdk/models.ts +++ b/src/sdk/models.ts @@ -1509,6 +1509,10 @@ export type MonacoTheme = | 'blackboard' | 'brilliance-black' | 'brilliance-dull' + | 'catppuccin-latte' + | 'catppuccin-frappe' + | 'catppuccin-macchiato' + | 'catppuccin-mocha' | 'chrome-devtools' | 'clouds-midnight' | 'clouds' @@ -1574,6 +1578,10 @@ export type CodemirrorTheme = | 'bespin' | 'birds-of-paradise' | 'boys-and-girls' + | 'catppuccin-latte' + | 'catppuccin-frappe' + | 'catppuccin-macchiato' + | 'catppuccin-mocha' | 'clouds' | 'cm-light' | 'cobalt' @@ -1604,6 +1612,10 @@ export type CodejarTheme = | 'a11y-dark' | 'atom-dark' | 'base16-ateliersulphurpool-light' + | 'catppuccin-latte' + | 'catppuccin-frappe' + | 'catppuccin-macchiato' + | 'catppuccin-mocha' | 'cb' | 'coldark-cold' | 'coldark-dark'