From 0ed772b05460f35997de2db83ff12908a492f3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Losada=20Hern=C3=A1ndez?= Date: Tue, 21 Apr 2026 20:50:04 +0200 Subject: [PATCH] add back cm5-themes --- client/components/codeEditor/codeEditor.jsx | 6 +++-- .../homebrew/editor/snippetbar/snippetbar.jsx | 4 +-- package-lock.json | 25 +++++++------------ package.json | 1 + 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/client/components/codeEditor/codeEditor.jsx b/client/components/codeEditor/codeEditor.jsx index 219e87d8b..1e4688192 100644 --- a/client/components/codeEditor/codeEditor.jsx +++ b/client/components/codeEditor/codeEditor.jsx @@ -28,14 +28,16 @@ import { closeBrackets } from '@codemirror/autocomplete'; const autoCloseBrackets = closeBrackets({ brackets: ['()', '[]', '{{}}'] }); -import * as themesImport from '@uiw/codemirror-themes-all'; import defaultCM5Theme from '@themes/codeMirror/default.js'; import darkbrewery from '@themes/codeMirror/darkbrewery.js'; +import cm5Themes from 'codemirror-5-themes'; -const themes = { default: defaultCM5Theme, darkbrewery, ...themesImport }; +const themes = { default: defaultCM5Theme, ...cm5Themes, darkbrewery }; const themeCompartment = new Compartment(); const highlightCompartment = new Compartment(); +console.log(themes); + import { generalKeymap, markdownKeymap } from './customKeyMaps.js'; import foldOnPages from './customFolding.js'; import { customHighlightStyle, tokenizeCustomMarkdown, tokenizeCustomCSS } from './customHighlight.js'; diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx index 112e3b701..6beff1510 100644 --- a/client/homebrew/editor/snippetbar/snippetbar.jsx +++ b/client/homebrew/editor/snippetbar/snippetbar.jsx @@ -23,11 +23,11 @@ const ThemeSnippets = { V3_Blank : V3_Blank, }; -import * as themesImport from '@uiw/codemirror-themes-all'; import defaultCM5Theme from '@themes/codeMirror/default.js'; import darkbrewery from '@themes/codeMirror/darkbrewery.js'; +import cm5Themes from 'codemirror-5-themes'; -const themes = { default: defaultCM5Theme, darkbrewery, ...themesImport }; +const themes = { default: defaultCM5Theme, ...cm5Themes, darkbrewery }; const EditorThemes = Object.entries(themes) .filter(([name, value]) => diff --git a/package-lock.json b/package-lock.json index 7ee752e0e..2f2e011da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,7 @@ "@vitejs/plugin-react": "^5.1.2", "body-parser": "^2.2.0", "classnames": "^2.5.1", + "codemirror-5-themes": "^0.1.1", "cookie-parser": "^1.4.7", "core-js": "^3.49.0", "cors": "^2.8.5", @@ -6576,6 +6577,14 @@ "node": ">= 0.12.0" } }, + "node_modules/codemirror-5-themes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/codemirror-5-themes/-/codemirror-5-themes-0.1.1.tgz", + "integrity": "sha512-6LDToIExW3/rHhmNe4wV4TO7xUJGWSfpXpSNXYgqHgY5hpnQVd0ce6wf0IvXScrWQehcHkb+1Mk5I49C6ArauA==", + "dependencies": { + "@codemirror/view": "^6.41.1" + } + }, "node_modules/collect-v8-coverage": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz", @@ -11096,22 +11105,6 @@ "url": "https://opencollective.com/mongoose" } }, - "node_modules/mongoose/node_modules/gcp-metadata": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.1.tgz", - "integrity": "sha512-UcO3kefx6dCcZkgcTGgVOTFb7b1LlQ02hY1omMjjrrBzkajRMCFgYOjs7J71WqnuG1k2b+9ppGL7FsOfhZMQKQ==", - "license": "Apache-2.0", - "optional": true, - "peer": true, - "dependencies": { - "gaxios": "^7.0.0", - "google-logging-utils": "^1.0.0", - "json-bigint": "^1.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/mongoose/node_modules/mongodb": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-7.1.1.tgz", diff --git a/package.json b/package.json index 7872f8173..b20334daf 100644 --- a/package.json +++ b/package.json @@ -110,6 +110,7 @@ "@vitejs/plugin-react": "^5.1.2", "body-parser": "^2.2.0", "classnames": "^2.5.1", + "codemirror-5-themes": "^0.1.1", "cookie-parser": "^1.4.7", "core-js": "^3.49.0", "cors": "^2.8.5",