fix(cli): re-export * from vitest

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();
@@ -45,8 +46,8 @@ async function buildNapiBinding() {
 
 async function buildCli() {
   await build({
-    input: ['./src/bin.ts', './src/index.ts', './src/test.ts'],
-    external: [/^node:/, 'vitest'],
+    input: ['./src/bin.ts', './src/index.ts', './src/test.ts', './src/config.ts'],
+    external: [/^node:/, 'vitest', './vitest/dist/config.js'],
     plugins: [
       {
         name: 'rewrite-import-path',
@@ -66,6 +67,15 @@ async function buildCli() {
             return { id, external: true };
           }
         },
+        renderChunk(code) {
+          if (code.includes('import * as Rolldown from "rolldown"')) {
+            return code.replaceAll(
+              `import * as Rolldown from "rolldown"`,
+              `import * as Rolldown from "${pkgJson.name}/rolldown"`,
+            );
+          }
+          return code;
+        },
       },
       dts(),
     ],
@@ -77,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() {
@@ -179,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,
@@ -384,7 +395,7 @@ async function bundleVitest() {
       ).replaceAll(`import 'vite';`, `import '${pkgJson.name}/vite';`).replaceAll(
         `'vite/module-runner'`,
         `'${pkgJson.name}/module-runner'`,
-      );
+      ).replaceAll(`declare module "vite"`, `declare module "${pkgJson.name}/vite"`);
       await writeFile(destPath, content, 'utf-8');
     } else {
       await copyFile(file, destPath);

packages/cli/package.json

@@ -19,12 +19,11 @@
       "default": "./dist/vitest/browser/context.js"
     },
     "./client": {
-      "types": "./dist/client.d.ts"
+      "types": "./dist/vite/client.d.ts"
     },
     "./config": {
-      "types": "./dist/vitest/config.d.ts",
-      "require": "./dist/vitest/dist/config.cjs",
-      "default": "./dist/vitest/dist/config.js"
+      "types": "./dist/config.d.ts",
+      "default": "./dist/config.js"
     },
     "./coverage": {
       "types": "./dist/vitest/coverage.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/config.ts

@@ -0,0 +1,28 @@
+// replace it with the real oxlint config in the future
+export type LintConfig = {
+  rules: {
+    [key: string]: string;
+  };
+};
+
+export type FmtConfig = {
+  rules: {
+    [key: string]: string;
+  };
+};
+
+declare module '@voidzero-dev/vite-plus/vite' {
+  interface UserConfig {
+    /**
+     * Options for oxlint
+     */
+    lint?: LintConfig;
+
+    fmt?: FmtConfig;
+  }
+}
+
+// @ts-expect-error
+export * from './vitest/dist/config.js';
+
+export { resolveConfig } from '@voidzero-dev/vite-plus/vite';