improve vitest config

.github/workflows/ci/getTestJobs.mjs

@@ -36,14 +36,14 @@ async function getTestJobs() {
     // Unit tests
     {
       jobName: 'Unit Tests',
-      jobCmd: 'pnpm run test:units',
+      jobCmd: 'pnpm exec vitest run',
       jobTestFiles: specFiles,
       jobSetups: [{ os: 'ubuntu-latest', node_version: '18' }]
     },
     // Typecheck `.ts` files
     {
       jobName: 'TypeScript',
-      jobCmd: 'pnpm run test:types',
+      jobCmd: 'pnpm exec test-types',
       jobSetups: [{ os: 'ubuntu-latest', node_version: '18' }]
     },
     // E2e tests
@@ -99,7 +99,7 @@ async function crawlE2eJobs(testFiles) {
         jobName,
         jobTestFiles: [],
         jobSetups,
-        jobCmd: 'pnpm run test:e2e'
+        jobCmd: 'pnpm exec test-e2e'
       })
     })
   }
@@ -144,7 +144,7 @@ async function crawlE2eJobs(testFiles) {
         if (!job) {
           job = {
             jobName: 'E2E Tests',
-            jobCmd: 'pnpm run test:e2e',
+            jobCmd: 'pnpm exec test-e2e',
             jobTestFiles: [],
             jobSetups: [{ os: 'ubuntu-latest', node_version: '20' }]
           }

package.json

@@ -12,12 +12,12 @@
     "build": "cd vike/ && pnpm run build",
     "========= Test": "",
     "// Run tests": "",
-    "test": "pnpm run test:units && pnpm run test:e2e && pnpm run test:types",
-    "test:units": "vitest run",
-    "test:e2e": "test-e2e",
+    "test": "vitest run && test-e2e && test-types",
+    "test:units": "vitest run --project unit",
+    "test:e2e": "vitest run --project e2e && test-e2e",
     "test:types": "test-types",
     "// https://github.com/vitejs/vite-ecosystem-ci/blob/6b5e66429c57047394cf7b7d8e052532ea03a414/tests/vike.ts#L14": "",
-    "test:vite-ecosystem-ci": "(export VITE_ECOSYSTEM_CI=true; pnpm run test:units && pnpm run test:e2e --exclude test-deprecated-design && pnpm run test:types)",
+    "test:vite-ecosystem-ci": "(export VITE_ECOSYSTEM_CI=true; vitest run && test-e2e --exclude test-deprecated-design && test-types)",
     "========= Docs": "",
     "// Develop website https://vike.dev": "",
     "docs": "cd docs/ && pnpm run dev",

vitest.workspace.ts

@@ -0,0 +1,17 @@
+import { defineWorkspace } from 'vitest/config'
+
+export default defineWorkspace([
+  {
+    test: {
+      include: ['vike/**/*.spec.ts'],
+      name: 'unit'
+    }
+  },
+  {
+    test: {
+      // test/**/*.test.ts => @brillout/test-e2e
+      include: ['test/**/*.spec.ts'],
+      name: 'e2e'
+    }
+  }
+])