From 59d16f80aae9ea78b6cad181ef162285f143679c Mon Sep 17 00:00:00 2001 From: Tom Butcher Date: Tue, 28 Jul 2026 01:39:06 +0100 Subject: [PATCH] Update pnpm-lock.yaml and pnpm-workspace.yaml to include new @codemirror package versions - Added new versions for several @codemirror packages, including '@codemirror/state@6.7.1', '@codemirror/view@6.39.12', '@codemirror/language@6.12.1', '@codemirror/commands@6.10.4', and '@codemirror/autocomplete@6.20.0' in both pnpm-lock.yaml and pnpm-workspace.yaml. - Updated Vite configuration to deduplicate and optimize dependencies for @codemirror packages, ensuring better performance and compatibility. --- pnpm-lock.yaml | 79 ++++++++++++++++++--------------------------- pnpm-workspace.yaml | 7 +++- vite.config.js | 18 +++++++++-- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6de189b..2a4b6c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,11 @@ settings: overrides: baseline-browser-mapping: 2.11.4 + '@codemirror/state': 6.7.1 + '@codemirror/view': 6.39.12 + '@codemirror/language': 6.12.1 + '@codemirror/commands': 6.10.4 + '@codemirror/autocomplete': 6.20.0 importers: @@ -510,9 +515,6 @@ packages: '@codemirror/autocomplete@6.20.0': resolution: {integrity: sha512-bOwvTOIJcG5FVo5gUUupiwYh8MioPLQ4UcqbcRf7UQ98X90tCa9E1kZ3Z7tqwpZxYyOvh1YTYbmZE9RTfTp5hg==} - '@codemirror/commands@6.10.1': - resolution: {integrity: sha512-uWDWFypNdQmz2y1LaNJzK7fL7TYKLeUAU0npEC685OKTF3KcQ2Vu3klIM78D7I6wGhktme0lh3CuQLv0ZCrD9Q==} - '@codemirror/commands@6.10.4': resolution: {integrity: sha512-Ryk9y9T0FFVF0cUGhAknveAyUOl/A1qReTFi+qPKtOh2Z9F4AUBz3XOrYD4ZEgZirdugVzHvd/2/Wcwy5OliTg==} @@ -567,9 +569,6 @@ packages: '@codemirror/search@6.6.0': resolution: {integrity: sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==} - '@codemirror/state@6.5.4': - resolution: {integrity: sha512-8y7xqG/hpB53l25CIoit9/ngxdfoG+fx+V3SHBrinnhOtLvKHRyAJJuHzkWrR4YXXLX8eXBsejgAAxHUOdW1yw==} - '@codemirror/state@6.7.1': resolution: {integrity: sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==} @@ -1286,9 +1285,6 @@ packages: resolution: {integrity: sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==} engines: {node: '>= 10.0.0'} - '@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==} @@ -2121,21 +2117,21 @@ packages: '@uiw/codemirror-extensions-basic-setup@4.25.4': resolution: {integrity: sha512-YzNwkm0AbPv1EXhCHYR5v0nqfemG2jEB0Z3Att4rBYqKrlG7AA9Rhjc3IyBaOzsBu18wtrp9/+uhTyu7TXSRng==} peerDependencies: - '@codemirror/autocomplete': '>=6.0.0' - '@codemirror/commands': '>=6.0.0' - '@codemirror/language': '>=6.0.0' + '@codemirror/autocomplete': 6.20.0 + '@codemirror/commands': 6.10.4 + '@codemirror/language': 6.12.1 '@codemirror/lint': '>=6.0.0' '@codemirror/search': '>=6.0.0' - '@codemirror/state': '>=6.0.0' - '@codemirror/view': '>=6.0.0' + '@codemirror/state': 6.7.1 + '@codemirror/view': 6.39.12 '@uiw/react-codemirror@4.25.4': resolution: {integrity: sha512-ipO067oyfUw+DVaXhQCxkB0ZD9b7RnY+ByrprSYSKCHaULvJ3sqWYC/Zen6zVQ8/XC4o5EPBfatGiX20kC7XGA==} peerDependencies: '@babel/runtime': '>=7.11.0' - '@codemirror/state': '>=6.0.0' + '@codemirror/state': 6.7.1 '@codemirror/theme-one-dark': '>=6.0.0' - '@codemirror/view': '>=6.0.0' + '@codemirror/view': 6.39.12 codemirror: '>=6.0.0' react: '>=17.0.0' react-dom: '>=17.0.0' @@ -6527,14 +6523,7 @@ snapshots: '@codemirror/autocomplete@6.20.0': dependencies: '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 - '@codemirror/view': 6.39.12 - '@lezer/common': 1.5.0 - - '@codemirror/commands@6.10.1': - dependencies: - '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 '@lezer/common': 1.5.0 @@ -6554,7 +6543,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.0 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@lezer/common': 1.5.0 '@lezer/css': 1.3.0 @@ -6562,7 +6551,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.0 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@lezer/common': 1.5.0 '@lezer/go': 1.0.1 @@ -6572,7 +6561,7 @@ snapshots: '@codemirror/lang-css': 6.3.1 '@codemirror/lang-javascript': 6.2.4 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 '@lezer/common': 1.5.0 '@lezer/css': 1.3.0 @@ -6588,7 +6577,7 @@ snapshots: '@codemirror/autocomplete': 6.20.0 '@codemirror/language': 6.12.1 '@codemirror/lint': 6.9.3 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 '@lezer/common': 1.5.0 '@lezer/javascript': 1.5.4 @@ -6603,7 +6592,7 @@ snapshots: '@codemirror/autocomplete': 6.20.0 '@codemirror/lang-html': 6.4.11 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 '@lezer/common': 1.5.0 '@lezer/markdown': 1.6.3 @@ -6612,7 +6601,7 @@ snapshots: dependencies: '@codemirror/lang-html': 6.4.11 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@lezer/common': 1.5.0 '@lezer/php': 1.0.5 @@ -6620,7 +6609,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.0 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@lezer/common': 1.5.0 '@lezer/python': 1.1.18 @@ -6633,7 +6622,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.0 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@lezer/common': 1.5.0 '@lezer/highlight': 1.2.3 '@lezer/lr': 1.4.8 @@ -6642,7 +6631,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.0 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 '@lezer/common': 1.5.0 '@lezer/xml': 1.0.6 @@ -6651,7 +6640,7 @@ snapshots: dependencies: '@codemirror/autocomplete': 6.20.0 '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@lezer/common': 1.5.0 '@lezer/highlight': 1.2.3 '@lezer/lr': 1.4.8 @@ -6659,7 +6648,7 @@ snapshots: '@codemirror/language@6.12.1': dependencies: - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 '@lezer/common': 1.5.0 '@lezer/highlight': 1.2.3 @@ -6668,7 +6657,7 @@ snapshots: '@codemirror/lint@6.9.3': dependencies: - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 crelt: 1.0.6 @@ -6678,10 +6667,6 @@ snapshots: '@codemirror/view': 6.39.12 crelt: 1.0.7 - '@codemirror/state@6.5.4': - dependencies: - '@marijn/find-cluster-break': 1.0.2 - '@codemirror/state@6.7.1': dependencies: '@marijn/find-cluster-break': 1.0.3 @@ -6689,13 +6674,13 @@ snapshots: '@codemirror/theme-one-dark@6.1.3': dependencies: '@codemirror/language': 6.12.1 - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 '@codemirror/view': 6.39.12 '@lezer/highlight': 1.2.3 '@codemirror/view@6.39.12': dependencies: - '@codemirror/state': 6.5.4 + '@codemirror/state': 6.7.1 crelt: 1.0.6 style-mod: 4.1.3 w3c-keyname: 2.2.8 @@ -7409,8 +7394,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@marijn/find-cluster-break@1.0.2': {} - '@marijn/find-cluster-break@1.0.3': {} '@nodelib/fs.scandir@2.1.5': @@ -8332,10 +8315,10 @@ snapshots: '@typescript-eslint/types': 6.21.0 eslint-visitor-keys: 3.4.3 - '@uiw/codemirror-extensions-basic-setup@4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.1)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.3)(@codemirror/search@6.6.0)(@codemirror/state@6.7.1)(@codemirror/view@6.39.12)': + '@uiw/codemirror-extensions-basic-setup@4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.4)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.3)(@codemirror/search@6.6.0)(@codemirror/state@6.7.1)(@codemirror/view@6.39.12)': dependencies: '@codemirror/autocomplete': 6.20.0 - '@codemirror/commands': 6.10.1 + '@codemirror/commands': 6.10.4 '@codemirror/language': 6.12.1 '@codemirror/lint': 6.9.3 '@codemirror/search': 6.6.0 @@ -8345,11 +8328,11 @@ snapshots: '@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.3)(@codemirror/search@6.6.0)(@codemirror/state@6.7.1)(@codemirror/theme-one-dark@6.1.3)(@codemirror/view@6.39.12)(codemirror@6.0.2)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)': dependencies: '@babel/runtime': 7.28.6 - '@codemirror/commands': 6.10.1 + '@codemirror/commands': 6.10.4 '@codemirror/state': 6.7.1 '@codemirror/theme-one-dark': 6.1.3 '@codemirror/view': 6.39.12 - '@uiw/codemirror-extensions-basic-setup': 4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.1)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.3)(@codemirror/search@6.6.0)(@codemirror/state@6.7.1)(@codemirror/view@6.39.12) + '@uiw/codemirror-extensions-basic-setup': 4.25.4(@codemirror/autocomplete@6.20.0)(@codemirror/commands@6.10.4)(@codemirror/language@6.12.1)(@codemirror/lint@6.9.3)(@codemirror/search@6.6.0)(@codemirror/state@6.7.1)(@codemirror/view@6.39.12) codemirror: 6.0.2 react: 19.2.4 react-dom: 19.2.4(react@19.2.4) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 4337121..ea18dec 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -8,4 +8,9 @@ allowBuilds: '@tsparticles/engine': true overrides: - baseline-browser-mapping: 2.11.4 \ No newline at end of file + baseline-browser-mapping: 2.11.4 + '@codemirror/state': 6.7.1 + '@codemirror/view': 6.39.12 + '@codemirror/language': 6.12.1 + '@codemirror/commands': 6.10.4 + '@codemirror/autocomplete': 6.20.0 \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 6630ed2..58c5eb5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -17,10 +17,24 @@ export default defineConfig({ resolve: { alias: { three: path.resolve(__dirname, 'node_modules/three') - } + }, + dedupe: [ + '@codemirror/state', + '@codemirror/view', + '@codemirror/language', + '@codemirror/commands', + 'codemirror' + ] }, optimizeDeps: { - include: ['@ant-design/icons'] + include: [ + '@ant-design/icons', + '@codemirror/state', + '@codemirror/view', + '@codemirror/language', + 'codemirror', + '@uiw/react-codemirror' + ] }, plugins: [ react(),