Merge pull request #98 from obewds/dev

0.18.5 - vitest config generator now with coverage config sub object and fixing ziggy router param for a teams.show link
obewds · Feb 20, 2024 · 90b2253 · 90b2253
2 parents 63d31c2 + 4fe4cf4
commit 90b2253
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/dist/generators/jetstream/generate-vitest-config-ts.js b/dist/generators/jetstream/generate-vitest-config-ts.js
diff --git a/dist/generators/jetstream/generate-vitest-config-ts.js.map b/dist/generators/jetstream/generate-vitest-config-ts.js.map
diff --git a/dist/generators/jetstream/resources/js/Layouts/generate-app-layout-vue.js b/dist/generators/jetstream/resources/js/Layouts/generate-app-layout-vue.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@obewds/vilt-ds",
-  "version": "0.18.4",
+  "version": "0.18.5",
   "description": "The official repository for the VILT Design System for the Vue.js, Inertia.js, Laravel, and Tailwind CSS web app stack that is turbocharged with Typescript and VueVentus.",
   "license": "MIT",
   "author": "Matt McT",

diff --git a/src/generators/jetstream/generate-vitest-config-ts.ts b/src/generators/jetstream/generate-vitest-config-ts.ts
@@ -17,6 +17,10 @@ export default {
         setupFiles: ['./vitestSetup.ts', './vitestZiggyRouteShim.d.ts'],
         exclude: [...configDefaults.exclude],
         include: ['./tests/Vitest/**/*.{test,spec}.?(c|m)[jt]s?(x)'],
+        coverage: {
+            all: false,
+            provider: 'v8', // or 'istanbul'
+        },
     },
 }
 `;

diff --git a/src/generators/jetstream/resources/js/Layouts/generate-app-layout-vue.ts b/src/generators/jetstream/resources/js/Layouts/generate-app-layout-vue.ts
@@ -136,7 +136,7 @@ return `<!-- ./resources/js/Layouts/AppLayout.vue -->
                                                 </div>
 
                                                 <!-- Team Settings -->
-                                                <DropdownLink :href="route('teams.show', pageProps.auth.user.current_team)">
+                                                <DropdownLink :href="route('teams.show', pageProps.auth.user.current_team.id)">
                                                     Team Settings
                                                 </DropdownLink>
 
@@ -301,7 +301,7 @@ return `<!-- ./resources/js/Layouts/AppLayout.vue -->
                                 </div>
 
                                 <!-- Team Settings -->
-                                <ResponsiveNavLink :href="route('teams.show', pageProps.auth.user.current_team)" :active="route().current('teams.show')">
+                                <ResponsiveNavLink :href="route('teams.show', pageProps.auth.user.current_team.id)" :active="route().current('teams.show')">
                                     Team Settings
                                 </ResponsiveNavLink>