Merge branch 'main' into fix-bug-831

Author: fengmk2

.github/renovate.json

@@ -5,6 +5,25 @@
     "packages/cli/snap-tests/**",
     "packages/cli/snap-tests-global/**",
     "packages/cli/snap-tests-todo/**",
-    "bench/fixtures/**"
+    "bench/fixtures/**",
+    "rolldown/**",
+    "rolldown-vite/**"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": ["vitest-dev"],
+      "enabled": false
+    },
+    {
+      "matchPackageNames": [
+        "fspy",
+        "vite_glob",
+        "vite_path",
+        "vite_str",
+        "vite_task",
+        "vite_workspace"
+      ],
+      "enabled": false
+    }
   ]
 }

.github/workflows/ci.yml

@@ -70,16 +70,21 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: ./.github/actions/clone
 
-      # Disable Windows Defender real-time scanning to speed up I/O-heavy builds (~30-50% faster)
-      - name: Disable Windows Defender
+      - name: Setup Dev Drive
         if: runner.os == 'Windows'
-        shell: powershell
-        run: Set-MpPreference -DisableRealtimeMonitoring $true
+        uses: samypr100/setup-dev-drive@30f0f98ae5636b2b6501e181dfb3631b9974818d # v4.0.0
+        with:
+          drive-size: 12GB
+          drive-format: ReFS
+          env-mapping: |
+            CARGO_HOME,{{ DEV_DRIVE }}/.cargo
+            RUSTUP_HOME,{{ DEV_DRIVE }}/.rustup
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.0
         with:
           save-cache: ${{ github.ref_name == 'main' }}
           cache-key: test
+          target-dir: ${{ runner.os == 'Windows' && format('{0}/target', env.DEV_DRIVE) || '' }}
 
       - run: rustup target add x86_64-unknown-linux-musl
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -181,16 +186,21 @@ jobs:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: ./.github/actions/clone
 
-      # Disable Windows Defender real-time scanning to speed up I/O-heavy builds (~30-50% faster)
-      - name: Disable Windows Defender
+      - name: Setup Dev Drive
         if: runner.os == 'Windows'
-        shell: powershell
-        run: Set-MpPreference -DisableRealtimeMonitoring $true
+        uses: samypr100/setup-dev-drive@30f0f98ae5636b2b6501e181dfb3631b9974818d # v4.0.0
+        with:
+          drive-size: 12GB
+          drive-format: ReFS
+          env-mapping: |
+            CARGO_HOME,{{ DEV_DRIVE }}/.cargo
+            RUSTUP_HOME,{{ DEV_DRIVE }}/.rustup
 
       - uses: oxc-project/setup-rust@d286d43bc1f606abbd98096666ff8be68c8d5f57 # v1.0.0
         with:
           save-cache: ${{ github.ref_name == 'main' }}
           cache-key: cli-e2e-test
+          target-dir: ${{ runner.os == 'Windows' && format('{0}/target', env.DEV_DRIVE) || '' }}
 
       - uses: oxc-project/setup-node@fdbf0dfd334c4e6d56ceeb77d91c76339c2a0885 # v1.0.4
 

crates/vite_global_cli/src/commands/env/doctor.rs

@@ -22,7 +22,7 @@ const KNOWN_VERSION_MANAGERS: &[(&str, &str)] = &[
 ];
 
 /// Tools that should have shims
-const SHIM_TOOLS: &[&str] = &["node", "npm", "npx"];
+const SHIM_TOOLS: &[&str] = &["node", "npm", "npx", "vpx"];
 
 /// Column width for left-side keys in aligned output
 const KEY_WIDTH: usize = 18;

docs/guide/fmt.md

@@ -20,6 +20,14 @@ vp fmt . --write
 
 Put formatting configuration directly in the `fmt` block in `vite.config.ts` so all your configuration stays in one place. We do not recommend using `.oxfmtrc.json` with Vite+.
 
+For editors, point the formatter config path at `./vite.config.ts` so format-on-save uses the same `fmt` block:
+
+```json
+{
+  "oxc.fmt.configPath": "./vite.config.ts"
+}
+```
+
 For the upstream formatter behavior and configuration reference, see the [Oxfmt docs](https://oxc.rs/docs/guide/usage/formatter.html).
 
 ```ts

docs/guide/ide-integration.md

@@ -24,6 +24,7 @@ When you create or migrate a project, Vite+ prompts whether you want editor conf
 ```json
 {
   "editor.defaultFormatter": "oxc.oxc-vscode",
+  "oxc.fmt.configPath": "./vite.config.ts",
   "editor.formatOnSave": true,
   "editor.formatOnSaveMode": "file",
   "editor.codeActionsOnSave": {
@@ -32,4 +33,4 @@ When you create or migrate a project, Vite+ prompts whether you want editor conf
 }
 ```
 
-This gives the project a shared default formatter and enables Oxc-powered fix actions on save. Vite+ uses `formatOnSaveMode: "file"` because Oxfmt does not support partial formatting.
+This gives the project a shared default formatter and enables Oxc-powered fix actions on save. Setting `oxc.fmt.configPath` to `./vite.config.ts` keeps editor format-on-save aligned with the `fmt` block in your Vite+ config. Vite+ uses `formatOnSaveMode: "file"` because Oxfmt does not support partial formatting.

packages/cli/bin/oxfmt

@@ -11,8 +11,9 @@ if (!process.argv.includes('--lsp')) {
 }
 
 import { createRequire } from 'node:module';
+import { pathToFileURL } from 'node:url';
 
 const require = createRequire(import.meta.url);
 const oxfmtBin = require.resolve('oxfmt/bin/oxfmt');
 
-await import(oxfmtBin);
+await import(pathToFileURL(oxfmtBin).href);

packages/cli/bin/oxlint

@@ -12,9 +12,10 @@ if (!process.argv.includes('--lsp')) {
 
 import { createRequire } from 'node:module';
 import { dirname, join } from 'node:path';
+import { pathToFileURL } from 'node:url';
 
 const require = createRequire(import.meta.url);
 const oxlintMainPath = require.resolve('oxlint');
 const oxlintBin = join(dirname(dirname(oxlintMainPath)), 'bin', 'oxlint');
 
-await import(oxlintBin);
+await import(pathToFileURL(oxlintBin).href);

packages/cli/package.json

@@ -1,7 +1,18 @@
 {
   "name": "vite-plus",
   "version": "0.0.0",
+  "description": "The Unified Toolchain for the Web",
+  "homepage": "https://viteplus.dev/guide",
+  "bugs": {
+    "url": "https://github.com/voidzero-dev/vite-plus/issues"
+  },
   "license": "MIT",
+  "author": "VoidZero Inc.",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/voidzero-dev/vite-plus.git",
+    "directory": "packages/cli"
+  },
   "bin": {
     "oxfmt": "./bin/oxfmt",
     "oxlint": "./bin/oxlint",

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

@@ -1,7 +1,47 @@
-[1]> oxfmt # should reject non-LSP usage
+[1]> node ../node_modules/vite-plus/bin/oxfmt # should reject non-LSP usage
 This oxfmt wrapper is for IDE extension use only (--lsp mode).
 To format your code, run: vp fmt
 
-[1]> oxfmt --help # should reject non-LSP usage
+[1]> node ../node_modules/vite-plus/bin/oxfmt --help # should reject non-LSP usage
 This oxfmt wrapper is for IDE extension use only (--lsp mode).
 To format your code, run: vp fmt
+
+> node ../node_modules/vite-plus/bin/oxfmt --lsp --help # should exercise import path
+Usage: [-c=PATH] [PATH]...
+
+Mode Options:
+        --init               Initialize `.oxfmtrc.json` with default values
+        --migrate=SOURCE     Migrate configuration to `.oxfmtrc.json` from specified source
+                             Available sources: prettier, biome
+        --lsp                Start language server protocol (LSP) server
+        --stdin-filepath=PATH  Specify the file name to use to infer which parser to use
+
+Output Options:
+        --write              Format and write files in place (default)
+        --check              Check if files are formatted, also show statistics
+        --list-different     List files that would be changed
+
+Config Options
+    -c, --config=PATH        Path to the configuration file (.json, .jsonc, .ts, .mts, .cts, .js,
+                             .mjs, .cjs)
+
+Ignore Options
+        --ignore-path=PATH   Path to ignore file(s). Can be specified multiple times. If not
+                             specified, .gitignore and .prettierignore in the current directory are
+                             used.
+        --with-node-modules  Format code in node_modules directory (skipped by default)
+
+Runtime Options
+        --no-error-on-unmatched-pattern  Do not exit with error when pattern is unmatched
+        --threads=INT        Number of threads to use. Set to 1 for using only 1 CPU core.
+
+Available positional items:
+    PATH                     Single file, path or list of paths. Glob patterns are also supported.
+                             (Be sure to quote them, otherwise your shell may expand them before
+                             passing.) Exclude patterns with `!` prefix like `'!**/fixtures/*.js'`
+                             are also supported. If not provided, current working directory is used.
+
+Available options:
+    -h, --help               Prints help information
+    -V, --version            Prints version information
+

packages/cli/snap-tests/bin-oxfmt-wrapper/steps.json

@@ -1,4 +1,7 @@
 {
-  "ignoredPlatforms": ["win32"],
-  "commands": ["oxfmt # should reject non-LSP usage", "oxfmt --help # should reject non-LSP usage"]
+  "commands": [
+    "node ../node_modules/vite-plus/bin/oxfmt # should reject non-LSP usage",
+    "node ../node_modules/vite-plus/bin/oxfmt --help # should reject non-LSP usage",
+    "node ../node_modules/vite-plus/bin/oxfmt --lsp --help # should exercise import path"
+  ]
 }