From e10e1d11864bc33eac13a7232b2a6295022c003b Mon Sep 17 00:00:00 2001 From: Vitor Avila Date: Thu, 2 Jul 2026 13:22:33 +0000 Subject: [PATCH 1/2] fix(ui): dedupe @codemirror/state to fix Environment tab crash pnpm-lock.yaml resolved two @codemirror/state versions (6.6.0 pulled by @codemirror/lang-*/language/commands/autocomplete, 6.7.0 pulled by @uiw/react-codemirror + the codemirror meta-package). CM6 validates extensions with instanceof against @codemirror/state, so loading two copies breaks the check and throws "Unrecognized extension value in extension set" when the Environment tab mounts its CodeMirror editor. Pin @codemirror/state to 6.7.0 in pnpm.overrides, mirroring the existing @codemirror/view override, so pnpm collapses both to a single version. Fixes #1780 Co-Authored-By: Claude --- package.json | 1 + pnpm-lock.yaml | 42 +++++++++++++++--------------------------- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index e61d87f53..9ae2f8db2 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ }, "pnpm": { "overrides": { + "@codemirror/state": "6.7.0", "@codemirror/view": "6.43.0", "@esbuild-kit/core-utils>esbuild": "0.25.4", "@google/genai": "^1.43.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1c94c682..15864e999 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,6 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@esbuild-kit/core-utils>esbuild': 0.25.4 '@google/genai': ^1.43.0 @@ -1413,9 +1414,6 @@ packages: '@codemirror/search@6.6.0': resolution: {integrity: sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==} - '@codemirror/state@6.6.0': - resolution: {integrity: sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==} - '@codemirror/state@6.7.0': resolution: {integrity: sha512-Zbl9NyscLMZkfXPQnNAIIAFftidrA1UbcJEIMp24C0Bukc2I5T8wJS0wsXYsnDOqCFJUeJ1BITGNs5CqPDSmSg==} @@ -2596,9 +2594,6 @@ packages: '@lydell/node-pty@1.1.0': resolution: {integrity: sha512-VDD8LtlMTOrPKWMXUAcB9+LTktzuunqrMwkYR1DMRBkS6LQrCt+0/Ws1o2rMml/n3guePpS7cxhHF7Nm5K4iMw==} - '@marijn/find-cluster-break@1.0.2': - resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==} - '@marijn/find-cluster-break@1.0.3': resolution: {integrity: sha512-FY+MKLBoTsLNJF/eLWaOsXGdz6uh3Iu1axjPf6TUq92IYumcTcXWHoS747JARLkcdlJ/Waiaxc5wQfFO8jC6NA==} @@ -4553,14 +4548,14 @@ packages: '@codemirror/language': '>=6.0.0' '@codemirror/lint': '>=6.0.0' '@codemirror/search': '>=6.0.0' - '@codemirror/state': '>=6.0.0' + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@uiw/react-codemirror@4.25.10': resolution: {integrity: sha512-DzgSMwM5qzB7v1FIb4gEeriYt67iiay756/HIOM9mAbeOVK0MO7rqefHf0O5c0269pJKMW7AH9FjclExD23V9w==} peerDependencies: '@babel/runtime': '>=7.11.0' - '@codemirror/state': '>=6.0.0' + '@codemirror/state': 6.7.0 '@codemirror/theme-one-dark': '>=6.0.0' '@codemirror/view': 6.43.0 codemirror: '>=6.0.0' @@ -6829,7 +6824,6 @@ packages: libsql@0.5.29: resolution: {integrity: sha512-8lMP8iMgiBzzoNbAPQ59qdVcj6UaE/Vnm+fiwX4doX4Narook0a4GPKWBEv+CR8a1OwbfkgL18uBfBjWdF0Fzg==} - cpu: [x64, arm64, wasm32, arm] os: [darwin, linux, win32] lightningcss-android-arm64@1.32.0: @@ -10041,14 +10035,14 @@ snapshots: '@codemirror/autocomplete@6.20.1': dependencies: '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@lezer/common': 1.5.1 '@codemirror/commands@6.10.3': dependencies: '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@lezer/common': 1.5.2 @@ -10063,7 +10057,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.1 '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@lezer/common': 1.5.2 '@lezer/css': 1.3.3 @@ -10073,7 +10067,7 @@ snapshots: '@codemirror/lang-css': 6.3.1 '@codemirror/lang-javascript': 6.2.5 '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@lezer/common': 1.5.2 '@lezer/css': 1.3.3 @@ -10084,7 +10078,7 @@ snapshots: '@codemirror/autocomplete': 6.20.1 '@codemirror/language': 6.12.3 '@codemirror/lint': 6.9.5 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@lezer/common': 1.5.2 '@lezer/javascript': 1.5.4 @@ -10099,7 +10093,7 @@ snapshots: '@codemirror/autocomplete': 6.20.1 '@codemirror/lang-html': 6.4.11 '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@lezer/common': 1.5.2 '@lezer/markdown': 1.6.4 @@ -10108,7 +10102,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.1 '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@lezer/common': 1.5.1 '@lezer/highlight': 1.2.3 '@lezer/lr': 1.4.8 @@ -10116,7 +10110,7 @@ snapshots: '@codemirror/language@6.12.3': dependencies: - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@lezer/common': 1.5.2 '@lezer/highlight': 1.2.3 @@ -10125,7 +10119,7 @@ snapshots: '@codemirror/lint@6.9.5': dependencies: - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 crelt: 1.0.6 @@ -10135,10 +10129,6 @@ snapshots: '@codemirror/view': 6.43.0 crelt: 1.0.7 - '@codemirror/state@6.6.0': - dependencies: - '@marijn/find-cluster-break': 1.0.2 - '@codemirror/state@6.7.0': dependencies: '@marijn/find-cluster-break': 1.0.3 @@ -10146,13 +10136,13 @@ snapshots: '@codemirror/theme-one-dark@6.1.3': dependencies: '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@lezer/highlight': 1.2.3 '@codemirror/view@6.43.0': dependencies: - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 crelt: 1.0.6 style-mod: 4.1.3 w3c-keyname: 2.2.8 @@ -10179,7 +10169,7 @@ snapshots: '@codemirror/lang-html': 6.4.11 '@codemirror/lang-javascript': 6.2.5 '@codemirror/language': 6.12.3 - '@codemirror/state': 6.6.0 + '@codemirror/state': 6.7.0 '@codemirror/view': 6.43.0 '@codesandbox/sandpack-client': 2.19.8 '@lezer/highlight': 1.2.3 @@ -11532,8 +11522,6 @@ snapshots: '@lydell/node-pty-win32-x64': 1.1.0 optional: true - '@marijn/find-cluster-break@1.0.2': {} - '@marijn/find-cluster-break@1.0.3': {} '@mdx-js/mdx@3.1.1': From 6dab26c291ee789885be9e540621fed05cd249d4 Mon Sep 17 00:00:00 2001 From: Vitor Avila Date: Thu, 2 Jul 2026 16:53:44 +0000 Subject: [PATCH 2/2] chore(deps): restore libsql cpu metadata to keep lockfile diff CodeMirror-only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Addresses review feedback on #1781 — the pnpm install regenerated an unrelated libsql@0.5.29 `cpu` field drop; restore it so the diff is limited to the @codemirror/state collapse. Co-Authored-By: Claude Opus 4.8 --- pnpm-lock.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15864e999..00de034d4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6824,6 +6824,7 @@ packages: libsql@0.5.29: resolution: {integrity: sha512-8lMP8iMgiBzzoNbAPQ59qdVcj6UaE/Vnm+fiwX4doX4Narook0a4GPKWBEv+CR8a1OwbfkgL18uBfBjWdF0Fzg==} + cpu: [x64, arm64, wasm32, arm] os: [darwin, linux, win32] lightningcss-android-arm64@1.32.0: