Merge branch 'main' into ship-docs

Author: fengmk2

packages/cli/snap-tests-todo/test-panicked-fix/snap.txt

@@ -24,6 +24,7 @@ Output Options:
 Config Options
     -c, --config=PATH        Path to the configuration file (.json, .jsonc, .ts, .mts, .cts, .js,
                              .mjs, .cjs)
+        --disable-nested-config  Do not search for configuration files in subdirectories
 
 Ignore Options
         --ignore-path=PATH   Path to ignore file(s). Can be specified multiple times. If not
@@ -64,6 +65,7 @@ Output Options:
 Config Options
     -c, --config=PATH        Path to the configuration file (.json, .jsonc, .ts, .mts, .cts, .js,
                              .mjs, .cjs)
+        --disable-nested-config  Do not search for configuration files in subdirectories
 
 Ignore Options
         --ignore-path=PATH   Path to ignore file(s). Can be specified multiple times. If not

packages/cli/snap-tests/bin-oxfmt-wrapper/snap.txt

@@ -95,6 +95,7 @@ Output Options:
 Config Options
     -c, --config=PATH        Path to the configuration file (.json, .jsonc, .ts, .mts, .cts, .js,
                              .mjs, .cjs)
+        --disable-nested-config  Do not search for configuration files in subdirectories
 
 Ignore Options
         --ignore-path=PATH   Path to ignore file(s). Can be specified multiple times. If not
@@ -234,7 +235,7 @@ Options:
   --assetsInlineLimit <number>  [number] static asset base64 inline threshold in bytes (default: 4096) 
   --ssr [entry]                 [string] build specified entry for server-side rendering 
   --sourcemap [output]          [boolean | "inline" | "hidden"] output source maps for build (default: false) 
-  --minify [minifier]           [boolean | "terser" | "esbuild"] enable/disable minification, or specify minifier to use (default: esbuild) 
+  --minify [minifier]           [boolean | "oxc" | "terser" | "esbuild"] enable/disable minification, or specify minifier to use (default: oxc) 
   --manifest [name]             [boolean | string] emit build manifest json 
   --ssrManifest [name]          [boolean | string] emit ssr manifest json 
   --emptyOutDir                 [boolean] force empty outDir when it's outside of root 
@@ -293,7 +294,7 @@ Options:
   --api [port]                                               Specify server port. Note if the port is already being used, Vite will automatically try the next available port so this may not be the actual port the server ends up listening on. If true will be set to 51204. Use '--help --api' for more info. 
   --silent [value]                                           Silent console output from tests. Use 'passed-only' to see logs from failing tests only. 
   --hideSkippedTests                                         Hide logs for skipped tests 
-  --reporter <name>                                          Specify reporters (default, agent, blob, verbose, dot, json, tap, tap-flat, junit, tree, hanging-process, github-actions) 
+  --reporter <name>                                          Specify reporters (default, agent, minimal, blob, verbose, dot, json, tap, tap-flat, junit, tree, hanging-process, github-actions) 
   --outputFile <filename/-s>                                 Write test results to a file when supporter reporter is also specified, use cac's dot notation for individual outputs of multiple reporters (example: --outputFile.tap=./tap.txt) 
   --coverage                                                 Enable coverage report. Use '--help --coverage' for more info. 
   --mode <name>                                              Override Vite mode (default: test or benchmark) 

packages/cli/snap-tests/command-helper/snap.txt

@@ -0,0 +1,21 @@
+> vp lint --help | head -n 20 # print help message and no panicked
+Usage: [-c=<./.oxlintrc.json>] [PATH]...
+
+Basic Configuration
+    -c, --config=<./.oxlintrc.json>  Oxlint configuration file
+                              * `.json` and `.jsonc` config files are supported in all runtimes
+                              * JavaScript/TypeScript config files are experimental and require
+                              running via Node.js
+                              * you can use comments in configuration files.
+                              * tries to be compatible with ESLint v8's format
+        --tsconfig=<./tsconfig.json>  Override the TypeScript config used for import resolution.
+                              Oxlint automatically discovers the relevant `tsconfig.json` for each
+                              file. Use this only when your project uses a non-standard tsconfig
+                              name or location.
+        --init                Initialize oxlint configuration with default values
+
+Allowing / Denying Multiple Lints
+   Accumulate rules and categories from left to right on the command-line.
+   For example `-D correctness -A no-debugger` or `-A all -D no-debugger`.
+   The categories are:
+   * `correctness` - Code that is outright wrong or useless (default)

…ests-todo/test-panicked-fix/package.json …nap-tests/test-panicked-fix/package.jsonpackages/cli/snap-tests-todo/test-panicked-fix/package.json renamed to packages/cli/snap-tests/test-panicked-fix/package.json packages/cli/snap-tests-todo/test-panicked-fix/package.json renamed to packages/cli/snap-tests/test-panicked-fix/package.json

@@ -1,4 +1,3 @@
 {
-  "ignoredPlatforms": ["win32"],
   "commands": ["vp lint --help | head -n 20 # print help message and no panicked"]
 }

packages/cli/snap-tests/test-panicked-fix/snap.txt

@@ -20,7 +20,7 @@ import {
   selectAgentTargetPaths,
   writeAgentInstructions,
 } from '../utils/agent.ts';
-import { detectExistingEditor, selectEditor, writeEditorConfigs } from '../utils/editor.ts';
+import { detectExistingEditors, selectEditors, writeEditorConfigs } from '../utils/editor.ts';
 import { renderCliDoc } from '../utils/help.ts';
 import { displayRelative } from '../utils/path.ts';
 import {
@@ -438,7 +438,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
   let selectedTemplateName = templateName as string;
   let selectedTemplateArgs = [...templateArgs];
   let selectedAgentTargetPaths: string[] | undefined;
-  let selectedEditor: Awaited<ReturnType<typeof selectEditor>>;
+  let selectedEditors: Awaited<ReturnType<typeof selectEditors>>;
   let selectedParentDir: string | undefined;
   let remoteTargetDir: string | undefined;
   let shouldSetupHooks = false;
@@ -678,13 +678,13 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
           onCancel: () => cancelAndExit(),
         });
 
-  const existingEditor =
+  const existingEditors =
     options.editor || !options.interactive
       ? undefined
-      : detectExistingEditor(workspaceInfoOptional.rootDir);
-  selectedEditor =
-    existingEditor ??
-    (await selectEditor({
+      : detectExistingEditors(workspaceInfoOptional.rootDir);
+  selectedEditors =
+    existingEditors ??
+    (await selectEditors({
       interactive: options.interactive,
       editor: options.editor,
       onCancel: () => cancelAndExit(),
@@ -796,7 +796,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
     pauseCreateProgress();
     await writeEditorConfigs({
       projectRoot: fullPath,
-      editorId: selectedEditor,
+      editorId: selectedEditors,
       interactive: options.interactive,
       silent: compactOutput,
       extraVsCodeSettings: { 'npm.scriptRunner': 'vp' },
@@ -886,7 +886,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
   pauseCreateProgress();
   await writeEditorConfigs({
     projectRoot: fullPath,
-    editorId: selectedEditor,
+    editorId: selectedEditors,
     interactive: options.interactive,
     silent: compactOutput,
     extraVsCodeSettings: { 'npm.scriptRunner': 'vp' },

…-tests-todo/test-panicked-fix/steps.json …/snap-tests/test-panicked-fix/steps.jsonpackages/cli/snap-tests-todo/test-panicked-fix/steps.json renamed to packages/cli/snap-tests/test-panicked-fix/steps.json packages/cli/snap-tests-todo/test-panicked-fix/steps.json renamed to packages/cli/snap-tests/test-panicked-fix/steps.json

@@ -2,9 +2,10 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
-import { afterEach, describe, expect, it } from 'vitest';
+import * as prompts from '@voidzero-dev/vite-plus-prompts';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import { writeEditorConfigs } from '../editor.js';
+import { detectExistingEditors, selectEditors, writeEditorConfigs } from '../editor.js';
 
 const tempDirs: string[] = [];
 
@@ -15,11 +16,82 @@ function createTempDir() {
 }
 
 afterEach(() => {
+  vi.restoreAllMocks();
   for (const dir of tempDirs.splice(0, tempDirs.length)) {
     fs.rmSync(dir, { recursive: true, force: true });
   }
 });
 
+describe('selectEditors', () => {
+  it('prompts with editor config targets and supports multiple selections', async () => {
+    const multiselectSpy = vi.spyOn(prompts, 'multiselect').mockResolvedValue(['vscode', 'zed']);
+
+    await expect(
+      selectEditors({
+        interactive: true,
+        onCancel: vi.fn(),
+      }),
+    ).resolves.toEqual(['vscode', 'zed']);
+
+    expect(multiselectSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        message: expect.stringContaining('Which editors are you using?'),
+        initialValues: ['vscode'],
+        required: false,
+        options: expect.arrayContaining([
+          expect.objectContaining({
+            label: 'VSCode',
+            value: 'vscode',
+            hint: '.vscode',
+          }),
+          expect.objectContaining({
+            label: 'Zed',
+            value: 'zed',
+            hint: '.zed',
+          }),
+        ]),
+      }),
+    );
+  });
+
+  it('skips editor config selection when no editors are selected', async () => {
+    vi.spyOn(prompts, 'multiselect').mockResolvedValue([]);
+
+    await expect(
+      selectEditors({
+        interactive: true,
+        onCancel: vi.fn(),
+      }),
+    ).resolves.toBeUndefined();
+  });
+
+  it('keeps explicit --editor selection as a single editor', async () => {
+    await expect(
+      selectEditors({
+        interactive: false,
+        editor: 'zed',
+        onCancel: vi.fn(),
+      }),
+    ).resolves.toEqual(['zed']);
+  });
+});
+
+describe('detectExistingEditors', () => {
+  it('detects multiple existing editor config directories', () => {
+    const projectRoot = createTempDir();
+    fs.mkdirSync(path.join(projectRoot, '.vscode'), { recursive: true });
+    fs.mkdirSync(path.join(projectRoot, '.zed'), { recursive: true });
+    fs.writeFileSync(path.join(projectRoot, '.vscode', 'settings.json'), '{}');
+    fs.writeFileSync(path.join(projectRoot, '.zed', 'settings.json'), '{}');
+
+    expect(detectExistingEditors(projectRoot)).toEqual(['vscode', 'zed']);
+  });
+
+  it('returns undefined when no editor config files exist', () => {
+    expect(detectExistingEditors(createTempDir())).toBeUndefined();
+  });
+});
+
 describe('writeEditorConfigs', () => {
   it('writes vscode settings that align formatter config with vite.config.ts', async () => {
     const projectRoot = createTempDir();
@@ -177,4 +249,31 @@ describe('writeEditorConfigs', () => {
       './vite.config.ts',
     );
   });
+
+  it('writes multiple editor configs in one call', async () => {
+    const projectRoot = createTempDir();
+
+    await writeEditorConfigs({
+      projectRoot,
+      editorId: ['vscode', 'zed'],
+      interactive: false,
+      silent: true,
+      extraVsCodeSettings: { 'npm.scriptRunner': 'vp' },
+    });
+
+    const vscodeSettings = JSON.parse(
+      fs.readFileSync(path.join(projectRoot, '.vscode', 'settings.json'), 'utf8'),
+    ) as Record<string, unknown>;
+    const vscodeExtensions = JSON.parse(
+      fs.readFileSync(path.join(projectRoot, '.vscode', 'extensions.json'), 'utf8'),
+    ) as Record<string, unknown>;
+    const zedSettings = JSON.parse(
+      fs.readFileSync(path.join(projectRoot, '.zed', 'settings.json'), 'utf8'),
+    ) as Record<string, unknown>;
+
+    expect(vscodeSettings['npm.scriptRunner']).toBe('vp');
+    expect(vscodeExtensions.recommendations).toContain('VoidZero.vite-plus-extension-pack');
+    expect(zedSettings['npm.scriptRunner']).toBeUndefined();
+    expect(zedSettings.lsp).toBeDefined();
+  });
 });