From d393508b803e5607c5908bb8b2bb2f8540fee28d Mon Sep 17 00:00:00 2001 From: Jordon Leach <40806497+jordojordo@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:54:12 -0400 Subject: [PATCH] Fix InstallCodeMirror export (#11962) * Fix InstallCodeMirror export * Bumping/pinning the version of codemirror-editor-vue3 --------- Co-authored-by: Cody Jackson --- package.json | 2 +- shell/initialize/install-plugins.js | 4 ++-- shell/package.json | 2 +- shell/yarn.lock | 17 +++++++++++------ yarn.lock | 8 ++++---- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 0f69402894e..8c69f185e7d 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "cache-loader": "4.1.0", "clipboard-polyfill": "4.0.1", "codemirror": "5.65.17", - "codemirror-editor-vue3": "2.7.0", + "codemirror-editor-vue3": "2.7.1", "color": "4.2.3", "cookie": "0.5.0", "cookie-universal": "2.2.2", diff --git a/shell/initialize/install-plugins.js b/shell/initialize/install-plugins.js index 41cf5749fc7..710fe8c1545 100644 --- a/shell/initialize/install-plugins.js +++ b/shell/initialize/install-plugins.js @@ -17,7 +17,7 @@ import config from '@shell/utils/config'; import axiosShell from '@shell/plugins/axios'; import backButton from '@shell/plugins/back-button'; import codeMirror from '@shell/plugins/codemirror-loader'; -import { InstallCodemirro } from 'codemirror-editor-vue3'; +import { InstallCodeMirror } from 'codemirror-editor-vue3'; import * as intNumber from '@shell/directives/int-number'; import nuxtClientInit from '@shell/plugins/nuxt-client-init'; import plugin from '@shell/plugins/plugin'; @@ -38,7 +38,7 @@ export async function installPlugins(vueApp) { vueApp.use(VueResize); vueApp.use(FloatingVue, floatingVueOptions); vueApp.use(ShortKey, { prevent: ['input', 'textarea', 'select'] }); - vueApp.use(InstallCodemirro); + vueApp.use(InstallCodeMirror); vueApp.component('v-select', vSelect); } diff --git a/shell/package.json b/shell/package.json index c195292c602..1353717ef37 100644 --- a/shell/package.json +++ b/shell/package.json @@ -56,7 +56,7 @@ "browser-env": "3.3.0", "clipboard-polyfill": "4.0.1", "codemirror": ">=5.64.0 <6", - "codemirror-editor-vue3": "^2.7.0", + "codemirror-editor-vue3": "2.7.1", "cookie": "0.5.0", "cookie-universal": "2.2.2", "core-js": "3.25.3", diff --git a/shell/yarn.lock b/shell/yarn.lock index 9ffbe3886c3..6f2e2ce9ca8 100644 --- a/shell/yarn.lock +++ b/shell/yarn.lock @@ -3938,11 +3938,16 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" -"@vue/devtools-api@^6.0.0", "@vue/devtools-api@^6.0.0-beta.11": +"@vue/devtools-api@^6.0.0-beta.11": version "6.6.3" resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.3.tgz#b23a588154cba8986bba82b6e1d0248bde3fd1a0" integrity sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw== +"@vue/devtools-api@^6.6.3": + version "6.6.4" + resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343" + integrity sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g== + "@vue/reactivity-transform@3.2.47": version "3.2.47" resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz#e45df4d06370f8abf29081a16afd25cffba6d84e" @@ -12965,12 +12970,12 @@ vue-resize@^2.0.0-alpha.1: resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz#43eeb79e74febe932b9b20c5c57e0ebc14e2df3a" integrity sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg== -vue-router@~4.0.3: - version "4.0.16" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.16.tgz#9477beeeef36e80e04d041a1738801a55e6e862e" - integrity sha512-JcO7cb8QJLBWE+DfxGUL3xUDOae/8nhM1KVdnudadTAORbuxIC/xAydC5Zr/VLHUDQi1ppuTF5/rjBGzgzrJNA== +vue-router@4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.4.3.tgz#58a39dc804632bfb6d26f052aa8f6718bd130299" + integrity sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A== dependencies: - "@vue/devtools-api" "^6.0.0" + "@vue/devtools-api" "^6.6.3" vue-select@4.0.0-beta.6: version "4.0.0-beta.6" diff --git a/yarn.lock b/yarn.lock index aa6b48686d8..81df1ee4684 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5704,10 +5704,10 @@ co@^4.6.0: resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemirror-editor-vue3@2.7.0: - version "2.7.0" - resolved "https://registry.npmjs.org/codemirror-editor-vue3/-/codemirror-editor-vue3-2.7.0.tgz#873e0d971d9016c9328b16d3eb0c818c96af59b6" - integrity sha512-mAx2CPCshARMXjIb9Bl/jhSzcVGAjh9JqLCB9+9hGPPW/lObHWLJD7DgNd0xJnw2Vrm9shHIS/ch74MwmDGrtA== +codemirror-editor-vue3@2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/codemirror-editor-vue3/-/codemirror-editor-vue3-2.7.1.tgz#48d41515cb3c47e2c84200414c2bf0f267dac15e" + integrity sha512-nUlSUPu22ugrvNNy86w4GhUswZk0qi0DsPGC8srG88LllJahXlZslHD8ikaLwp8Y1Ho6gW2STiYZe8ilW2rPLg== dependencies: "@unocss/transformer-directives" "^0.58.8" "@wdns/vue-code-block" "^2.3.2"