Merge branch 'main' into codex/remove-redundant-release-artifact-download

Author: fengmk2

.github/workflows/e2e-test.yml

@@ -314,6 +314,15 @@ jobs:
             node-version: 24
             command: |
               vp check --fix
+          - name: varlet
+            node-version: 22
+            command: |
+              # scripts/bootstrap.mjs spawns `pnpm build` via tinyexec and needs
+              # pnpm on PATH (not exposed by the vp install itself).
+              vp i -g pnpm
+              node scripts/bootstrap.mjs
+              vp run lint
+              vp run test:coverage
         exclude:
           # frm-stack uses Docker (testcontainers) which doesn't work the same way on Windows
           - os: windows-latest
@@ -335,6 +344,10 @@ jobs:
           - os: windows-latest
             project:
               name: npmx.dev
+          # varlet upstream CI is ubuntu-only
+          - os: windows-latest
+            project:
+              name: varlet
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/release.yml

@@ -159,12 +159,12 @@ jobs:
           path: ./packages/cli/dist
           if-no-files-found: error
 
-      - name: Upload cli skills (docs for agent integration)
+      - name: Upload cli docs
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ matrix.settings.target == 'x86_64-unknown-linux-gnu' }}
         with:
-          name: cli-skills
-          path: ./packages/cli/skills
+          name: cli-docs
+          path: ./packages/cli/docs
           if-no-files-found: error
 
       - name: Upload LICENSE files
@@ -209,11 +209,11 @@ jobs:
           pattern: cli
           merge-multiple: true
 
-      - name: Download cli skills
+      - name: Download cli docs
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
-          path: packages/cli/skills
-          pattern: cli-skills
+          path: packages/cli/docs
+          pattern: cli-docs
           merge-multiple: true
 
       - name: Download cli binding

.github/workflows/test-vp-create.yml

@@ -123,16 +123,29 @@ jobs:
             create-args: vite:monorepo --directory test-project
             template-args: ''
             verify-command: vp run ready
+            verify-migration: 'false'
           - name: application
             create-args: vite:application --directory test-project
             template-args: '-- --template vanilla-ts'
             verify-command: vp run build
+            verify-migration: 'false'
           - name: library
             create-args: vite:library --directory test-project
             template-args: ''
             verify-command: |
               vp run build
               vp run test
+            verify-migration: 'false'
+          # Remote template that ships ESLint (+ an eslint.config.js importing
+          # @eslint/js etc.). Exercises the migrate-before-rewrite reorder in
+          # `vp create`: after scaffold, ESLint → oxlint and Prettier → oxfmt
+          # run before the vite-plus rewrite so `.oxlintrc` / `.oxfmtrc` get
+          # merged into vite.config.ts.
+          - name: remote-vite-react-ts
+            create-args: [email protected]
+            template-args: '-- test-project --template react-ts'
+            verify-command: vp run build
+            verify-migration: 'true'
         package-manager:
           - pnpm
           - npm
@@ -253,6 +266,41 @@ jobs:
             console.log('✓ vite-plus@' + pkg.version + ' installed correctly');
           "
 
+      - name: Verify ESLint/Prettier auto-migration
+        if: matrix.template.verify-migration == 'true'
+        working-directory: ${{ runner.temp }}/test-project
+        run: |
+          # eslint.config.js must be gone (migration deleted it)
+          test ! -f eslint.config.js
+          echo "✓ eslint.config.js removed"
+
+          # .oxlintrc.json must NOT be loose on disk — it was merged into
+          # vite.config.ts by the rewrite step that runs after migration.
+          test ! -f .oxlintrc.json
+          echo "✓ .oxlintrc.json merged into vite.config.ts"
+
+          # vite.config.ts must contain the merged oxlint config.
+          grep -q '^[[:space:]]*lint:' vite.config.ts
+          echo "✓ vite.config.ts has merged lint section"
+
+          # package.json: eslint devDep removed, vite-plus present, lint script rewritten.
+          node -e "
+            const pkg = require('./package.json');
+            if (pkg.devDependencies && pkg.devDependencies.eslint) {
+              console.error('✗ eslint devDependency should have been removed');
+              process.exit(1);
+            }
+            if (!pkg.devDependencies || !pkg.devDependencies['vite-plus']) {
+              console.error('✗ vite-plus devDependency missing');
+              process.exit(1);
+            }
+            if (!pkg.scripts || !pkg.scripts.lint || !pkg.scripts.lint.includes('vp lint')) {
+              console.error('✗ lint script should invoke vp lint, got: ' + (pkg.scripts && pkg.scripts.lint));
+              process.exit(1);
+            }
+            console.log('✓ package.json migrated (eslint gone, vite-plus added, lint script rewritten)');
+          "
+
       - name: Run vp check
         working-directory: ${{ runner.temp }}/test-project
         run: vp check

ecosystem-ci/repo.json

@@ -119,5 +119,11 @@
     "branch": "main",
     "hash": "6192f60653c124ae068efaf5d7d0a4134c95edbd",
     "forceFreshMigration": true
+  },
+  "varlet": {
+    "repository": "https://github.com/varletjs/varlet.git",
+    "branch": "dev",
+    "hash": "83f6c6a418ab9319e07d719d86d4fa952f99e266",
+    "forceFreshMigration": true
   }
 }

packages/cli/.gitignore

@@ -1,4 +1,4 @@
 /npm
 /artifacts
 /LICENSE
-/skills/vite-plus/docs
+/docs

packages/cli/AGENTS.md

@@ -4,17 +4,12 @@
 
 This project is using Vite+, a unified toolchain built on top of Vite, Rolldown, Vitest, tsdown, Oxlint, Oxfmt, and Vite Task. Vite+ wraps runtime management, package management, and frontend tooling in a single global CLI called `vp`. Vite+ is distinct from Vite, and it invokes Vite through `vp dev` and `vp build`. Run `vp help` to print a list of commands and `vp <command> --help` for information about a specific command.
 
-## Common Pitfalls
-
-- **Running scripts:** Vite+ built-in commands (`vp lint`, `vp dev`, `vp build`, `vp test`, etc.) always run the Vite+ built-in tool. Use `vp run <script>` to run `package.json` scripts or tasks defined in `vite.config.ts`
-- **Do not install Vitest, Oxlint, Oxfmt, or tsdown directly:** Vite+ wraps these tools. Do not install or upgrade them, use Vite+ directly.
-- **Import JavaScript modules from `vite-plus`:** Import modules from the `vite-plus` dependency, not from `vite` or `vitest`. For example, `import { defineConfig } from 'vite-plus';` or `import { expect, test, vi } from 'vite-plus/test';`. You must not install `vitest` to import test utilities.
+Docs are local at `node_modules/vite-plus/docs` or online at https://viteplus.dev/guide/.
 
 ## Review Checklist
 
 - [ ] Run `vp install` after pulling remote changes and before getting started.
 - [ ] Run `vp check` and `vp test` to format, lint, type check and test changes.
-- [ ] Check if there are tasks or `package.json` scripts necessary for validation, run via `vp run <script>`.
+- [ ] Check if there are `vite.config.ts` tasks or `package.json` scripts necessary for validation, run via `vp run <script>`.
 
-* Docs: https://viteplus.dev/guide/
 <!--VITE PLUS END-->

packages/cli/build.ts

@@ -7,7 +7,7 @@
  * 3. syncCorePackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-core
  * 4. syncTestPackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-test
  * 5. syncVersionsExport() - Generates ./versions module with bundled tool versions
- * 6. copySkillDocs() - Copies docs into skills/vite-plus/docs for runtime MCP access
+ * 6. copyBundledDocs() - Copies docs into docs/ for bundled package access
  * 7. syncReadmeFromRoot() - Keeps package README in sync
  *
  * The sync functions allow this package to be a drop-in replacement for 'vite' by
@@ -19,9 +19,9 @@
  */
 
 import { execSync } from 'node:child_process';
-import { existsSync, globSync, readdirSync, statSync } from 'node:fs';
-import { copyFile, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
-import { dirname, join } from 'node:path';
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { copyFile, cp, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
+import { dirname, join, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { parseArgs } from 'node:util';
 
@@ -74,7 +74,7 @@ if (!skipTs) {
   await syncTestPackageExports();
   await syncVersionsExport();
 }
-await copySkillDocs();
+await copyBundledDocs();
 await syncReadmeFromRoot();
 
 async function buildNapiBinding() {
@@ -387,42 +387,32 @@ async function syncVersionsExport() {
 }
 
 /**
- * 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
- * skills routing and MCP page slugs.
+ * Copy the docs source tree into docs/, preserving relative paths.
+ * Generated VitePress output and installed dependencies are excluded so the package
+ * only ships authoring sources and referenced assets.
  */
-async function copySkillDocs() {
-  console.log('\nCopying skill docs...');
+async function copyBundledDocs() {
+  console.log('\nCopying bundled docs...');
 
   const docsSourceDir = join(projectDir, '..', '..', 'docs');
-  const docsTargetDir = join(projectDir, 'skills', 'vite-plus', 'docs');
+  const docsTargetDir = join(projectDir, 'docs');
 
   if (!existsSync(docsSourceDir)) {
-    console.log('  Docs source directory not found, skipping skill docs copy');
+    console.log('  Docs source directory not found, skipping docs copy');
     return;
   }
 
-  // Clean and recreate target directory
+  const skipPrefixes = ['node_modules', '.vitepress/cache', '.vitepress/dist'];
   await rm(docsTargetDir, { recursive: true, force: true });
-  await mkdir(docsTargetDir, { recursive: true });
-
-  // Find all markdown files recursively and copy them with their relative paths.
-  const mdFiles = globSync('**/*.md', { cwd: docsSourceDir }).filter(
-    (f) => !f.includes('node_modules') && f !== 'index.md',
-  );
-  // eslint-disable-next-line unicorn/no-array-sort -- sorted traversal keeps output deterministic
-  mdFiles.sort();
-
-  let copied = 0;
-  for (const relPath of mdFiles) {
-    const sourcePath = join(docsSourceDir, relPath);
-    const targetPath = join(docsTargetDir, relPath);
-    await mkdir(dirname(targetPath), { recursive: true });
-    await copyFile(sourcePath, targetPath);
-    copied++;
-  }
+  await cp(docsSourceDir, docsTargetDir, {
+    recursive: true,
+    filter: (src) => {
+      const rel = relative(docsSourceDir, src).replaceAll('\\', '/');
+      return !skipPrefixes.some((prefix) => rel === prefix || rel.startsWith(`${prefix}/`));
+    },
+  });
 
-  console.log(`  Copied ${copied} doc files to skills/vite-plus/docs/ (with paths preserved)`);
+  console.log('  Copied docs to docs/ (with paths preserved)');
 }
 
 async function syncReadmeFromRoot() {

packages/cli/package.json

@@ -28,8 +28,8 @@
     "binding/index.d.ts",
     "binding/index.js",
     "dist/test",
+    "docs",
     "rules",
-    "skills",
     "templates"
   ],
   "type": "module",