From 42898aad6afaf5aedb97959d56f69537c77a5e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= <aurelien.mino@gmail.com>
Date: Mon, 29 Jul 2024 23:52:41 +0200
Subject: [PATCH] feat(vitest): simplify react and vue configuration

---
 .../generator/client/react/vitest.config.ts.mustache | 12 ++++++------
 .../generator/client/vue/vitest.config.ts.mustache   | 11 ++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/generator/client/react/vitest.config.ts.mustache b/src/main/resources/generator/client/react/vitest.config.ts.mustache
index 0209d076467..b584b4240c9 100644
--- a/src/main/resources/generator/client/react/vitest.config.ts.mustache
+++ b/src/main/resources/generator/client/react/vitest.config.ts.mustache
@@ -21,18 +21,18 @@ export default defineConfig({
     },
     environment: 'jsdom',
     cache: false,
-    include: ['src/test/webapp/unit/**/*.(spec|test).(ts|tsx)'],
-    exclude: ['node_modules', 'src/test/webapp/component/**/*.spec.ts'],
+    include: ['src/test/webapp/unit/**/*.{test,spec}.?(c|m)[jt]s?(x)'],
     coverage: {
-      all: true,
       thresholds: {
         perFile: true,
         autoUpdate: true,
         100: true,
       },
-      include: ['src/main/webapp/app/**/*.ts', 'src/main/webapp/app/**/*.tsx'],
-      exclude: ['src/main/webapp/app/index.tsx', 'src/main/webapp/app/**/*.d.ts'],
-      clean: true,
+      include: ['src/main/webapp/**/*.ts?(x)'],
+      exclude: [
+        ...configDefaults.coverage.exclude,
+        'src/main/webapp/app/index.tsx',
+      ],
       provider: 'istanbul',
       reportsDirectory: '{{projectBuildDirectory}}/test-results/',
       reporter: ['html', 'json-summary', 'text', 'text-summary', 'lcov', 'clover'],
diff --git a/src/main/resources/generator/client/vue/vitest.config.ts.mustache b/src/main/resources/generator/client/vue/vitest.config.ts.mustache
index cffa72558b4..8051640128e 100644
--- a/src/main/resources/generator/client/vue/vitest.config.ts.mustache
+++ b/src/main/resources/generator/client/vue/vitest.config.ts.mustache
@@ -21,21 +21,18 @@ export default defineConfig({
     },
     environment: 'jsdom',
     cache: false,
-    include: ['src/test/webapp/unit/**/*.(spec|test).(ts|tsx)'],
-    exclude: ['node_modules', 'src/test/webapp/component/**/*.spec.ts'],
+    include: ['src/test/webapp/unit/**/*.{test,spec}.?(c|m)[jt]s?(x)'],
     coverage: {
       thresholds: {
         perFile: true,
         autoUpdate: true,
         100: true,
       },
+      include: ['src/main/webapp/**/*.ts?(x)'],
       exclude: [
-        'src/main/webapp/**/*.component.ts',
+        ...configDefaults.coverage.exclude,
         'src/main/webapp/app/main.ts',
-        '.eslintrc.cjs',
-        '.lintstagedrc.cjs',
-        'src/test/**/*',
-        '{{projectBuildDirectory}}/**',
+        'src/main/webapp/**/*.component.ts',
       ],
       provider: 'istanbul',
       reportsDirectory: '{{projectBuildDirectory}}/test-results/',