fix: Fix in-package test commands (#596)

Fixes running in-package test commands, which were inadvertently broken
by #592.

Author: rekmarks

packages/cli/vitest.integration.config.ts

@@ -1,12 +1,14 @@
-import { defineConfig, defineProject, mergeConfig } from 'vitest/config';
+import { mergeConfig } from '@ocap/test-utils/vitest-config';
+import { defineConfig, defineProject } from 'vitest/config';
 
 import defaultConfig from '../../vitest.config.ts';
 
-export default defineConfig(() => {
+export default defineConfig((args) => {
   delete defaultConfig.test?.setupFiles;
 
   // We do not use our custom mergeConfig here
   const config = mergeConfig(
+    args,
     defaultConfig,
     defineProject({
       test: {
@@ -17,7 +19,6 @@ export default defineConfig(() => {
   );
 
   delete config.test?.coverage;
-  delete config.test?.projects;
 
   return config;
 });

packages/kernel-language-model-service/vitest.config.e2e.ts

@@ -5,7 +5,7 @@ import { defineConfig, defineProject } from 'vitest/config';
 import defaultConfig from '../../vitest.config.ts';
 
 export default defineConfig((args) => {
-  const config = mergeConfig(
+  return mergeConfig(
     args,
     defaultConfig,
     defineProject({
@@ -17,8 +17,4 @@ export default defineConfig((args) => {
       },
     }),
   );
-
-  delete config.test?.projects;
-
-  return config;
 });

packages/nodejs/vitest.config.e2e.ts

@@ -4,7 +4,7 @@ import { defineConfig, defineProject } from 'vitest/config';
 import defaultConfig from '../../vitest.config.ts';
 
 export default defineConfig((args) => {
-  const config = mergeConfig(
+  return mergeConfig(
     args,
     defaultConfig,
     defineProject({
@@ -16,8 +16,4 @@ export default defineConfig((args) => {
       },
     }),
   );
-
-  delete config.test?.projects;
-
-  return config;
 });

packages/test-utils/src/vitest-config.js

@@ -23,6 +23,10 @@ import { mergeConfig as mergeVitestConfig } from 'vitest/config';
  */
 export const mergeConfig = (args, ...rest) => {
   const config = mergeVitestConfig(...rest);
+
+  // This breaks tests in packages if set
+  delete config.test?.projects;
+
   if (args.mode === 'development') {
     delete config.test.coverage;
   } else {