Merge pull request #65 from uw-it-aca/char/vite6

Char/vite6
uw-it-aca · Nov 26, 2024 · 1b32394 · 1b32394
2 parents 315c67c + d0c7e18
commit 1b32394
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 64 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.stylelintignore b/.stylelintignore
diff --git a/.stylelintrc b/.stylelintrc
@@ -5,12 +5,6 @@
   ],
   "rules": {
     "scss/no-global-function-names": null,
-    "no-invalid-position-at-import-rule": null,
-    "scss/at-import-partial-extension": [
-      "never",
-      {
-        "severity": "warning"
-      }
-    ]
+    "no-invalid-position-at-import-rule": null
   }
 }
diff --git a/app_name/templates/index.html b/app_name/templates/index.html
@@ -17,7 +17,7 @@
   <body {% if google_analytics %}data-google-analytics="{{ google_analytics }}"{% endif %}
         {% if logout_url %}data-logout-url="{{ logout_url }}"{% endif %}
         data-django-debug="{{ django_debug|lower }}"
-        class="bg-light">
+        class="bg-body">
     {% csrf_token %}
     <!-- vue app will be injected here -->
     <div id="app"></div>

diff --git a/app_name_vue/main.js b/app_name_vue/main.js
@@ -1,10 +1,8 @@
 import { createApp } from "vue";
+import { createBootstrap } from "bootstrap-vue-next";
 import { createPinia } from "pinia";
 // import VueGtag from "vue-gtag-next";
-import { Vue3Mq, MqResponsive } from "vue3-mq";
-
-// import solstice-vue
-import SolsticeVue from "solstice-vue";
+import { Vue3Mq } from "vue3-mq";
 
 import App from "@/app.vue";
 import router from "@/router";
@@ -13,13 +11,15 @@ import router from "@/router";
 import "bootstrap";
 import "bootstrap-icons/font/bootstrap-icons.css";
 
-// bootstrap (all default bs styles)
-// import "./css/basic.scss";
+// solstice bootstrap theme
+import "solstice-theme/dist/solstice.scss";
 
-// bootstrap + solstice-vue
-import "@/css/custom.scss";
+// solstice-vue comps
 import "solstice-vue/dist/style.css";
 
+// bootstrap-vue-next css
+import "bootstrap-vue-next/dist/bootstrap-vue-next.css";
+
 const app = createApp(App);
 app.config.productionTip = false;
 
@@ -47,14 +47,13 @@ app.use(VueGtag, {
 app.use(Vue3Mq, {
   preset: "bootstrap5",
 });
-app.component("mq-responsive", MqResponsive);
 
 // pinia (vuex) state management
 const pinia = createPinia();
 app.use(pinia);
 
-// solstice-vue
-app.use(SolsticeVue);
+// bootstrap-vue-next
+app.use(createBootstrap());
 
 // vue-router
 app.use(router);

diff --git a/app_name_vue/pages/customize.vue b/app_name_vue/pages/customize.vue
@@ -126,11 +126,12 @@ import { formatPhoneNumber } from "@/utils/format";
 
 export default {
   name: "PagesCustomize",
-  inject: ["mq"],
+
   components: {
     DefaultLayout,
     HelloWorld,
   },
+  inject: ["mq"],
   // setup() is needed for Composition API
   setup() {
     // instantiate composable

diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,16 @@
+import pluginVue from "eslint-plugin-vue";
+import eslintConfigPrettier from "eslint-config-prettier";
+
+export default [
+  // add more generic rulesets here, such as:
+  // js.configs.recommended,
+  ...pluginVue.configs["flat/recommended"],
+  eslintConfigPrettier,
+  // ...pluginVue.configs['flat/vue2-recommended'], // Use this if you are using Vue.js 2.x.
+  {
+    rules: {
+      // override/add rules settings here, such as:
+      // 'vue/no-unused-vars': 'error'
+    },
+  },
+];
diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
     "watch": "vite build --watch --mode development",
     "test": "vitest --environment jsdom",
     "coverage": "vitest run --coverage",
-    "eslint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --ignore-path .gitignore",
-    "stylelint": "stylelint '**/*.{vue,scss}'"
+    "eslint": "eslint 'app_name_vue/**/*.{js,vue}'",
+    "stylelint": "stylelint 'app_name_vue/**/*.{vue,scss}'"
   },
   "repository": {
     "type": "git",
@@ -23,34 +23,37 @@
   "homepage": "https://github.com/uw-it-aca/app_name#readme",
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "axios": "^1.6.7",
+    "@vueuse/core": "^11.3.0",
+    "@vueuse/integrations": "^11.3.0",
+    "axios": "^1.7.8",
     "bootstrap": "^5.3.3",
     "bootstrap-icons": "^1.11.3",
-    "pinia": "^2.1.7",
-    "solstice-vue": "github:uw-it-aca/solstice-vue#1.0.6",
-    "vue": "^3.4.21",
+    "bootstrap-vue-next": "^0.26.5",
+    "pinia": "^2.2.6",
+    "solstice-theme": "github:uw-it-aca/solstice-theme#1.0.2",
+    "solstice-vue": "github:uw-it-aca/solstice-vue#1.1.0",
+    "vue": "^3.5.13",
     "vue-gtag-next": "^1.14.0",
-    "vue-router": "^4.3.0",
+    "vue-router": "^4.5.0",
     "vue3-cookies": "^1.0.6",
-    "vue3-mq": "^3.2.0"
+    "vue3-mq": "^4.0.0"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.7.2",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "@vitest/coverage-v8": "^1.3.1",
-    "@vue/eslint-config-prettier": "^9.0.0",
-    "@vue/test-utils": "^2.4.4",
-    "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.22.0",
-    "jsdom": "^24.0.0",
-    "postcss-html": "^1.6.0",
-    "prettier": "^3.2.5",
-    "sass": "^1.71.1",
-    "stylelint": "^16.2.1",
-    "stylelint-config-recommended-scss": "^14.0.0",
+    "@vitejs/plugin-vue": "^5.2.1",
+    "@vitest/coverage-v8": "^2.1.6",
+    "@vue/test-utils": "^2.4.6",
+    "eslint": "^9.15.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-vue": "^9.31.0",
+    "jsdom": "^25.0.1",
+    "postcss-html": "^1.7.0",
+    "prettier": "^3.4.1",
+    "sass": "^1.81.0",
+    "stylelint": "^16.10.0",
+    "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard-scss": "^13.0.0",
-    "vite": "^5.1.4",
-    "vitest": "^1.3.1"
+    "stylelint-config-standard-scss": "^13.1.0",
+    "vite": "^6.0.0",
+    "vitest": "^2.1.6"
   }
 }