diff --git a/electron.vite.config.js b/electron.vite.config.js index 0ffb7eda..7fd88ad8 100644 --- a/electron.vite.config.js +++ b/electron.vite.config.js @@ -38,6 +38,32 @@ export default defineConfig({ base: './', resolve: { alias, + dedupe: [ + '@codemirror/state', + '@codemirror/view', + '@codemirror/commands', + '@codemirror/language', + '@codemirror/search', + '@codemirror/lang-javascript', + '@codemirror/lang-css', + '@codemirror/lang-json', + '@codemirror/theme-one-dark', + 'codemirror', + ], + }, + optimizeDeps: { + include: [ + '@codemirror/state', + '@codemirror/view', + '@codemirror/commands', + '@codemirror/language', + '@codemirror/search', + '@codemirror/lang-javascript', + '@codemirror/lang-css', + '@codemirror/lang-json', + '@codemirror/theme-one-dark', + 'codemirror', + ], }, plugins: [ tailwindcss(), diff --git a/package.json b/package.json index c59186fd..62d3ab3f 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ } }, "resolutions": { + "@codemirror/state": "^6.6.0", "baseline-browser-mapping": "^2.9.13", "semver": "^7.7.4" }, @@ -104,10 +105,10 @@ "@codemirror/lang-css": "^6.3.1", "@codemirror/lang-javascript": "^6.2.5", "@codemirror/lang-json": "^6.0.2", - "@codemirror/search": "^6.6.0", + "@codemirror/search": "^6.7.0", "@codemirror/state": "^6.6.0", "@codemirror/theme-one-dark": "^6.1.3", - "@codemirror/view": "^6.40.0", + "@codemirror/view": "^6.41.1", "@electron/notarize": "^3.1.1", "@eslint/js": "^10.0.1", "@headlessui/vue": "^1.7.23", diff --git a/yarn.lock b/yarn.lock index 67b54d7d..e1f54274 100644 --- a/yarn.lock +++ b/yarn.lock @@ -984,7 +984,7 @@ "@codemirror/view" "^6.35.0" crelt "^1.0.5" -"@codemirror/search@^6.0.0", "@codemirror/search@^6.6.0": +"@codemirror/search@^6.0.0": version "6.6.0" resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-6.6.0.tgz#3b83a1e35391e1575a83a3b485e3f95263ddaa0b" integrity sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw== @@ -993,14 +993,16 @@ "@codemirror/view" "^6.37.0" crelt "^1.0.5" -"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.5.0": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.4.tgz#f5be4b8c0d2310180d5f15a9f641c21ca69faf19" - integrity sha512-8y7xqG/hpB53l25CIoit9/ngxdfoG+fx+V3SHBrinnhOtLvKHRyAJJuHzkWrR4YXXLX8eXBsejgAAxHUOdW1yw== +"@codemirror/search@^6.7.0": + version "6.7.0" + resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-6.7.0.tgz#c6bea0ab0e882395d03a760b1a7d3959b1f3a4ac" + integrity sha512-ZvGm99wc/s2cITtMT15LFdn8aH/aS+V+DqyGq/N5ZlV5vWtH+nILvC2nw0zX7ByNoHHDZ2IxxdW38O0tc5nVHg== dependencies: - "@marijn/find-cluster-break" "^1.0.0" + "@codemirror/state" "^6.0.0" + "@codemirror/view" "^6.37.0" + crelt "^1.0.5" -"@codemirror/state@^6.6.0": +"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.5.0", "@codemirror/state@^6.6.0": version "6.6.0" resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.6.0.tgz#b88dbdc14aea4ace3c6d67bb77fe28bb84e4394e" integrity sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ== @@ -1027,10 +1029,10 @@ style-mod "^4.1.0" w3c-keyname "^2.2.4" -"@codemirror/view@^6.40.0": - version "6.40.0" - resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.40.0.tgz#97198fd717ebf471ef594a5bd557a9f2d1d4d165" - integrity sha512-WA0zdU7xfF10+5I3HhUUq3kqOx3KjqmtQ9lqZjfK7jtYk4G72YW9rezcSywpaUMCWOMlq+6E0pO1IWg1TNIhtg== +"@codemirror/view@^6.41.1": + version "6.41.1" + resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.41.1.tgz#8ecb39af289e7d03df0f3fb6e3c9b1f8747839bf" + integrity sha512-ToDnWKbBnke+ZLrP6vgTTDScGi5H37YYuZGniQaBzxMVdtCxMrslsmtnOvbPZk4RX9bvkQqnWR/WS/35tJA0qg== dependencies: "@codemirror/state" "^6.6.0" crelt "^1.0.6"