Merge branch 'main' into fix/custom-vp-home-broken

Author: fengmk2

.github/workflows/ci.yml

@@ -59,6 +59,33 @@ jobs:
               - '!.github/workflows/deploy-docs.yml'
               - '!netlify.toml'
 
+  docs-fmt:
+    name: Docs format check
+    needs: detect-changes
+    # Docs-only changes skip the full CI matrix, so nothing else format-checks
+    # them (code changes get `vp check` in cli-e2e-test). Non-blocking:
+    # intentionally not listed in the `done` job's needs.
+    if: needs.detect-changes.outputs.code-changed == 'false'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: taiki-e/checkout-action@7d1e50e93dc4fb3bba58f85018fadf77898aee8b # v1.4.2
+
+      - uses: voidzero-dev/setup-vp@35171c92dd08b67d5a9d3f2a4327800e58396f2a # v1.13.0
+        with:
+          # The workspace `vite-plus` version can be ahead of the registry, so
+          # pin the released build instead of auto-detecting from package.json.
+          version: latest
+          run-install: false
+
+      - name: Run vp fmt --check
+        run: |
+          # `vp fmt` loads the root vite.config.ts, whose `import ... from 'vite-plus'`
+          # must resolve at runtime. Link the released package out of the global
+          # install instead of installing the whole workspace.
+          mkdir -p node_modules
+          ln -s "$HOME/.vite-plus/current/node_modules/vite-plus" node_modules/vite-plus
+          vp fmt --check
+
   download-previous-rolldown-binaries:
     needs: detect-changes
     if: needs.detect-changes.outputs.code-changed == 'true'

crates/vite_migration/src/prettier.rs

@@ -225,6 +225,15 @@ mod tests {
             rewrite_prettier_script("prettier --check --list-different ."),
             "vp fmt --check ."
         );
+
+        // --list-different + --check (the other order) → still a single --check
+        assert_eq!(
+            rewrite_prettier_script("prettier --list-different --check ."),
+            "vp fmt --check ."
+        );
+
+        // two literal --check → still a single --check
+        assert_eq!(rewrite_prettier_script("prettier --check --check ."), "vp fmt --check .");
     }
 
     #[test]

crates/vite_migration/src/script_rewrite.rs

@@ -497,7 +497,14 @@ fn strip_flags_from_suffix(
                     break;
                 }
                 if val == conv.dedup_flag {
-                    conversion_emitted[ci] = true;
+                    // Drop a duplicate if the target flag was already emitted;
+                    // otherwise keep this one and mark it emitted.
+                    if conversion_emitted[ci] {
+                        converted = true;
+                    } else {
+                        conversion_emitted[ci] = true;
+                    }
+                    break;
                 }
             }
             if converted {

crates/vite_static_config/src/lib.rs

@@ -115,26 +115,9 @@ pub fn resolve_static_config(dir: &AbsolutePath) -> FieldMap {
 
     let extension = config_path.as_path().extension().and_then(|e| e.to_str()).unwrap_or("");
 
-    if extension == "json" {
-        return parse_json_config(&source);
-    }
-
     parse_js_ts_config(&source, extension)
 }
 
-/// Parse a JSON config file into a map of field names to values.
-/// All fields in a valid JSON object are fully static.
-fn parse_json_config(source: &str) -> FieldMap {
-    let Ok(serde_json::Value::Object(obj)) = serde_json::from_str(source) else {
-        return FieldMap::unanalyzable();
-    };
-    let mut map = FxHashMap::with_capacity_and_hasher(obj.len(), Default::default());
-    for (k, v) in &obj {
-        map.insert(Box::from(k.as_str()), FieldValue::Json(v.clone()));
-    }
-    FieldMap(FieldMapInner::Closed(map))
-}
-
 /// Parse a JS/TS config file, extracting the default export object's fields.
 fn parse_js_ts_config(source: &str, extension: &str) -> FieldMap {
     let allocator = Allocator::default();
@@ -518,10 +501,10 @@ mod tests {
         assert!(result.get("run").is_none());
     }
 
-    // ── JSON config parsing ─────────────────────────────────────────────
+    // ── resolve_static_config from a config file─────────────────────────────────────────────
 
     #[test]
-    fn parses_json_config() {
+    fn resolve_static_config_reads_run_from_config_file() {
         let dir = TempDir::new().unwrap();
         let dir_path = vite_path::AbsolutePathBuf::new(dir.path().to_path_buf()).unwrap();
         std::fs::write(

packages/cli/src/utils/__tests__/agent.spec.ts

@@ -8,7 +8,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import {
   COPILOT_SETUP_WORKFLOW_PATH,
   detectExistingAgentTargetPaths,
-  detectExistingAgentTargetPath,
   hasExistingAgentInstructions,
   replaceMarkedAgentInstructionsSection,
   resolveAgentOptions,
@@ -376,7 +375,7 @@ describe('selectAgentTargetPaths', () => {
   });
 });
 
-describe('detectExistingAgentTargetPath', () => {
+describe('detectExistingAgentTargetPaths', () => {
   it('detects all existing regular agent files', async () => {
     const dir = await createProjectDir();
     await mockFs.writeFile(path.join(dir, 'AGENTS.md'), '# Agents');
@@ -389,14 +388,14 @@ describe('detectExistingAgentTargetPath', () => {
     const dir = await createProjectDir();
     await mockFs.writeFile(path.join(dir, 'CLAUDE.md'), '# Claude');
 
-    expect(detectExistingAgentTargetPath(dir)).toBe('CLAUDE.md');
+    expect(detectExistingAgentTargetPaths(dir)).toEqual(['CLAUDE.md']);
   });
 
   it('ignores symlinked agent files', async () => {
     const dir = await createProjectDir();
     await mockFs.symlink('AGENTS.md', path.join(dir, 'CLAUDE.md'));
 
-    expect(detectExistingAgentTargetPath(dir)).toBeUndefined();
+    expect(detectExistingAgentTargetPaths(dir)).toBeUndefined();
   });
 });
 

packages/cli/src/utils/agent.ts

@@ -174,19 +174,6 @@ export async function selectAgentTargetPaths({
   return selection.targetPaths;
 }
 
-export async function selectAgentTargetPath({
-  interactive,
-  agent,
-  onCancel,
-}: {
-  interactive: boolean;
-  agent?: AgentSelection;
-  onCancel: () => void;
-}) {
-  const targetPaths = await selectAgentTargetPaths({ interactive, agent, onCancel });
-  return targetPaths?.[0];
-}
-
 export function detectExistingAgentTargetPaths(projectRoot: string) {
   const detectedPaths: string[] = [];
   const seenTargetPaths = new Set<string>();
@@ -203,10 +190,6 @@ export function detectExistingAgentTargetPaths(projectRoot: string) {
   return detectedPaths.length > 0 ? detectedPaths : undefined;
 }
 
-export function detectExistingAgentTargetPath(projectRoot: string) {
-  return detectExistingAgentTargetPaths(projectRoot)?.[0];
-}
-
 export function hasExistingAgentInstructions(projectRoot: string): boolean {
   const targetPaths = detectExistingAgentTargetPaths(projectRoot);
   if (!targetPaths) {
@@ -259,10 +242,6 @@ export function resolveAgentTargetPaths(agent?: string | string[]) {
   return getAgentTargetPaths(resolveAgentOptions(agent));
 }
 
-export function resolveAgentTargetPath(agent?: string) {
-  return resolveAgentTargetPaths(agent)[0] ?? 'AGENTS.md';
-}
-
 export function resolveAgentOptions(agent?: string | string[]) {
   const agentNames = parseAgentNames(agent);
   const resolvedAgentNames = agentNames.length > 0 ? agentNames : [AGENT_DEFAULT_ID];

packages/cli/src/utils/editor.ts

@@ -273,10 +273,6 @@ export async function selectEditors({
   return undefined;
 }
 
-export function detectExistingEditor(projectRoot: string): EditorId | undefined {
-  return detectExistingEditors(projectRoot)?.[0];
-}
-
 export function detectExistingEditors(projectRoot: string): EditorId[] | undefined {
   const editors: EditorId[] = [];
   for (const option of EDITORS) {

packages/cli/src/utils/terminal.ts

@@ -37,12 +37,7 @@ export function error(text: string) {
 }
 
 // Standard message prefix functions matching the Rust CLI convention.
-// info/note go to stdout (normal output), warn/error go to stderr (diagnostics).
-
-export function infoMsg(msg: string) {
-  /* oxlint-disable-next-line no-console */
-  console.log(styleText(['blue', 'bold'], 'info:'), msg);
-}
+// warn/error go to stderr (diagnostics).
 
 export function warnMsg(msg: string) {
   /* oxlint-disable-next-line no-console */
@@ -53,8 +48,3 @@ export function errorMsg(msg: string) {
   /* oxlint-disable-next-line no-console */
   console.error(styleText(['red', 'bold'], 'error:'), msg);
 }
-
-export function noteMsg(msg: string) {
-  /* oxlint-disable-next-line no-console */
-  console.log(styleText(['gray', 'bold'], 'note:'), msg);
-}

rfcs/init-editor-configs.md

@@ -81,12 +81,12 @@ When a config file already exists:
 
 Mirrors `packages/cli/src/utils/agent.ts` structure:
 
-| agent.ts                          | editor.ts                |
-| --------------------------------- | ------------------------ |
-| `AGENTS` array                    | `EDITORS` array          |
-| `selectAgentTargetPath()`         | `selectEditor()`         |
-| `detectExistingAgentTargetPath()` | `detectExistingEditor()` |
-| `writeAgentInstructions()`        | `writeEditorConfigs()`   |
+| agent.ts                           | editor.ts                 |
+| ---------------------------------- | ------------------------- |
+| `AGENTS` array                     | `EDITORS` array           |
+| `selectAgentTargetPaths()`         | `selectEditors()`         |
+| `detectExistingAgentTargetPaths()` | `detectExistingEditors()` |
+| `writeAgentInstructions()`         | `writeEditorConfigs()`    |
 
 Key difference from agent.ts: Uses JSON merge (via `utils/json.ts`) instead of file copy/append, since IDE configs are structured JSON.