From 2eae756cec1970f19cd1e814be8a060a249b3fb6 Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Fri, 6 Mar 2026 23:18:29 -0600 Subject: [PATCH] Update dependencies in pnpm-lock.yaml and package.json for @codemirror packages - Added @codemirror/search version 6.6.0. - Updated @codemirror/view to version 6.39.15 across multiple files. - Adjusted imports in code-editor.tsx to include search functionality. This update ensures compatibility with the latest features and improvements in the CodeMirror library. --- .../dokploy/components/shared/code-editor.tsx | 5 +- apps/dokploy/package.json | 3 +- pnpm-lock.yaml | 48 ++++++++----------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/apps/dokploy/components/shared/code-editor.tsx b/apps/dokploy/components/shared/code-editor.tsx index 8fe583339..29f18a3e0 100644 --- a/apps/dokploy/components/shared/code-editor.tsx +++ b/apps/dokploy/components/shared/code-editor.tsx @@ -9,7 +9,8 @@ import { yaml } from "@codemirror/lang-yaml"; import { StreamLanguage } from "@codemirror/language"; import { properties } from "@codemirror/legacy-modes/mode/properties"; import { shell } from "@codemirror/legacy-modes/mode/shell"; -import { EditorView } from "@codemirror/view"; +import { search, searchKeymap } from "@codemirror/search"; +import { EditorView, keymap } from "@codemirror/view"; import { githubDark, githubLight } from "@uiw/codemirror-theme-github"; import CodeMirror, { type ReactCodeMirrorProps } from "@uiw/react-codemirror"; import { useTheme } from "next-themes"; @@ -155,6 +156,8 @@ export const CodeEditor = ({ }} theme={resolvedTheme === "dark" ? githubDark : githubLight} extensions={[ + search(), + keymap.of(searchKeymap), language === "yaml" ? yaml() : language === "json" diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 6e9802910..7ed8a2e6a 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -53,7 +53,8 @@ "@codemirror/lang-yaml": "^6.1.2", "@codemirror/language": "^6.11.0", "@codemirror/legacy-modes": "6.4.0", - "@codemirror/view": "6.29.0", + "@codemirror/search": "^6.6.0", + "@codemirror/view": "^6.39.15", "@dokploy/server": "workspace:*", "@dokploy/trpc-openapi": "0.0.17", "@faker-js/faker": "^8.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index efd3780e7..3ccae53df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -131,9 +131,12 @@ importers: '@codemirror/legacy-modes': specifier: 6.4.0 version: 6.4.0 + '@codemirror/search': + specifier: ^6.6.0 + version: 6.6.0 '@codemirror/view': - specifier: 6.29.0 - version: 6.29.0 + specifier: ^6.39.15 + version: 6.39.15 '@dokploy/server': specifier: workspace:* version: link:../../packages/server @@ -241,10 +244,10 @@ importers: version: 11.10.0(typescript@5.9.3) '@uiw/codemirror-theme-github': specifier: ^4.23.12 - version: 4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.29.0) + version: 4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.39.15) '@uiw/react-codemirror': specifier: ^4.23.12 - version: 4.25.4(@babel/runtime@7.28.6)(@codemirror/autocomplete@6.20.0)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/theme-one-dark@6.1.3)(@codemirror/view@6.29.0)(codemirror@6.0.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) + version: 4.25.4(@babel/runtime@7.28.6)(@codemirror/autocomplete@6.20.0)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/theme-one-dark@6.1.3)(@codemirror/view@6.39.15)(codemirror@6.0.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@xterm/addon-attach': specifier: 0.10.0 version: 0.10.0(@xterm/xterm@5.5.0) @@ -1285,9 +1288,6 @@ packages: '@codemirror/theme-one-dark@6.1.3': resolution: {integrity: sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==} - '@codemirror/view@6.29.0': - resolution: {integrity: sha512-ED4ims4fkf7eOA+HYLVP8VVg3NMllt1FPm9PEJBfYFnidKlRITBaua38u68L1F60eNtw2YNcDN5jsIzhKZwWQA==} - '@codemirror/view@6.39.15': resolution: {integrity: sha512-aCWjgweIIXLBHh7bY6cACvXuyrZ0xGafjQ2VInjp4RM4gMfscK5uESiNdrH0pE+e1lZr2B4ONGsjchl2KsKZzg==} @@ -8793,14 +8793,14 @@ snapshots: dependencies: '@codemirror/language': 6.12.1 '@codemirror/state': 6.5.4 - '@codemirror/view': 6.29.0 + '@codemirror/view': 6.39.15 '@lezer/common': 1.5.1 '@codemirror/commands@6.10.2': dependencies: '@codemirror/language': 6.12.1 '@codemirror/state': 6.5.4 - '@codemirror/view': 6.29.0 + '@codemirror/view': 6.39.15 '@lezer/common': 1.5.1 '@codemirror/lang-json@6.0.2': @@ -8821,7 +8821,7 @@ snapshots: '@codemirror/language@6.12.1': dependencies: '@codemirror/state': 6.5.4 - '@codemirror/view': 6.29.0 + '@codemirror/view': 6.39.15 '@lezer/common': 1.5.1 '@lezer/highlight': 1.2.3 '@lezer/lr': 1.4.8 @@ -8851,15 +8851,9 @@ snapshots: dependencies: '@codemirror/language': 6.12.1 '@codemirror/state': 6.5.4 - '@codemirror/view': 6.29.0 + '@codemirror/view': 6.39.15 '@lezer/highlight': 1.2.3 - '@codemirror/view@6.29.0': - dependencies: - '@codemirror/state': 6.5.4 - style-mod: 4.1.3 - w3c-keyname: 2.2.8 - '@codemirror/view@6.39.15': dependencies: '@codemirror/state': 6.5.4 @@ -12094,7 +12088,7 @@ snapshots: dependencies: '@types/node': 24.10.13 - '@uiw/codemirror-extensions-basic-setup@4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.2)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/view@6.29.0)': + '@uiw/codemirror-extensions-basic-setup@4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.2)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/view@6.39.15)': dependencies: '@codemirror/autocomplete': 6.20.0 '@codemirror/commands': 6.10.2 @@ -12102,30 +12096,30 @@ snapshots: '@codemirror/lint': 6.9.4 '@codemirror/search': 6.6.0 '@codemirror/state': 6.5.4 - '@codemirror/view': 6.29.0 + '@codemirror/view': 6.39.15 - '@uiw/codemirror-theme-github@4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.29.0)': + '@uiw/codemirror-theme-github@4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.39.15)': dependencies: - '@uiw/codemirror-themes': 4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.29.0) + '@uiw/codemirror-themes': 4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.39.15) transitivePeerDependencies: - '@codemirror/language' - '@codemirror/state' - '@codemirror/view' - '@uiw/codemirror-themes@4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.29.0)': + '@uiw/codemirror-themes@4.25.4(@codemirror/language@6.12.1)(@codemirror/state@6.5.4)(@codemirror/view@6.39.15)': dependencies: '@codemirror/language': 6.12.1 '@codemirror/state': 6.5.4 - '@codemirror/view': 6.29.0 + '@codemirror/view': 6.39.15 - '@uiw/react-codemirror@4.25.4(@babel/runtime@7.28.6)(@codemirror/autocomplete@6.20.0)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/theme-one-dark@6.1.3)(@codemirror/view@6.29.0)(codemirror@6.0.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': + '@uiw/react-codemirror@4.25.4(@babel/runtime@7.28.6)(@codemirror/autocomplete@6.20.0)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/theme-one-dark@6.1.3)(@codemirror/view@6.39.15)(codemirror@6.0.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@babel/runtime': 7.28.6 '@codemirror/commands': 6.10.2 '@codemirror/state': 6.5.4 '@codemirror/theme-one-dark': 6.1.3 - '@codemirror/view': 6.29.0 - '@uiw/codemirror-extensions-basic-setup': 4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.2)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/view@6.29.0) + '@codemirror/view': 6.39.15 + '@uiw/codemirror-extensions-basic-setup': 4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.2)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.4)(@codemirror/search@6.6.0)(@codemirror/state@6.5.4)(@codemirror/view@6.39.15) codemirror: 6.0.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -12772,7 +12766,7 @@ snapshots: '@codemirror/lint': 6.9.4 '@codemirror/search': 6.6.0 '@codemirror/state': 6.5.4 - '@codemirror/view': 6.29.0 + '@codemirror/view': 6.39.15 color-convert@2.0.1: dependencies: