Merge branch 'main' into feat/dynamic-completion

fengmk2 · web-flow · commit 9ae77d1d06f1 · 2026-03-30T09:43:38.000+08:00
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -294,6 +294,11 @@ jobs:
             command: |
               vp fmt
               vp run validate
+          - name: vite-plus-vitest-global-type-minimal-repro
+            node-version: 24
+            command: |
+              vp test
+              vp check --fix
         exclude:
           # frm-stack uses Docker (testcontainers) which doesn't work the same way on Windows
           - os: windows-latest
diff --git a/ecosystem-ci/repo.json b/ecosystem-ci/repo.json
@@ -102,5 +102,11 @@
     "repository": "https://github.com/why-reproductions-are-required/bun-vite-template.git",
     "branch": "master",
     "hash": "d84099b4a153c7e0f35e510725b2ceb24c6e09ad"
+  },
+  "vite-plus-vitest-global-type-minimal-repro": {
+    "repository": "https://github.com/why-reproductions-are-required/vite-plus-vitest-global-type-minimal-repro.git",
+    "branch": "main",
+    "hash": "419653665e4f0688ad3cac68a34673fdd0632b55",
+    "forceFreshMigration": true
   }
 }
diff --git a/packages/cli/build.ts b/packages/cli/build.ts
@@ -7,8 +7,9 @@
  * 3. buildNapiBinding() - Builds the native Rust binding via NAPI
  * 4. syncCorePackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-core
  * 5. syncTestPackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-test
- * 6. copySkillDocs() - Copies docs into skills/vite-plus/docs for runtime MCP access
- * 7. syncReadmeFromRoot() - Keeps package README in sync
+ * 6. syncVersionsExport() - Generates ./versions module with bundled tool versions
+ * 7. copySkillDocs() - Copies docs into skills/vite-plus/docs for runtime MCP access
+ * 8. syncReadmeFromRoot() - Keeps package README in sync
  *
  * The sync functions allow this package to be a drop-in replacement for 'vite' by
  * re-exporting all the same subpaths (./client, ./types/*, etc.) while delegating
@@ -38,6 +39,8 @@ import {
 } from 'typescript';
 
 import { generateLicenseFile } from '../../scripts/generate-license.ts';
+import corePkg from '../core/package.json' with { type: 'json' };
+import testPkg from '../test/package.json' with { type: 'json' };
 
 const projectDir = dirname(fileURLToPath(import.meta.url));
 const TEST_PACKAGE_NAME = '@voidzero-dev/vite-plus-test';
@@ -80,6 +83,7 @@ if (!skipNative) {
 if (!skipTs) {
   await syncCorePackageExports();
   await syncTestPackageExports();
+  await syncVersionsExport();
 }
 await copySkillDocs();
 await syncReadmeFromRoot();
@@ -425,6 +429,75 @@ async function syncTestPackageExports() {
   console.log(`\nSynced ${Object.keys(generatedExports).length} exports from test package`);
 }
 
+/**
+ * Read version from a dependency's package.json in node_modules.
+ * Uses readFile because these packages don't export ./package.json.
+ *
+ * TODO: Once https://github.com/oxc-project/oxc/pull/20784 lands and oxlint/oxfmt/oxlint-tsgolint
+ * export ./package.json, this function can be removed and replaced with static imports:
+ * ```js
+ * import oxlintPkg from 'oxlint/package.json' with { type: 'json' };
+ * import oxfmtPkg from 'oxfmt/package.json' with { type: 'json' };
+ * import oxlintTsgolintPkg from 'oxlint-tsgolint/package.json' with { type: 'json' };
+ * ```
+ */
+async function readDepVersion(packageName: string): Promise<string | null> {
+  try {
+    const pkgPath = join(projectDir, 'node_modules', packageName, 'package.json');
+    const pkg = JSON.parse(await readFile(pkgPath, 'utf-8'));
+    return pkg.version ?? null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Generate ./versions export module with bundled tool versions.
+ *
+ * Collects versions from:
+ * - core/test package.json bundledVersions (vite, rolldown, tsdown, vitest)
+ * - CLI dependency package.json (oxlint, oxfmt, oxlint-tsgolint)
+ *
+ * Generates dist/versions.js and dist/versions.d.ts with inlined constants.
+ */
+async function syncVersionsExport() {
+  console.log('\nSyncing versions export...');
+  const distDir = join(projectDir, 'dist');
+
+  // Collect versions from bundledVersions (core + test)
+  const versions: Record<string, string> = {
+    ...(corePkg as Record<string, any>).bundledVersions,
+    ...(testPkg as Record<string, any>).bundledVersions,
+  };
+
+  // Collect versions from CLI dependencies (oxlint, oxfmt, oxlint-tsgolint)
+  // These don't export ./package.json, so we read from node_modules directly
+  const depTools = ['oxlint', 'oxfmt', 'oxlint-tsgolint'] as const;
+  for (const name of depTools) {
+    const version = await readDepVersion(name);
+    if (version) {
+      versions[name] = version;
+    }
+  }
+
+  // dist/versions.js — inlined constants (no runtime I/O)
+  await writeFile(
+    join(distDir, 'versions.js'),
+    `export const versions = ${JSON.stringify(versions, null, 2)};\n`,
+  );
+
+  // dist/versions.d.ts — type declarations
+  const typeFields = Object.keys(versions)
+    .map((k) => `  readonly '${k}': string;`)
+    .join('\n');
+  await writeFile(
+    join(distDir, 'versions.d.ts'),
+    `export declare const versions: {\n${typeFields}\n};\n`,
+  );
+
+  console.log(`  Created ./versions (${Object.keys(versions).length} tools)`);
+}
+
 /**
  * Copy markdown doc files from the monorepo docs/ directory into skills/vite-plus/docs/,
  * preserving the relative directory structure. This keeps stable file paths for
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -75,6 +75,10 @@
       "types": "./dist/pack.d.ts",
       "import": "./dist/pack.js"
     },
+    "./versions": {
+      "types": "./dist/versions.d.ts",
+      "default": "./dist/versions.js"
+    },
     "./test": {
       "import": {
         "types": "./dist/test/index.d.ts",
diff --git a/packages/cli/snap-tests/check-vitest-globals-typecheck/package.json b/packages/cli/snap-tests/check-vitest-globals-typecheck/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "check-vitest-globals-typecheck",
+  "version": "0.0.0",
+  "private": true
+}
diff --git a/packages/cli/snap-tests/check-vitest-globals-typecheck/snap.txt b/packages/cli/snap-tests/check-vitest-globals-typecheck/snap.txt
@@ -0,0 +1,3 @@
+> vp check
+pass: All 6 files are correctly formatted (<variable>ms, <variable> threads)
+pass: Found no warnings, lint errors, or type errors in 3 files (<variable>ms, <variable> threads)
diff --git a/packages/cli/snap-tests/check-vitest-globals-typecheck/src/index.test.ts b/packages/cli/snap-tests/check-vitest-globals-typecheck/src/index.test.ts
@@ -0,0 +1,5 @@
+import { fn } from "./index.ts";
+
+test("fn", () => {
+  expect(fn()).toBe("Hello, world!");
+});
diff --git a/packages/cli/snap-tests/check-vitest-globals-typecheck/src/index.ts b/packages/cli/snap-tests/check-vitest-globals-typecheck/src/index.ts
@@ -0,0 +1,3 @@
+export function fn() {
+  return "Hello, world!";
+}
diff --git a/packages/cli/snap-tests/check-vitest-globals-typecheck/steps.json b/packages/cli/snap-tests/check-vitest-globals-typecheck/steps.json
@@ -0,0 +1,6 @@
+{
+  "env": {
+    "VITE_DISABLE_AUTO_INSTALL": "1"
+  },
+  "commands": ["vp check"]
+}
diff --git a/packages/cli/snap-tests/check-vitest-globals-typecheck/tsconfig.json b/packages/cli/snap-tests/check-vitest-globals-typecheck/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "types": ["vite-plus/test/globals"],
+    "strict": true,
+    "noEmit": true,
+    "allowImportingTsExtensions": true,
+    "skipLibCheck": true
+  },
+  "include": ["src"]
+}
diff --git a/packages/cli/snap-tests/check-vitest-globals-typecheck/vite.config.ts b/packages/cli/snap-tests/check-vitest-globals-typecheck/vite.config.ts
@@ -0,0 +1,14 @@
+export default {
+  test: {
+    globals: true,
+  },
+  lint: {
+    options: {
+      typeAware: true,
+      typeCheck: true,
+    },
+    rules: {
+      "typescript/no-unsafe-call": "error",
+    },
+  },
+};
diff --git a/packages/cli/src/__tests__/versions.spec.ts b/packages/cli/src/__tests__/versions.spec.ts
@@ -0,0 +1,130 @@
+/**
+ * Verify that the vite-plus/versions export works correctly.
+ *
+ * Tests run against the already-built dist/ directory, ensuring
+ * that syncVersionsExport() produces correct artifacts.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
+
+import { describe, expect, it } from '@voidzero-dev/vite-plus-test';
+
+const cliPkgDir = path.resolve(path.dirname(url.fileURLToPath(import.meta.url)), '../..');
+const distDir = path.join(cliPkgDir, 'dist');
+const corePkgPath = path.join(cliPkgDir, '../core/package.json');
+const testPkgPath = path.join(cliPkgDir, '../test/package.json');
+
+describe('versions export', () => {
+  describe('build artifacts', () => {
+    it('dist/versions.js should exist', () => {
+      expect(fs.existsSync(path.join(distDir, 'versions.js'))).toBe(true);
+    });
+
+    it('dist/versions.d.ts should exist', () => {
+      expect(fs.existsSync(path.join(distDir, 'versions.d.ts'))).toBe(true);
+    });
+
+    it('dist/versions.js should export a versions object', () => {
+      const content = fs.readFileSync(path.join(distDir, 'versions.js'), 'utf-8');
+      expect(content).toContain('export const versions');
+    });
+
+    it('dist/versions.d.ts should declare a versions type', () => {
+      const content = fs.readFileSync(path.join(distDir, 'versions.d.ts'), 'utf-8');
+      expect(content).toContain('export declare const versions');
+    });
+  });
+
+  describe('bundledVersions consistency', () => {
+    it('should contain all core bundledVersions', async () => {
+      const corePkg = JSON.parse(fs.readFileSync(corePkgPath, 'utf-8'));
+      const mod = await import('../../dist/versions.js');
+      const versions = mod.versions as Record<string, string>;
+      for (const [key, value] of Object.entries(
+        corePkg.bundledVersions as Record<string, string>,
+      )) {
+        expect(versions[key], `versions.${key} should match core bundledVersions`).toBe(value);
+      }
+    });
+
+    it('should contain all test bundledVersions', async () => {
+      const testPkg = JSON.parse(fs.readFileSync(testPkgPath, 'utf-8'));
+      const mod = await import('../../dist/versions.js');
+      const versions = mod.versions as Record<string, string>;
+      for (const [key, value] of Object.entries(
+        testPkg.bundledVersions as Record<string, string>,
+      )) {
+        expect(versions[key], `versions.${key} should match test bundledVersions`).toBe(value);
+      }
+    });
+  });
+
+  describe('dependency tool versions', () => {
+    it('should contain oxlint version', async () => {
+      const mod = await import('../../dist/versions.js');
+      const versions = mod.versions as Record<string, string>;
+      expect(versions.oxlint).toBeTypeOf('string');
+    });
+
+    it('should contain oxfmt version', async () => {
+      const mod = await import('../../dist/versions.js');
+      const versions = mod.versions as Record<string, string>;
+      expect(versions.oxfmt).toBeTypeOf('string');
+    });
+
+    it('should contain oxlint-tsgolint version', async () => {
+      const mod = await import('../../dist/versions.js');
+      const versions = mod.versions as Record<string, string>;
+      expect(versions['oxlint-tsgolint']).toBeTypeOf('string');
+    });
+  });
+
+  describe('type declarations', () => {
+    it('should have type fields for all bundled tools', () => {
+      const content = fs.readFileSync(path.join(distDir, 'versions.d.ts'), 'utf-8');
+      const expectedKeys = [
+        'vite',
+        'rolldown',
+        'tsdown',
+        'vitest',
+        'oxlint',
+        'oxfmt',
+        'oxlint-tsgolint',
+      ];
+      for (const key of expectedKeys) {
+        expect(content).toContain(key);
+      }
+    });
+
+    it('should declare all fields as readonly string', () => {
+      const content = fs.readFileSync(path.join(distDir, 'versions.d.ts'), 'utf-8');
+      const fieldMatches = content.match(/readonly [\w'-]+: string;/g);
+      expect(fieldMatches).not.toBeNull();
+      expect(fieldMatches!.length).toBeGreaterThanOrEqual(7);
+    });
+  });
+
+  describe('runtime import', () => {
+    it('should be importable and return an object with expected keys', async () => {
+      const { versions } = await import('../../dist/versions.js');
+      expect(versions).toBeDefined();
+      expect(typeof versions).toBe('object');
+      expect(versions.vite).toBeTypeOf('string');
+      expect(versions.rolldown).toBeTypeOf('string');
+      expect(versions.tsdown).toBeTypeOf('string');
+      expect(versions.vitest).toBeTypeOf('string');
+      expect(versions.oxlint).toBeTypeOf('string');
+      expect(versions.oxfmt).toBeTypeOf('string');
+      expect(versions['oxlint-tsgolint']).toBeTypeOf('string');
+    });
+
+    it('should have valid semver-like versions', async () => {
+      const { versions } = await import('../../dist/versions.js');
+      const semverPattern = /^\d+\.\d+\.\d+/;
+      for (const [key, value] of Object.entries(versions as Record<string, string>)) {
+        expect(value, `${key} should be a valid version`).toMatch(semverPattern);
+      }
+    });
+  });
+});
diff --git a/packages/cli/src/migration/migrator.ts b/packages/cli/src/migration/migrator.ts
@@ -720,6 +720,7 @@ export function rewriteStandaloneProject(
         overrides: {
           ...pkg.pnpm?.overrides,
           ...VITE_PLUS_OVERRIDE_PACKAGES,
+          ...(isForceOverrideMode() ? { [VITE_PLUS_NAME]: VITE_PLUS_VERSION } : {}),
         },
       };
       // remove packages from `resolutions` field if they exist
@@ -734,7 +735,7 @@ export function rewriteStandaloneProject(
     extractedStagedConfig = rewritePackageJson(pkg, packageManager, false, skipStagedMigration);
 
     // ensure vite-plus is in devDependencies
-    if (!pkg.devDependencies?.[VITE_PLUS_NAME]) {
+    if (!pkg.devDependencies?.[VITE_PLUS_NAME] || isForceOverrideMode()) {
       pkg.devDependencies = {
         ...pkg.devDependencies,
         [VITE_PLUS_NAME]: VITE_PLUS_VERSION,
diff --git a/packages/cli/src/utils/editor.ts b/packages/cli/src/utils/editor.ts
@@ -27,9 +27,7 @@ const ZED_SETTINGS = {
     oxlint: {
       initialization_options: {
         settings: {
-          configPath: './.oxlintrc.json',
           run: 'onType',
-          disableNestedConfig: false,
           fixKind: 'safe_fix',
           typeAware: true,
           unusedDisableDirectives: 'deny',
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -136,8 +136,8 @@
   },
   "peerDependencies": {
     "@arethetypeswrong/core": "^0.18.1",
-    "@tsdown/css": "0.21.5",
-    "@tsdown/exe": "0.21.5",
+    "@tsdown/css": "0.21.7",
+    "@tsdown/exe": "0.21.7",
     "@types/node": "^20.19.0 || >=22.12.0",
     "@vitejs/devtools": "^0.1.0",
     "esbuild": "^0.27.0",
@@ -219,6 +219,6 @@
   "bundledVersions": {
     "vite": "8.0.3",
     "rolldown": "1.0.0-rc.12",
-    "tsdown": "0.21.5"
+    "tsdown": "0.21.7"
   }
 }
diff --git a/packages/test/BUNDLING.md b/packages/test/BUNDLING.md
@@ -113,9 +113,12 @@ For maintainers developing the vitest/vite migration feature, here are the trans
 | `from "@vitest/browser-preview"`     | `from "@voidzero-dev/vite-plus-test/browser-preview"`     |
 | `from "vite"`                        | `from "@voidzero-dev/vite-plus-core"`                     |
 | `from "vite/module-runner"`          | `from "@voidzero-dev/vite-plus-core/module-runner"`       |
+| `import('vitest')`                   | `import('@voidzero-dev/vite-plus-test')`                  |
 
 **Note**: `@voidzero-dev/vite-plus-core` is the bundled version of upstream vite (Vite v8 beta). See [Core Package Bundling](../core/BUNDLING.md) for details on what it contains.
 
+**Note**: The `import('vitest')` → `import('@voidzero-dev/vite-plus-test')` rewrite is critical for `globals.d.ts`, which declares global types like `typeof import('vitest')['test']`. Without this rewrite, `vitest` is not resolvable from the `@voidzero-dev/vite-plus-test` package context in pnpm's strict `node_modules` layout. TypeScript silently treats unresolved dynamic type imports as `any`, but oxlint's type-aware linting treats them as `error` types, causing `no-unsafe-call` errors. The rewrite turns this into a self-reference that resolves correctly via Node.js package self-referencing.
+
 **Note:** When using pnpm overrides, you have three options for browser provider imports:
 
 - `vitest/browser-playwright` (or `vitest/browser-webdriverio`, `vitest/browser-preview`) - works when `vitest` is overridden to our package (Recommended)
diff --git a/packages/test/build.ts b/packages/test/build.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -102,5 +102,11 @@`
`102`	`102`	`"repository": "https://github.com/why-reproductions-are-required/bun-vite-template.git",`
`103`	`103`	`"branch": "master",`
`104`	`104`	`"hash": "d84099b4a153c7e0f35e510725b2ceb24c6e09ad"`
	`105`	`+ },`
	`106`	`+ "vite-plus-vitest-global-type-minimal-repro": {`
	`107`	`+ "repository": "https://github.com/why-reproductions-are-required/vite-plus-vitest-global-type-minimal-repro.git",`
	`108`	`+ "branch": "main",`
	`109`	`+ "hash": "419653665e4f0688ad3cac68a34673fdd0632b55",`
	`110`	`+ "forceFreshMigration": true`
`105`	`111`	`}`
`106`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+> vp check`
	`2`	`+pass: All 6 files are correctly formatted (<variable>ms, <variable> threads)`
	`3`	`+pass: Found no warnings, lint errors, or type errors in 3 files (<variable>ms, <variable> threads)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export function fn() {`
	`2`	`+ return "Hello, world!";`
	`3`	`+}`