feat(vitest): simplify react and vue configuration

jhipster · Jul 31, 2024 · 01b1539 · 01b1539
1 parent bff542e
commit 01b1539
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -21,18 +21,18 @@ export default defineConfig({
     },
     environment: 'jsdom',
     cache: false,
-    include: ['src/test/javascript/spec/**/*.(spec|test).(ts|tsx)'],
-    exclude: ['node_modules', 'src/test/javascript/integration/**/*.spec.ts'],
+    include: ['src/test/javascript/spec/**/*.{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
@@ -21,21 +21,18 @@ export default defineConfig({
     },
     environment: 'jsdom',
     cache: false,
-    include: ['src/test/javascript/spec/**/*.(spec|test).(ts|tsx)'],
-    exclude: ['node_modules', 'src/test/javascript/integration/**/*.spec.ts'],
+    include: ['src/test/javascript/spec/**/*.{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/',