fix types

Author: Brooooooklyn

packages/cli/build.ts

@@ -12,6 +12,7 @@ import pkgJson from './package.json' with { type: 'json' };
 import viteRolldownConfig from './vite-rolldown.config';
 
 const projectDir = join(fileURLToPath(import.meta.url), '..');
+const rolldownViteSourceDir = resolve(projectDir, '..', '..', 'rolldown-vite', 'packages', 'vite');
 
 // Main build orchestration
 await buildCli();
@@ -46,7 +47,7 @@ async function buildNapiBinding() {
 async function buildCli() {
   await build({
     input: ['./src/bin.ts', './src/index.ts', './src/test.ts', './src/config.ts'],
-    external: [/^node:/, 'vitest', './vitest/config'],
+    external: [/^node:/, 'vitest', './vitest/dist/config.js'],
     plugins: [
       {
         name: 'rewrite-import-path',
@@ -86,6 +87,8 @@ async function buildCli() {
       nativeMagicString: true,
     },
   });
+
+  await cp(join(rolldownViteSourceDir, 'client.d.ts'), join(projectDir, 'dist', 'vite', 'client.d.ts'));
 }
 
 async function buildVite() {
@@ -188,7 +191,6 @@ async function buildVite() {
   await build(newViteRolldownConfig as BuildOptions[]);
 
   // Copy additional vite files
-  const rolldownViteSourceDir = resolve(projectDir, '..', '..', 'rolldown-vite', 'packages', 'vite');
 
   await cp(join(rolldownViteSourceDir, 'misc'), join(projectDir, 'dist/vite/misc'), {
     recursive: true,

packages/cli/package.json

@@ -19,7 +19,7 @@
       "default": "./dist/vitest/browser/context.js"
     },
     "./client": {
-      "types": "./dist/client.d.ts"
+      "types": "./dist/vite/client.d.ts"
     },
     "./config": {
       "types": "./dist/config.d.ts",

packages/cli/src/bin.ts

@@ -21,13 +21,18 @@ async function resolveUniversalViteConfig(err: null | Error, viteConfigCwd: stri
   if (err) {
     throw err;
   }
-  const { resolveConfig } = await import('./index.js');
-  const config = await resolveConfig({ root: viteConfigCwd }, 'build');
+  try {
+    const { resolveConfig } = await import('./config.js');
+    const config = await resolveConfig({ root: viteConfigCwd }, 'build');
 
-  return Promise.resolve(JSON.stringify({
-    lint: config.lint,
-    fmt: config.fmt,
-  }));
+    return Promise.resolve(JSON.stringify({
+      lint: config.lint,
+      fmt: config.fmt,
+    }));
+  } catch (err) {
+    console.error('[vite+] resolve universal vite config error:', err);
+    throw err;
+  }
 }
 
 // Initialize the CLI with tool resolvers

packages/cli/src/client.ts

@@ -23,4 +23,6 @@ declare module '@voidzero-dev/vite-plus/vite' {
 }
 
 // @ts-expect-error
-export * from './vitest/config';
+export * from './vitest/dist/config.js';
+
+export { resolveConfig } from '@voidzero-dev/vite-plus/vite';