updated/moved vitest, finished merge

app/package.json

@@ -15,12 +15,6 @@
   },
   "scripts": {
     "dev": "vite",
-    "test": "ALL_TESTS=1 bun test --bail",
-    "test:all": "bun run test && bun run test:node",
-    "test:bun": "ALL_TESTS=1 bun test --bail",
-    "test:node": "tsx --test $(find . -type f -name '*.native-spec.ts')",
-    "test:adapters": "bun test src/adapter/**/*.adapter.spec.ts --bail",
-    "test:coverage": "ALL_TESTS=1 bun test --bail --coverage",
     "build": "NODE_ENV=production bun run build.ts --minify --types",
     "build:all": "rm -rf dist && bun run build:static && NODE_ENV=production bun run build.ts --minify --types --clean && bun run build:cli",
     "build:ci": "mkdir -p dist/static/.vite && echo '{}' > dist/static/.vite/manifest.json && NODE_ENV=production bun run build.ts",
@@ -34,8 +28,15 @@
     "cli": "LOCAL=1 bun src/cli/index.ts",
     "prepublishOnly": "bun run types && bun run test && bun run test:node && bun run build:all && cp ../README.md ./",
     "postpublish": "rm -f README.md",
-    "test:unit": "vitest",
-    "test:unit:coverage": "vitest run --coverage",
+    "test": "ALL_TESTS=1 bun test --bail",
+    "test:all": "bun run test && bun run test:node",
+    "test:bun": "ALL_TESTS=1 bun test --bail",
+    "test:node": "tsx --test $(find . -type f -name '*.native-spec.ts')",
+    "test:adapters": "bun test src/adapter/**/*.adapter.spec.ts --bail",
+    "test:coverage": "ALL_TESTS=1 bun test --bail --coverage",
+    "test:vitest": "vitest run",
+    "test:vitest:watch": "vitest",
+    "test:vitest:coverage": "vitest run --coverage",
     "test:e2e": "playwright test",
     "test:e2e:ui": "playwright test --ui",
     "test:e2e:debug": "playwright test --debug",

app/playwright.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig, devices } from "@playwright/test";
 
 const baseUrl = process.env.TEST_URL || "http://localhost:28623";
-const startCommand = process.env.START_COMMAND || "bun run dev";
+const startCommand = process.env.TEST_START_COMMAND || "bun run dev";
 
 export default defineConfig({
    testDir: "./e2e",

app/vitest.config.ts

@@ -7,17 +7,12 @@ export default defineConfig({
    test: {
       globals: true,
       environment: "jsdom",
-      setupFiles: ["./src/test/setup.ts"],
+      setupFiles: ["./__test__/vitest/setup.ts"],
+      include: ["**/*.vi-test.ts"],
       coverage: {
          provider: "v8",
          reporter: ["text", "json", "html"],
-         exclude: [
-            "node_modules/",
-            "src/test/setup.ts",
-            "**/*.d.ts",
-            "**/*.test.ts",
-            "**/*.config.ts",
-         ],
+         exclude: ["node_modules/", "**/*.d.ts", "**/*.test.ts", "**/*.config.ts"],
       },
    },
 });