Merge origin/master

vitest.config.ts

@@ -1,4 +1,5 @@
 import { defineConfig } from 'vitest/config';
+<<<<<<< HEAD
 import react from '@vitejs/plugin-react';
 import path from 'path';
 
@@ -14,4 +15,43 @@ export default defineConfig({
       '@': path.resolve(__dirname, './src'),
     },
   },
+=======
+import { resolve } from 'path';
+
+export default defineConfig({
+  plugins: [],
+  test: {
+    globals: true,
+    environment: 'jsdom',
+    setupFiles: [],
+    include: ['**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    exclude: [
+      '**/node_modules/**',
+      '**/dist/**',
+      '**/.next/**',
+      '**/coverage/**',
+      '**/*.bak/**',
+      '**/src/components-vite/**',
+      '**/src/pages-vite/**'
+    ],
+    coverage: {
+      provider: 'v8',
+      reporter: ['text', 'json', 'html'],
+      exclude: [
+        'node_modules/',
+        '.next/',
+        'coverage/',
+        '**/*.config.{js,ts}',
+        '**/*.bak',
+        'src/components-vite/**',
+        'src/pages-vite/**'
+      ]
+    }
+  },
+  resolve: {
+    alias: {
+      '@': resolve(__dirname, './src')
+    }
+  }
+>>>>>>> origin/master
 });