misc: fix Vue3 version & update braces's version

Although my former patch can pass through build procedure but when I launch configurator and try to load board.xml, the loading procedure wont finish. So we cannot step forward anymore. I cannot find a solution right now, so I have to fix the version to v3.2.33 for several weeks. This patch is applied to fix vulnerability scanned by Trivy also. Vulnerability ID is CVE-2024-4068 & fixed version of dependency is 3.0.3. I added one configuration item named override for package.json. I tested and confirmed the fix is ok. Signed-off-by: dongpingx <[email protected]> Tracked-On: #8626
projectacrn · Jun 18, 2024 · 23b1a44 · 23b1a44
1 parent 7739f0e
commit 23b1a44
Show file tree

Hide file tree

Showing 8 changed files with 440 additions and 428 deletions.
diff --git a/misc/config_tools/configurator/packages/configurator/package.json b/misc/config_tools/configurator/packages/configurator/package.json
@@ -24,17 +24,24 @@
     "@vueform/slider": "^2.0.10",
     "ajv-i18n": "^4.2.0",
     "bootstrap": "^5.1.3",
-    "bootstrap-vue-3": "^0.1.10",
+    "bootstrap-vue-3": "0.1.11",
     "encoding": "^0.1.13",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
     "naive-ui": "^2.28.1",
     "node-fetch": "^2.6.7",
     "sass": "^1.50.0",
     "vfonts": "^0.0.3",
-    "vue": "^3.2.25",
+    "vue": "3.2.33",
     "vue-router": "4"
   },
+  "overrides": {
+    "sass": {
+      "chokidar": {
+        "braces": "3.0.3"
+      }
+    }
+  },
   "devDependencies": {
     "@tauri-apps/cli": "^1.0.0-rc.10",
     "@types/node": "^16.11.33",

diff --git a/misc/config_tools/configurator/packages/configurator/src/pages/Config.vue b/misc/config_tools/configurator/packages/configurator/src/pages/Config.vue
@@ -25,7 +25,7 @@
           </div>
         </div>
       </template>
-      <Board :WorkingFolder="WorkingFolder" v-model:board="board" v-model:schemas="schemas"
+      <Board v-model:WorkingFolder="WorkingFolder" v-model:board="board" v-model:schemas="schemas"
              @boardUpdate="boardUpdate"/>
     </b-accordion-item>
 

diff --git a/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm.vue b/misc/config_tools/configurator/packages/configurator/src/pages/Config/ConfigForm.vue
@@ -31,7 +31,7 @@
     </div>
     <VueForm
         :key="(currentActiveVMID===-1?'HV':`VM${currentActiveVMID}`)+currentFormMode+'ConfigForm'"
-        :currentFormData="currentFormData"
+        v-model="currentFormData"
         :form-props="formProps"
         :ui-schema="uiSchema"
         :schema="currentFormSchema[currentFormMode]"

diff --git a/misc/config_tools/configurator/packages/configurator/src/pages/Config/NewBoard.vue b/misc/config_tools/configurator/packages/configurator/src/pages/Config/NewBoard.vue
@@ -1,6 +1,6 @@
 <template>
   <b-modal title="Board XML overwrite" fade no-close-on-backdrop
-           :showModal="showModal"
+           v-model="showModal"
            @cancel="cancel"
            @abort="cancel"
            @close="cancel"

diff --git a/...config_tools/configurator/packages/configurator/src/pages/Config/Scenario/NewScenario.vue b/...config_tools/configurator/packages/configurator/src/pages/Config/Scenario/NewScenario.vue
@@ -1,6 +1,6 @@
 <template>
   <b-modal id="newScenarioModal" size="xl" title="Create a New Scenario" fade no-close-on-backdrop
-           :showModal="showModal"
+           v-model="showModal"
            @cancel="cancel"
            @abort="cancel"
            @close="cancel"

diff --git a/...g_tools/configurator/packages/configurator/src/pages/Config/Scenario/OverwriteMessage.vue b/...g_tools/configurator/packages/configurator/src/pages/Config/Scenario/OverwriteMessage.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <b-modal id="my-modal" no-close-on-backdrop
-             title="Scenario XML Overwrite" :showModal="showModal"
+             title="Scenario XML Overwrite" v-model="showModal"
              @cancel="cancel"
              @hidden="cancel"
              @abort="cancel"

diff --git a/...onfig_tools/configurator/packages/configurator/src/pages/Config/Scenario/SaveScenario.vue b/...onfig_tools/configurator/packages/configurator/src/pages/Config/Scenario/SaveScenario.vue
@@ -1,6 +1,6 @@
 <template>
   <b-modal title="ACRN Configurator" ok-only fade
-           :showModal="showModal"
+           v-model="showModal"
            @ok="overWrite"
   >
     <div class="picture">

diff --git a/misc/config_tools/configurator/yarn.lock b/misc/config_tools/configurator/yarn.lock