Merge branch 'main' into 4-12_add-team

Author: mdong1909

.github/workflows/ci.yml

@@ -121,6 +121,13 @@ jobs:
       # Pin Rust tooling paths to avoid $HOME mismatch issues.
       CARGO_HOME: /root/.cargo
       RUSTUP_HOME: /root/.rustup
+      # `-crt-static`: vite-task's `fspy_preload_unix` cdylib (unconditional
+      # build-dep since voidzero-dev/vite-task#344) can't link against a
+      # static musl libc. vite+ ships as a NAPI module that links musl libc
+      # dynamically anyway, so matching here is correct.
+      # Must mirror `.cargo/config.toml` rustflags — RUSTFLAGS env overrides
+      # both [build] and [target.*] levels.
+      RUSTFLAGS: --cfg tokio_unstable -C link-args=-Wl,--warn-unresolved-symbols -C target-feature=-crt-static
     steps:
       - name: Install Alpine dependencies
         shell: sh {0}

Cargo.lock

@@ -89,7 +89,7 @@ dunce = "1.0.5"
 fast-glob = "1.0.0"
 flate2 = { version = "=1.1.9", features = ["zlib-rs"] }
 form_urlencoded = "1.2.1"
-fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "954cd3bead71be4ddc1e3183110d713bbe26286b" }
+fspy = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "c45e5e72d3a17b850310128480e92d3e332c2d5a" }
 futures = "0.3.31"
 futures-util = "0.3.31"
 glob = "0.3.2"
@@ -194,16 +194,16 @@ vfs = "0.13.0"
 vite_command = { path = "crates/vite_command" }
 vite_error = { path = "crates/vite_error" }
 vite_js_runtime = { path = "crates/vite_js_runtime" }
-vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "954cd3bead71be4ddc1e3183110d713bbe26286b" }
+vite_glob = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "c45e5e72d3a17b850310128480e92d3e332c2d5a" }
 vite_install = { path = "crates/vite_install" }
 vite_migration = { path = "crates/vite_migration" }
 vite_setup = { path = "crates/vite_setup" }
 vite_shared = { path = "crates/vite_shared" }
 vite_static_config = { path = "crates/vite_static_config" }
-vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "954cd3bead71be4ddc1e3183110d713bbe26286b" }
-vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "954cd3bead71be4ddc1e3183110d713bbe26286b" }
-vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "954cd3bead71be4ddc1e3183110d713bbe26286b" }
-vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "954cd3bead71be4ddc1e3183110d713bbe26286b" }
+vite_path = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "c45e5e72d3a17b850310128480e92d3e332c2d5a" }
+vite_str = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "c45e5e72d3a17b850310128480e92d3e332c2d5a" }
+vite_task = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "c45e5e72d3a17b850310128480e92d3e332c2d5a" }
+vite_workspace = { git = "https://github.com/voidzero-dev/vite-task.git", rev = "c45e5e72d3a17b850310128480e92d3e332c2d5a" }
 walkdir = "2.5.0"
 wax = "0.6.0"
 which = "8.0.0"

Cargo.toml

@@ -4,8 +4,10 @@
 // This enables IDE extensions (e.g., oxc-vscode) to discover and start the LSP server.
 // Binary resolution follows the same approach as `src/resolve-fmt.ts`.
 
-if (!process.argv.includes('--lsp')) {
-  console.error('This oxfmt wrapper is for IDE extension use only (--lsp mode).');
+const isLSP = process.argv.includes('--lsp');
+const isStdin = process.argv.some((arg) => arg.startsWith('--stdin-filepath'));
+if (!isLSP && !isStdin) {
+  console.error('This oxfmt wrapper is for IDE extension use only (lsp or stdin mode).');
   console.error('To format your code, run: vp fmt');
   process.exit(1);
 }

packages/cli/bin/oxfmt

@@ -1,12 +1,52 @@
 [1]> node ../node_modules/vite-plus/bin/oxfmt # should reject non-LSP usage
-This oxfmt wrapper is for IDE extension use only (--lsp mode).
+This oxfmt wrapper is for IDE extension use only (lsp or stdin mode).
 To format your code, run: vp fmt
 
 [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).
+This oxfmt wrapper is for IDE extension use only (lsp or stdin mode).
 To format your code, run: vp fmt
 
-> node ../node_modules/vite-plus/bin/oxfmt --lsp --help # should exercise import path
+> node ../node_modules/vite-plus/bin/oxfmt --lsp --help # should allow LSP mode
+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
+
+
+> node ../node_modules/vite-plus/bin/oxfmt --stdin-filepath=a.ts --help # should allow Stdin mode
 Usage: [-c=PATH] [PATH]...
 
 Mode Options:

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

@@ -2,6 +2,7 @@
   "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"
+    "node ../node_modules/vite-plus/bin/oxfmt --lsp --help # should allow LSP mode",
+    "node ../node_modules/vite-plus/bin/oxfmt --stdin-filepath=a.ts --help # should allow Stdin mode"
   ]
 }