Merge branch 'main' into deps/upstream-update

Author: fengmk2

README.md

@@ -113,6 +113,7 @@ Use `vp migrate` to migrate to Vite+. It merges tool-specific config files such
 
 - **run** - Run monorepo tasks
 - **exec** - Execute a command from local `node_modules/.bin`
+- **node** - Run a Node.js script with the resolved Vite+ environment
 - **dlx** - Execute a package binary without installing it as a dependency
 - **cache** - Manage the task cache
 
@@ -124,7 +125,7 @@ Use `vp migrate` to migrate to Vite+. It merges tool-specific config files such
 
 #### Manage Dependencies
 
-Vite+ automatically wraps your package manager (pnpm, npm, or Yarn) based on `packageManager` and lockfiles:
+Vite+ automatically wraps your package manager (pnpm, npm, Yarn, or Bun) based on `packageManager` and lockfiles:
 
 - **add** - Add packages to dependencies
 - **remove** (`rm`, `un`, `uninstall`) - Remove packages from dependencies
@@ -135,6 +136,7 @@ Vite+ automatically wraps your package manager (pnpm, npm, or Yarn) based on `pa
 - **why** (`explain`) - Show why a package is installed
 - **info** (`view`, `show`) - View package metadata from the registry
 - **link** (`ln`) / **unlink** - Manage local package links
+- **rebuild** - Rebuild native modules
 - **pm** - Forward a command to the package manager
 
 #### Maintain

crates/vite_migration/src/vite_config.rs

@@ -291,19 +291,25 @@ fn strip_schema_property(config: &str) -> Cow<'_, str> {
 /// duplicate keys are resolved at runtime by JS spread semantics.
 ///
 /// Returns `true` only when the key appears as a **direct** member of one of
-/// those recognized object literals. Comments, string occurrences, nested
-/// keys (e.g. `plugins: [{ fmt: ... }]`), and unrelated objects are all
-/// ignored correctly.
+/// those recognized object literals, either as a `key: value` pair or as a
+/// `{ key }` shorthand property (e.g. a template wiring in tooling config with
+/// `fmt,` / `lint,`). Comments, string occurrences, nested keys (e.g.
+/// `plugins: [{ fmt: ... }]`), and unrelated objects are all ignored correctly.
 pub fn has_config_key(vite_config_content: &str, config_key: &str) -> Result<bool, Error> {
     let grep = SupportLang::TypeScript.ast_grep(vite_config_content);
     let root = grep.root();
 
     for node in root.dfs() {
-        if node.kind() != "pair" {
-            continue;
-        }
-        let Some(key_node) = node.field("key") else { continue };
-        if !pair_key_matches(&key_node, config_key) {
+        // Match both `key: value` pairs and `{ key }` shorthand properties. A
+        // custom template that wires tooling config in via shorthand (`fmt,` /
+        // `lint,`) still declares the key, so it must not get a duplicate
+        // inline key injected by `vp create` / `vp lint --init`. See #1836.
+        let matches_key = match node.kind().as_ref() {
+            "pair" => node.field("key").is_some_and(|key| pair_key_matches(&key, config_key)),
+            "shorthand_property_identifier" => node.text() == config_key,
+            _ => continue,
+        };
+        if !matches_key {
             continue;
         }
         let Some(parent_object) = node.parent() else { continue };
@@ -1062,6 +1068,58 @@ export default () =>
         assert!(has_config_key(cfg, "fmt").unwrap());
     }
 
+    #[test]
+    fn test_has_config_key_shorthand_property() {
+        // A custom template that keeps tooling config in separate modules wires
+        // them in with shorthand properties (`fmt,` / `lint,`). The key is
+        // present even though there is no explicit value, so `vp create` /
+        // `vp lint --init` must not inject a duplicate inline key. See #1836.
+        let cfg = r#"import { defineConfig } from 'vite-plus';
+
+import { fmt } from './tooling/format';
+import { lint } from './tooling/lint';
+
+export default defineConfig(({ mode }) => {
+  return {
+    server: { port: 3000 },
+    fmt,
+    lint,
+  };
+});
+"#;
+        assert!(has_config_key(cfg, "fmt").unwrap());
+        assert!(has_config_key(cfg, "lint").unwrap());
+        assert!(!has_config_key(cfg, "pack").unwrap());
+        assert!(!has_config_key(cfg, "staged").unwrap());
+    }
+
+    #[test]
+    fn test_has_config_key_shorthand_object_export() {
+        let cfg = r#"import { defineConfig } from 'vite-plus';
+
+const fmt = { singleQuote: true };
+
+export default defineConfig({
+  fmt,
+});
+"#;
+        assert!(has_config_key(cfg, "fmt").unwrap());
+        assert!(!has_config_key(cfg, "lint").unwrap());
+    }
+
+    #[test]
+    fn test_has_config_key_ignores_nested_shorthand() {
+        // `fmt` shorthand is nested inside a plugin's options object, not a
+        // top-level config key, so it must not count as present.
+        let cfg = r#"import { defineConfig } from 'vite-plus';
+
+export default defineConfig({
+  plugins: [somePlugin({ fmt })],
+});
+"#;
+        assert!(!has_config_key(cfg, "fmt").unwrap());
+    }
+
     #[test]
     fn test_has_config_key_fate_template_shape() {
         // Mirrors create-fate's drizzle template — the bug that motivated this fix.

docs/guide/commit-hooks.md

@@ -22,8 +22,17 @@ If you use [`vp create`](/guide/create) or [`vp migrate`](/guide/migrate), Vite+
 ```bash
 vp config
 vp config --hooks-dir .vite-hooks
+vp config --no-hooks
+vp config --no-agent
 ```
 
+Use `--no-hooks` when you want `vp config` to leave existing Git hook setup unchanged. Use
+`--no-agent` when you want it to skip updates to existing coding agent instruction files. You
+can pass both flags when you want `vp config` to skip both setup steps.
+
+You can also set `VITE_GIT_HOOKS=0` to disable hook installation from lifecycle scripts such as
+`prepare` or `postinstall`.
+
 ### `vp staged`
 
 `vp staged` runs staged-file checks using the `staged` config from `vite.config.ts`. If you set up Vite+ to handle your commit hooks, it will automatically run when you commit your local changes.

docs/guide/index.md

@@ -104,10 +104,11 @@ Vite+ can handle the entire local frontend development cycle from starting a pro
 ### Execute
 
 - [`vp run`](/guide/run) runs tasks across workspaces with caching.
-- [`vp cache clean`](/guide/cache) clears task cache entries.
-- [`vpx`](/guide/vpx) downloads and runs binaries globally.
 - [`vp exec`](/guide/vpx) runs local project binaries.
+- [`vp node`](/guide/env) runs Node.js scripts with the resolved Vite+ environment.
 - [`vp dlx`](/guide/vpx) downloads and runs package binaries without adding them as dependencies.
+- [`vp cache clean`](/guide/cache) clears task cache entries.
+- [`vpx`](/guide/vpx) downloads and runs binaries globally.
 
 ### Build
 
@@ -117,7 +118,8 @@ Vite+ can handle the entire local frontend development cycle from starting a pro
 
 ### Manage Dependencies
 
-- [`vp add`](/guide/install), [`vp remove`](/guide/install), [`vp update`](/guide/install), [`vp dedupe`](/guide/install), [`vp outdated`](/guide/install), [`vp why`](/guide/install), and [`vp info`](/guide/install) wrap package-manager workflows.
+- [`vp add`](/guide/install), [`vp remove`](/guide/install), [`vp update`](/guide/install), [`vp dedupe`](/guide/install), [`vp outdated`](/guide/install), [`vp list`](/guide/install), [`vp why`](/guide/install), and [`vp info`](/guide/install) wrap package-manager workflows.
+- [`vp link`](/guide/install), [`vp unlink`](/guide/install), and [`vp rebuild`](/guide/install) cover local package links and native module rebuilds.
 - [`vp pm <command>`](/guide/install) calls other package manager commands directly.
 
 ### Maintain

docs/guide/upgrade.md

@@ -14,8 +14,10 @@ You can upgrade both of them independently.
 ## Global `vp`
 
 ```bash
-vp upgrade              # upgrade to the latest version
-vp upgrade --check      # check for updates without installing
+vp upgrade                        # upgrade to the latest version
+vp upgrade --check                # check for updates without installing
+vp upgrade <version>              # install a specific version
+vp upgrade --registry <registry>  # use a custom npm registry
 ```
 
 ### Rollback

packages/cli/README.md

@@ -3,7 +3,7 @@
 **The Unified Toolchain for the Web**
 _runtime and package management, create, dev, check, test, build, pack, and monorepo task caching in a single dependency_
 
-This package provides the project-local version of Vite+. The global `vite` command automatically delegates to this package for all project-specific tasks.
+This package provides the project-local version of Vite+. The global `vp` command automatically delegates to this package for all project-specific tasks.
 
 ---
 
@@ -111,6 +111,7 @@ Use `vp migrate` to migrate to Vite+. It merges tool-specific config files such
 
 - **run** - Run monorepo tasks
 - **exec** - Execute a command from local `node_modules/.bin`
+- **node** - Run a Node.js script with the resolved Vite+ environment
 - **dlx** - Execute a package binary without installing it as a dependency
 - **cache** - Manage the task cache
 
@@ -122,7 +123,7 @@ Use `vp migrate` to migrate to Vite+. It merges tool-specific config files such
 
 #### Manage Dependencies
 
-Vite+ automatically wraps your package manager (pnpm, npm, or Yarn) based on `packageManager` and lockfiles:
+Vite+ automatically wraps your package manager (pnpm, npm, Yarn, or Bun) based on `packageManager` and lockfiles:
 
 - **add** - Add packages to dependencies
 - **remove** (`rm`, `un`, `uninstall`) - Remove packages from dependencies
@@ -133,6 +134,7 @@ Vite+ automatically wraps your package manager (pnpm, npm, or Yarn) based on `pa
 - **why** (`explain`) - Show why a package is installed
 - **info** (`view`, `show`) - View package metadata from the registry
 - **link** (`ln`) / **unlink** - Manage local package links
+- **rebuild** - Rebuild native modules
 - **pm** - Forward a command to the package manager
 
 #### Maintain

packages/cli/snap-tests-global/command-config-custom-dir-hook-path/snap.txt

@@ -1,5 +1,5 @@
 > git init
-> vp config --hooks-only --hooks-dir .config/husky
+> vp config --no-agent --hooks-dir .config/husky
 > mkdir -p node_modules/.bin && printf '#!/usr/bin/env sh\necho hook-path-ok' > node_modules/.bin/test-hook-cmd && chmod +x node_modules/.bin/test-hook-cmd
 > mkdir -p .config/husky && printf 'test-hook-cmd\n' > .config/husky/pre-commit
 > echo test > file.txt && git add file.txt

packages/cli/snap-tests-global/command-config-custom-dir-hook-path/steps.json

@@ -1,7 +1,7 @@
 {
   "commands": [
     { "command": "git init", "ignoreOutput": true },
-    { "command": "vp config --hooks-only --hooks-dir .config/husky", "ignoreOutput": true },
+    { "command": "vp config --no-agent --hooks-dir .config/husky", "ignoreOutput": true },
     {
       "command": "mkdir -p node_modules/.bin && printf '#!/usr/bin/env sh\\necho hook-path-ok' > node_modules/.bin/test-hook-cmd && chmod +x node_modules/.bin/test-hook-cmd",
       "ignoreOutput": true

packages/cli/snap-tests-global/command-config-help/snap.txt

@@ -5,6 +5,8 @@ Configure Vite+ for the current project (hooks + agent integration).
 
 Options:
   --hooks-dir <path>  Custom hooks directory (default: .vite-hooks)
+  --no-hooks          Skip hook installation
+  --no-agent          Skip updating coding agent instructions
   -h, --help          Show this help message
 
 Environment:
@@ -20,6 +22,8 @@ Configure Vite+ for the current project (hooks + agent integration).
 
 Options:
   --hooks-dir <path>  Custom hooks directory (default: .vite-hooks)
+  --no-hooks          Skip hook installation
+  --no-agent          Skip updating coding agent instructions
   -h, --help          Show this help message
 
 Environment:
@@ -35,6 +39,8 @@ Configure Vite+ for the current project (hooks + agent integration).
 
 Options:
   --hooks-dir <path>  Custom hooks directory (default: .vite-hooks)
+  --no-hooks          Skip hook installation
+  --no-agent          Skip updating coding agent instructions
   -h, --help          Show this help message
 
 Environment:

packages/cli/snap-tests-global/command-config-no-agent/AGENTS.md

@@ -0,0 +1,11 @@
+# My Project
+
+Custom instructions here.
+
+<!--VITE PLUS START-->
+
+OUTDATED CONTENT THAT SHOULD NOT BE REPLACED
+
+<!--VITE PLUS END-->
+
+More custom content below.