From f619dbf0d295083ca1de1c8b060e7d2a46adea63 Mon Sep 17 00:00:00 2001
From: flx-sta <50131232+flx-sta@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:33:18 -0700
Subject: [PATCH] remove all extra vitest workspaces

---
 .github/workflows/run-test-template.yml | 26 --------
 vitest.config.ts                        | 84 ++++++++++++-------------
 vitest.workspace.ts                     | 54 ----------------
 3 files changed, 40 insertions(+), 124 deletions(-)
 delete mode 100644 .github/workflows/run-test-template.yml

diff --git a/.github/workflows/run-test-template.yml b/.github/workflows/run-test-template.yml
deleted file mode 100644
index fd57083d415..00000000000
--- a/.github/workflows/run-test-template.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Test Template
-
-on:
-  workflow_call:
-    inputs:
-      project:
-        required: true
-        type: string
-      options:
-        required: false
-        type: string
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        run: npm ci
-      - name: Run tests
-        run: npx vitest --project main ${{ inputs.project }} ${{ !runner.debug && '--silent' || '' }}
diff --git a/vitest.config.ts b/vitest.config.ts
index 9a765a89ae7..4e971ef7a83 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,46 +1,42 @@
-import { defineProject, UserWorkspaceConfig } from 'vitest/config';
-import { defaultConfig } from './vite.config';
-
-export const defaultProjectTestConfig: UserWorkspaceConfig["test"] = {
-	setupFiles: ['./src/test/vitest.setup.ts'],
-	server: {
-		deps: {
-			inline: ['vitest-canvas-mock'],
-			//@ts-ignore
-			optimizer: {
-				web: {
-					include: ['vitest-canvas-mock'],
-				}
-			}
-		}
-	},
-	environment: 'jsdom' as const,
-	environmentOptions: {
-		jsdom: {
-			resources: 'usable',
-		},
-	},
-	threads: false,
-	trace: true,
-	restoreMocks: true,
-	watch: false,
-	coverage: {
-		provider: 'istanbul' as const,
-		reportsDirectory: 'coverage' as const,
-		reporters: ['text-summary', 'html'],
-	},
-}
+import { defineProject, UserWorkspaceConfig } from "vitest/config";
+import { defaultConfig } from "./vite.config";
 
 export default defineProject(({ mode }) => ({
-	...defaultConfig,
-	test: {
-		...defaultProjectTestConfig,
-		name: "main",
-		include: ["./src/test/**/*.{test,spec}.ts"],
-		exclude: ["./src/test/pre.test.ts"],
-	},
-	esbuild: {
-		pure: mode === 'production' ? [ 'console.log' ] : [],
-		keepNames: true,
-	},
-}))
+  ...defaultConfig,
+  test: {
+    setupFiles: ["./src/test/vitest.setup.ts"],
+    server: {
+      deps: {
+        inline: ["vitest-canvas-mock"],
+        //@ts-ignore
+        optimizer: {
+          web: {
+            include: ["vitest-canvas-mock"],
+          },
+        },
+      },
+    },
+    environment: "jsdom" as const,
+    environmentOptions: {
+      jsdom: {
+        resources: "usable",
+      },
+    },
+    threads: false,
+    trace: true,
+    restoreMocks: true,
+    watch: false,
+    coverage: {
+      provider: "istanbul" as const,
+      reportsDirectory: "coverage" as const,
+      reporters: ["text-summary", "html"],
+    },
+    name: "main",
+    include: ["./src/test/**/*.{test,spec}.ts"],
+    exclude: ["./src/test/pre.test.ts"],
+  },
+  esbuild: {
+    pure: mode === "production" ? ["console.log"] : [],
+    keepNames: true,
+  },
+}));
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
index a885b77dc9d..38121942004 100644
--- a/vitest.workspace.ts
+++ b/vitest.workspace.ts
@@ -1,6 +1,5 @@
 import { defineWorkspace } from "vitest/config";
 import { defaultConfig } from "./vite.config";
-import { defaultProjectTestConfig } from "./vitest.config";
 
 export default defineWorkspace([
   {
@@ -11,58 +10,5 @@ export default defineWorkspace([
       environment: "jsdom",
     },
   },
-  {
-    ...defaultConfig,
-    test: {
-      ...defaultProjectTestConfig,
-      name: "misc",
-      include: [
-        "src/test/achievements/**/*.{test,spec}.ts",
-        "src/test/arena/**/*.{test,spec}.ts",
-        "src/test/battlerTags/**/*.{test,spec}.ts",
-        "src/test/eggs/**/*.{test,spec}.ts",
-        "src/test/field/**/*.{test,spec}.ts",
-        "src/test/inputs/**/*.{test,spec}.ts",
-        "src/test/localization/**/*.{test,spec}.ts",
-        "src/test/phases/**/*.{test,spec}.ts",
-        "src/test/settingMenu/**/*.{test,spec}.ts",
-        "src/test/sprites/**/*.{test,spec}.ts",
-        "src/test/ui/**/*.{test,spec}.ts",
-        "src/test/*.{test,spec}.ts",
-      ],
-    },
-  },
-  {
-    ...defaultConfig,
-    test: {
-      ...defaultProjectTestConfig,
-      name: "abilities",
-      include: ["src/test/abilities/**/*.{test,spec}.ts"],
-    },
-  },
-  {
-    ...defaultConfig,
-    test: {
-      ...defaultProjectTestConfig,
-      name: "battle",
-      include: ["src/test/battle/**/*.{test,spec}.ts"],
-    },
-  },
-  {
-    ...defaultConfig,
-    test: {
-      ...defaultProjectTestConfig,
-      name: "items",
-      include: ["src/test/items/**/*.{test,spec}.ts"],
-    },
-  },
-  {
-    ...defaultConfig,
-    test: {
-      ...defaultProjectTestConfig,
-      name: "moves",
-      include: ["src/test/moves/**/*.{test,spec}.ts"],
-    },
-  },
   "./vitest.config.ts",
 ]);