Merge pull request #543 from VividLemon/AMP-3426_BSVN

fix: bootstrap-vue-next
AudiovisualMetadataPlatform · Oct 29, 2024 · 525dc98 · 525dc98
2 parents 5027935 + a5b8c1c
commit 525dc98
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/components.d.ts b/components.d.ts
@@ -10,8 +10,31 @@ declare module 'vue' {
     AccessDenied: typeof import('./src/components/shared/AccessDenied.vue')['default']
     AmpHeader: typeof import('./src/components/shared/AmpHeader.vue')['default']
     ApproveUser: typeof import('./src/components/account/ApproveUser.vue')['default']
+    BAlert: typeof import('bootstrap-vue-next/components/BAlert')['BAlert']
     BarChart: typeof import('./src/components/evaluation/BarChart.vue')['default']
     BatchIngest: typeof import('./src/components/batch/BatchIngest.vue')['default']
+    BBreadcrumb: typeof import('bootstrap-vue-next/components/BBreadcrumb')['BBreadcrumb']
+    BButton: typeof import('bootstrap-vue-next/components/BButton')['BButton']
+    BCard: typeof import('bootstrap-vue-next/components/BCard')['BCard']
+    BCollapse: typeof import('bootstrap-vue-next/components/BCollapse')['BCollapse']
+    BDropdown: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdown']
+    BDropdownForm: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownForm']
+    BDropdownItem: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownItem']
+    BFormCheckbox: typeof import('bootstrap-vue-next/components/BFormCheckbox')['BFormCheckbox']
+    BFormCheckboxGroup: typeof import('bootstrap-vue-next/components/BFormCheckbox')['BFormCheckboxGroup']
+    BFormGroup: typeof import('bootstrap-vue-next/components/BFormGroup')['BFormGroup']
+    BFormRadio: typeof import('bootstrap-vue-next/components/BFormRadio')['BFormRadio']
+    BFormRadioGroup: typeof import('bootstrap-vue-next/components/BFormRadio')['BFormRadioGroup']
+    BLink: typeof import('bootstrap-vue-next/components/BLink')['BLink']
+    BModal: typeof import('bootstrap-vue-next/components/BModal')['BModal']
+    BNavbar: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbar']
+    BNavbarBrand: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarBrand']
+    BNavbarNav: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarNav']
+    BNavbarToggle: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarToggle']
+    BNavItem: typeof import('bootstrap-vue-next/components/BNav')['BNavItem']
+    BNavItemDropdown: typeof import('bootstrap-vue-next/components/BNav')['BNavItemDropdown']
+    BOverlay: typeof import('bootstrap-vue-next/components/BOverlay')['BOverlay']
+    BPagination: typeof import('bootstrap-vue-next/components/BPagination')['BPagination']
     BreadCrumbs: typeof import('./src/components/shared/BreadCrumbs.vue')['default']
     CollectionDetails: typeof import('./src/components/unused/CollectionDetails.vue')['default']
     CollectionDetailsItemCard: typeof import('./src/components/unused/CollectionDetailsItemCard.vue')['default']
@@ -71,4 +94,8 @@ declare module 'vue' {
     WorkflowSelection: typeof import('./src/components/unused/WorkflowSelection.vue')['default']
     WorkflowSubmission: typeof import('./src/components/workflow/WorkflowSubmission.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vBModal: typeof import('bootstrap-vue-next/directives/BModal')['vBModal']
+    vBToggle: typeof import('bootstrap-vue-next/directives/BToggle')['vBToggle']
+  }
 }
diff --git a/src/main.js b/src/main.js
@@ -4,7 +4,7 @@ import router from "./router";
 import { store } from "./store/amp-store";
 // import { VuePlugin } from "vuera";
 import VueFilterDateFormat from "@vuejs-community/vue-filter-date-format";
-import {createBootstrap, BootstrapVueNextResolver} from "bootstrap-vue-next";
+import {createBootstrap} from "bootstrap-vue-next/plugins";
 import moment from "moment";
 import "bootstrap/dist/css/bootstrap.css";
 import "bootstrap-vue-next/dist/bootstrap-vue-next.css";

diff --git a/vue.config.js b/vue.config.js
@@ -1,4 +1,4 @@
-// const { BootstrapVueNextResolver} = require("bootstrap-vue-next");
+const { BootstrapVueNextResolver } = require("bootstrap-vue-next/resolvers");
 // const { defineConfig } = require('@vue/cli-service')
 // const { Components } = require('unplugin-vue-components/webpack')
 
@@ -23,7 +23,9 @@ module.exports = {
   },
   configureWebpack: {
     plugins: [
-      require('unplugin-vue-components/webpack').default({ /* options */ }),
+      require('unplugin-vue-components/webpack').default({
+        resolvers: [BootstrapVueNextResolver()]
+      }),
     ],
   }
 }