vite-plus 0.1.15 → 0.1.16-alpha.0

package/dist/global/{agent-Dq7R_VUV.js → agent-CTaSZwnH.js}

@@ -3190,15 +3190,16 @@ function detectConfigs(projectPath) {
 		configs.prettierConfig = config;
 		break;
 	}
-	if (!configs.prettierConfig) {
-		const packageJsonPath = path.join(projectPath, "package.json");
-		if (fs.existsSync(packageJsonPath)) try {
-			const content = fs.readFileSync(packageJsonPath, "utf8");
-			if (JSON.parse(content).prettier) configs.prettierConfig = PRETTIER_PACKAGE_JSON_CONFIG;
-		} catch {}
-	}
 	if (fs.existsSync(path.join(projectPath, ".prettierignore"))) configs.prettierIgnore = true;
 	if (fs.existsSync(path.join(projectPath, ".nvmrc"))) configs.nvmrcFile = true;
+	const packageJsonPath = path.join(projectPath, "package.json");
+	if (fs.existsSync(packageJsonPath)) try {
+		const content = fs.readFileSync(packageJsonPath, "utf8");
+		const pkg = JSON.parse(content);
+		if (!configs.prettierConfig && pkg.prettier) configs.prettierConfig = PRETTIER_PACKAGE_JSON_CONFIG;
+		const voltaNode = pkg.volta?.node;
+		if (typeof voltaNode === "string") configs.voltaNode = voltaNode;
+	} catch {}
 	return configs;
 }
 //#endregion
@@ -3815,11 +3816,13 @@ function rewriteBunCatalog(projectPath) {
 	const packageJsonPath = path.join(projectPath, "package.json");
 	if (!fs.existsSync(packageJsonPath)) return;
 	editJsonFile(packageJsonPath, (pkg) => {
-		const catalog = { ...pkg.catalog };
+		const workspacesObj = pkg.workspaces && !Array.isArray(pkg.workspaces) ? pkg.workspaces : void 0;
+		const catalog = { ...workspacesObj?.catalog ?? pkg.catalog };
 		for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) if (!value.startsWith("file:")) catalog[key] = value;
 		if (!VITE_PLUS_VERSION.startsWith("file:")) catalog[VITE_PLUS_NAME] = VITE_PLUS_VERSION;
 		for (const name of REMOVE_PACKAGES) delete catalog[name];
-		pkg.catalog = catalog;
+		if (workspacesObj?.catalog != null) workspacesObj.catalog = catalog;
+		else pkg.catalog = catalog;
 		const overrides = { ...pkg.overrides };
 		for (const key of Object.keys(VITE_PLUS_OVERRIDE_PACKAGES)) overrides[key] = "catalog:";
 		pkg.overrides = overrides;
@@ -3937,6 +3940,14 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 			...pkg.devDependencies,
 			[VITE_PLUS_NAME]: version
 		};
+		const allDeps = {
+			...pkg.dependencies,
+			...pkg.devDependencies
+		};
+		if (!allDeps.vitest && Object.keys(allDeps).some((name) => name.includes("vitest"))) {
+			const ver = VITE_PLUS_OVERRIDE_PACKAGES.vitest;
+			pkg.devDependencies.vitest = supportCatalog && !ver.startsWith("file:") ? "catalog:" : ver;
+		}
 	}
 	return extractedStagedConfig;
 }
@@ -4447,11 +4458,21 @@ function setPackageManager(projectDir, downloadPackageManager) {
 }
 /**
 * Detect a .nvmrc file in the project directory.
+* If not found, check for a Volta node version in package.json.
+* If either is found, return the relevant info for migration.
 * Returns undefined if not found or .node-version already exists.
 */
 function detectNodeVersionManagerFile(projectPath) {
 	if (fs.existsSync(path.join(projectPath, ".node-version"))) return;
-	if (detectConfigs(projectPath).nvmrcFile) return { file: ".nvmrc" };
+	const configs = detectConfigs(projectPath);
+	if (configs.nvmrcFile) return configs.voltaNode ? {
+		file: ".nvmrc",
+		voltaPresent: true
+	} : { file: ".nvmrc" };
+	if (configs.voltaNode) return {
+		file: "package.json",
+		voltaNodeVersion: configs.voltaNode
+	};
 }
 /**
 * Parse a version alias from a .nvmrc file into a .node-version compatible string.
@@ -4469,12 +4490,28 @@ function parseNvmrcVersion(alias) {
 	return normalized;
 }
 /**
-* Migrate .nvmrc to .node-version and remove .nvmrc.
+* Migrate .nvmrc or Volta node version from package.json to .node-version.
+* - For .nvmrc: the source file is removed after migration.
+* - For package.json (Volta): the volta field is left as-is; removal is left to the user's discretion.
 * Returns true on success, false if migration was skipped or failed.
 */
-function migrateNodeVersionManagerFile(projectPath, _detection, report) {
-	const sourcePath = path.join(projectPath, ".nvmrc");
+function migrateNodeVersionManagerFile(projectPath, detection, report) {
 	const nodeVersionPath = path.join(projectPath, ".node-version");
+	if (detection.file === "package.json") {
+		const { voltaNodeVersion } = detection;
+		const resolvedVersion = voltaNodeVersion === "lts" ? "lts/*" : voltaNodeVersion;
+		if (!import_semver.default.valid(resolvedVersion) && resolvedVersion !== "lts/*") {
+			warnMigration(`package.json volta.node "${voltaNodeVersion}" is not an exact version. Pin an exact version (e.g. ${voltaNodeVersion}.0 or run \`volta pin node@${voltaNodeVersion}\`) then re-run migration.`, report);
+			return false;
+		}
+		fs.writeFileSync(nodeVersionPath, `${resolvedVersion}\n`);
+		if (report) {
+			report.manualSteps.push("Remove the \"volta\" field from package.json");
+			report.nodeVersionFileMigrated = true;
+		} else log.info("You can now remove the \"volta\" field from package.json manually.");
+		return true;
+	}
+	const sourcePath = path.join(projectPath, ".nvmrc");
 	const originalAlias = fs.readFileSync(sourcePath, "utf8").split("\n")[0]?.trim() ?? "";
 	const version = parseNvmrcVersion(originalAlias);
 	if (!version) {
@@ -4484,7 +4521,10 @@ function migrateNodeVersionManagerFile(projectPath, _detection, report) {
 	if (version === "lts/*" && (originalAlias === "node" || originalAlias === "stable")) log.info(`"${originalAlias}" in .nvmrc is not a specific version; automatically mapping to "lts/*"`);
 	fs.writeFileSync(nodeVersionPath, `${version}\n`);
 	fs.unlinkSync(sourcePath);
-	if (report) report.nodeVersionFileMigrated = true;
+	if (report) {
+		report.nodeVersionFileMigrated = true;
+		if (detection.voltaPresent) report.manualSteps.push("Remove the \"volta\" field from package.json");
+	} else if (detection.voltaPresent) log.info("You can now remove the \"volta\" field from package.json manually.");
 	return true;
 }
 const AGENT_ALIASES = {

package/dist/global/config.js

@@ -1,4 +1,4 @@
-import { D as promptGitHooks, T as defaultInteractive, d as ensurePreCommitHook, f as hasStagedConfigInViteConfig, i as updateExistingAgentInstructions } from "./agent-Dq7R_VUV.js";
+import { D as promptGitHooks, T as defaultInteractive, d as ensurePreCommitHook, f as hasStagedConfigInViteConfig, i as updateExistingAgentInstructions } from "./agent-CTaSZwnH.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
 import { i as log, t as renderCliDoc } from "./help-HviKaKAU.js";
 import { join } from "node:path";

package/dist/global/create.js

@@ -1,9 +1,9 @@
 import { r as __toESM, t as __commonJSMin } from "./chunk-BoAXSpZd.js";
-import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, G as text, K as Ct, L as cancel, M as displayRelative, N as templatesDir, O as runViteFmt, P as DependencyType, R as confirm, T as defaultInteractive, U as select, V as multiselect, W as spinner, a as writeAgentInstructions, b as rewriteMonorepoProject, k as runViteInstall, n as detectExistingAgentTargetPaths, p as installGitHooks, r as selectAgentTargetPaths, x as rewriteStandaloneProject, y as rewriteMonorepo, z as intro } from "./agent-Dq7R_VUV.js";
+import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, G as text, K as Ct, L as cancel, M as displayRelative, N as templatesDir, O as runViteFmt, P as DependencyType, R as confirm, T as defaultInteractive, U as select, V as multiselect, W as spinner, a as writeAgentInstructions, b as rewriteMonorepoProject, k as runViteInstall, n as detectExistingAgentTargetPaths, p as installGitHooks, r as selectAgentTargetPaths, x as rewriteStandaloneProject, y as rewriteMonorepo, z as intro } from "./agent-CTaSZwnH.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
 import { c as readJsonFile, o as editJsonFile, t as checkNpmPackageExists } from "./package-2ArHHFnA.js";
 import { a as muted, i as log$1, n as accent, o as success, t as renderCliDoc } from "./help-HviKaKAU.js";
-import { a as detectExistingEditor, n as updatePackageJsonWithDeps, o as selectEditor, r as updateWorkspaceConfig, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-BCuLuHte.js";
+import { a as detectExistingEditor, n as updatePackageJsonWithDeps, o as selectEditor, r as updateWorkspaceConfig, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-jYbI79UA.js";
 import path from "node:path";
 import { styleText } from "node:util";
 import color from "picocolors";
@@ -218,11 +218,11 @@ function discoverTemplate(templateName, templateArgs, workspaceInfo, interactive
 * This follows the same convention as `npm create` / `pnpm create`:
 * - `vite` → `create-vite`
 * - `vite@latest` → `create-vite@latest`
-* - `@tanstack/start` → `@tanstack/create-start`
-* - `@tanstack/start@latest` → `@tanstack/create-start@latest`
 *
 * Special cases for packages where the convention doesn't work:
 * - `nitro` → `create-nitro-app` (create-nitro is abandoned)
+* - `svelte` → `sv`
+* - `@tanstack/start` → `@tanstack/cli` (@tanstack/create-start is deprecated)
 *
 * Skips expansion for:
 * - Builtin templates (`vite:*`)
@@ -246,6 +246,7 @@ function expandCreateShorthand(templateName) {
 		const name = atIndex === -1 ? rest : rest.slice(0, atIndex);
 		const version = atIndex === -1 ? "" : rest.slice(atIndex);
 		if (name.startsWith("create-")) return templateName;
+		if (scope === "@tanstack" && name === "start") return `@tanstack/cli${version}`;
 		return `${scope}/create-${name}${version}`;
 	}
 	const atIndex = templateName.indexOf("@");
@@ -3490,7 +3491,8 @@ function autoFixRemoteTemplateCommand(templateInfo, workspaceInfo) {
 	if (packageName === "create-vite") {
 		templateInfo.args.push("--no-immediate");
 		templateInfo.args.push("--no-rolldown");
-	} else if (packageName === "@tanstack/create-start") {
+	} else if (packageName === "@tanstack/cli") {
+		if (templateInfo.args[0] !== "create") templateInfo.args.unshift("create");
 		templateInfo.args.push("--no-install");
 		templateInfo.args.push("--no-toolchain");
 	} else if (packageName === "sv") {
@@ -3499,7 +3501,7 @@ function autoFixRemoteTemplateCommand(templateInfo, workspaceInfo) {
 	}
 	if (workspaceInfo.isMonorepo) {
 		if (packageName === "create-nuxt") templateInfo.args.push("--no-gitInit");
-		else if (packageName === "@tanstack/create-start") templateInfo.args.push("--no-git");
+		else if (packageName === "@tanstack/cli") templateInfo.args.push("--no-git");
 	}
 }
 //#endregion
@@ -3780,7 +3782,7 @@ const listTemplatesMessage = renderCliDoc({
 				},
 				{
 					label: "@tanstack/start",
-					description: "TanStack applications (@tanstack/create-start)"
+					description: "TanStack applications (@tanstack/cli create)"
 				},
 				{
 					label: "next-app",
@@ -3809,7 +3811,7 @@ const listTemplatesMessage = renderCliDoc({
 			lines: [
 				`  ${accent("vp create")} ${muted("# interactive mode")}`,
 				`  ${accent("vp create vite")} ${muted("# shorthand for create-vite")}`,
-				`  ${accent("vp create @tanstack/start")} ${muted("# shorthand for @tanstack/create-start")}`,
+				`  ${accent("vp create @tanstack/start")} ${muted("# shorthand for @tanstack/cli create")}`,
 				`  ${accent("vp create <template> -- <options>")} ${muted("# pass options to the template")}`
 			]
 		},

package/dist/global/migrate.js

@@ -1,10 +1,10 @@
 import { r as __toESM } from "./chunk-BoAXSpZd.js";
-import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, H as outro, I as require_semver, K as Ct, M as displayRelative, R as confirm, T as defaultInteractive, U as select, W as spinner, _ as migratePrettierToOxfmt, a as writeAgentInstructions, c as detectEslintProject, g as migrateNodeVersionManagerFile, h as migrateEslintToOxlint, j as upgradeYarn, k as runViteInstall, l as detectNodeVersionManagerFile, m as mergeViteConfigFiles, n as detectExistingAgentTargetPaths, o as checkViteVersion, p as installGitHooks, r as selectAgentTargetPaths, s as checkVitestVersion, t as detectAgentConflicts, u as detectPrettierProject, v as preflightGitHooksSetup, w as cancelAndExit, x as rewriteStandaloneProject, y as rewriteMonorepo } from "./agent-Dq7R_VUV.js";
+import { A as selectPackageManager, B as log, D as promptGitHooks, E as downloadPackageManager$1, F as PackageManager, H as outro, I as require_semver, K as Ct, M as displayRelative, R as confirm, T as defaultInteractive, U as select, W as spinner, _ as migratePrettierToOxfmt, a as writeAgentInstructions, c as detectEslintProject, g as migrateNodeVersionManagerFile, h as migrateEslintToOxlint, j as upgradeYarn, k as runViteInstall, l as detectNodeVersionManagerFile, m as mergeViteConfigFiles, n as detectExistingAgentTargetPaths, o as checkViteVersion, p as installGitHooks, r as selectAgentTargetPaths, s as checkVitestVersion, t as detectAgentConflicts, u as detectPrettierProject, v as preflightGitHooksSetup, w as cancelAndExit, x as rewriteStandaloneProject, y as rewriteMonorepo } from "./agent-CTaSZwnH.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
 import { _ as isForceOverrideMode, a as readNearestPackageJson, i as hasVitePlusDependency } from "./package-2ArHHFnA.js";
 import { a as muted, i as log$1, n as accent, t as renderCliDoc } from "./help-HviKaKAU.js";
 import { r as createMigrationReport } from "./report-DGaKL5VQ.js";
-import { i as detectEditorConflicts, o as selectEditor, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-BCuLuHte.js";
+import { i as detectEditorConflicts, o as selectEditor, s as writeEditorConfigs, t as detectWorkspace$1 } from "./workspace-jYbI79UA.js";
 import path from "node:path";
 import { styleText } from "node:util";
 import { vitePlusHeader } from "../../binding/index.js";
@@ -68,10 +68,14 @@ async function promptPrettierMigration(projectPath, interactive, packages) {
 	if (!await migratePrettierToOxfmt(projectPath, interactive, prettierProject.configFile, packages)) cancelAndExit("Prettier migration failed. Fix the issue and re-run `vp migrate`.", 1);
 	return true;
 }
-async function confirmNodeVersionFileMigration(interactive) {
+async function confirmNodeVersionFileMigration(interactive, detection) {
+	const message = {
+		"package.json": "Migrate Volta node version (package.json) to .node-version?",
+		".nvmrc": "Migrate .nvmrc to .node-version?"
+	}[detection.file];
 	if (interactive) {
 		const confirmed = await confirm({
-			message: "Migrate .nvmrc to .node-version?",
+			message,
 			initialValue: true
 		});
 		if (Ct(confirmed)) cancelAndExit();
@@ -284,7 +288,7 @@ async function collectMigrationPlan(rootDir, detectedPackageManager, options, pa
 	else if (prettierProject.hasDependency) warnPackageLevelPrettier();
 	const nodeVersionDetection = detectNodeVersionManagerFile(rootDir);
 	let migrateNodeVersionFile = false;
-	if (nodeVersionDetection) migrateNodeVersionFile = await confirmNodeVersionFileMigration(options.interactive);
+	if (nodeVersionDetection) migrateNodeVersionFile = await confirmNodeVersionFileMigration(options.interactive, nodeVersionDetection);
 	return {
 		packageManager,
 		shouldSetupHooks,
@@ -493,7 +497,7 @@ async function main() {
 		const prettierMigrated = await promptPrettierMigration(workspaceInfoOptional.rootDir, options.interactive, workspaceInfoOptional.packages);
 		const nodeVersionDetection = detectNodeVersionManagerFile(workspaceInfoOptional.rootDir);
 		if (nodeVersionDetection) {
-			if (await confirmNodeVersionFileMigration(options.interactive) && migrateNodeVersionManagerFile(workspaceInfoOptional.rootDir, nodeVersionDetection, report)) didMigrate = true;
+			if (await confirmNodeVersionFileMigration(options.interactive, nodeVersionDetection) && migrateNodeVersionManagerFile(workspaceInfoOptional.rootDir, nodeVersionDetection, report)) didMigrate = true;
 		}
 		if (eslintMigrated || prettierMigrated) {
 			updateMigrationProgress("Rewriting configs");

package/dist/global/{workspace-BCuLuHte.js → workspace-jYbI79UA.js}

@@ -1,4 +1,4 @@
-import { B as log, C as readYamlFile, F as PackageManager, K as Ct, S as editYamlFile, U as select } from "./agent-Dq7R_VUV.js";
+import { B as log, C as readYamlFile, F as PackageManager, K as Ct, S as editYamlFile, U as select } from "./agent-CTaSZwnH.js";
 import { g as YAMLSeq, y as Scalar } from "./browser-09BZLUYM.js";
 import { c as readJsonFile, l as writeJsonFile, o as editJsonFile, r as getScopeFromPackageName } from "./package-2ArHHFnA.js";
 import path, { posix, win32 } from "node:path";
@@ -6277,6 +6277,7 @@ async function detectWorkspace$1(rootDir) {
 		} else if (fs.existsSync(packageJsonFile)) {
 			const pkg = readJsonFile(packageJsonFile);
 			if (Array.isArray(pkg.workspaces)) result.workspacePatterns = pkg.workspaces;
+			else if (pkg.workspaces && Array.isArray(pkg.workspaces.packages)) result.workspacePatterns = pkg.workspaces.packages;
 		}
 		const dirs = /* @__PURE__ */ new Set();
 		for (const pattern of result.workspacePatterns) {
@@ -6332,7 +6333,8 @@ function updateWorkspaceConfig(projectPath, workspaceInfo) {
 		doc.setIn(["packages"], packages);
 	});
 	else editJsonFile(path.join(workspaceInfo.rootDir, "package.json"), (pkg) => {
-		pkg.workspaces = [...pkg.workspaces || [], pattern];
+		if (pkg.workspaces && !Array.isArray(pkg.workspaces)) pkg.workspaces.packages = [...pkg.workspaces.packages || [], pattern];
+		else pkg.workspaces = [...pkg.workspaces || [], pattern];
 		return pkg;
 	});
 }

package/dist/migration/detector.d.ts

@@ -9,6 +9,7 @@ export interface ConfigFiles {
     prettierConfig?: string;
     prettierIgnore?: boolean;
     nvmrcFile?: boolean;
+    voltaNode?: string;
 }
 export declare const PRETTIER_PACKAGE_JSON_CONFIG = "package.json#prettier";
 export declare const PRETTIER_CONFIG_FILES: readonly [".prettierrc", ".prettierrc.json", ".prettierrc.jsonc", ".prettierrc.yaml", ".prettierrc.yml", ".prettierrc.toml", ".prettierrc.js", ".prettierrc.cjs", ".prettierrc.mjs", ".prettierrc.ts", ".prettierrc.cts", ".prettierrc.mts", "prettier.config.js", "prettier.config.cjs", "prettier.config.mjs", "prettier.config.ts", "prettier.config.cts", "prettier.config.mts"];

package/dist/migration/detector.js

@@ -134,22 +134,6 @@ export function detectConfigs(projectPath) {
             break;
         }
     }
-    // Check for "prettier" key in package.json if no config file found
-    if (!configs.prettierConfig) {
-        const packageJsonPath = path.join(projectPath, 'package.json');
-        if (fs.existsSync(packageJsonPath)) {
-            try {
-                const content = fs.readFileSync(packageJsonPath, 'utf8');
-                const pkg = JSON.parse(content);
-                if (pkg.prettier) {
-                    configs.prettierConfig = PRETTIER_PACKAGE_JSON_CONFIG;
-                }
-            }
-            catch {
-                // ignore parse errors
-            }
-        }
-    }
     // Check for .prettierignore
     if (fs.existsSync(path.join(projectPath, '.prettierignore'))) {
         configs.prettierIgnore = true;
@@ -158,5 +142,23 @@ export function detectConfigs(projectPath) {
     if (fs.existsSync(path.join(projectPath, '.nvmrc'))) {
         configs.nvmrcFile = true;
     }
+    // Check package.json for "prettier" key and Volta node version
+    const packageJsonPath = path.join(projectPath, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+        try {
+            const content = fs.readFileSync(packageJsonPath, 'utf8');
+            const pkg = JSON.parse(content);
+            if (!configs.prettierConfig && pkg.prettier) {
+                configs.prettierConfig = PRETTIER_PACKAGE_JSON_CONFIG;
+            }
+            const voltaNode = pkg.volta?.node;
+            if (typeof voltaNode === 'string') {
+                configs.voltaNode = voltaNode;
+            }
+        }
+        catch {
+            // ignore parse errors
+        }
+    }
     return configs;
 }

package/dist/migration/migrator.d.ts

@@ -100,11 +100,17 @@ export declare function createPreCommitHook(projectPath: string, dir?: string):
  * Called only when hooks are being set up (not with --no-hooks).
  */
 export declare function rewritePrepareScript(rootDir: string): string | undefined;
-export interface NodeVersionManagerDetection {
-    file: string;
-}
+export type NodeVersionManagerDetection = {
+    file: '.nvmrc';
+    voltaPresent?: true;
+} | {
+    file: 'package.json';
+    voltaNodeVersion: string;
+};
 /**
  * Detect a .nvmrc file in the project directory.
+ * If not found, check for a Volta node version in package.json.
+ * If either is found, return the relevant info for migration.
  * Returns undefined if not found or .node-version already exists.
  */
 export declare function detectNodeVersionManagerFile(projectPath: string): NodeVersionManagerDetection | undefined;
@@ -115,7 +121,9 @@ export declare function detectNodeVersionManagerFile(projectPath: string): NodeV
  */
 export declare function parseNvmrcVersion(alias: string): string | null;
 /**
- * Migrate .nvmrc to .node-version and remove .nvmrc.
+ * Migrate .nvmrc or Volta node version from package.json to .node-version.
+ * - For .nvmrc: the source file is removed after migration.
+ * - For package.json (Volta): the volta field is left as-is; removal is left to the user's discretion.
  * Returns true on success, false if migration was skipped or failed.
  */
-export declare function migrateNodeVersionManagerFile(projectPath: string, _detection: NodeVersionManagerDetection, report?: MigrationReport): boolean;
+export declare function migrateNodeVersionManagerFile(projectPath: string, detection: NodeVersionManagerDetection, report?: MigrationReport): boolean;

package/dist/migration/migrator.js

@@ -887,8 +887,12 @@ function rewriteBunCatalog(projectPath) {
         return;
     }
     editJsonFile(packageJsonPath, (pkg) => {
-        const catalog = { ...pkg.catalog };
-        // Add vite-plus managed packages to catalog
+        // Bun supports catalogs in both workspaces.catalog and top-level catalog;
+        // prefer the location the user already chose to avoid moving their config.
+        const workspacesObj = pkg.workspaces && !Array.isArray(pkg.workspaces) ? pkg.workspaces : undefined;
+        const catalog = {
+            ...(workspacesObj?.catalog ?? pkg.catalog),
+        };
         for (const [key, value] of Object.entries(VITE_PLUS_OVERRIDE_PACKAGES)) {
             if (!value.startsWith('file:')) {
                 catalog[key] = value;
@@ -897,11 +901,15 @@ function rewriteBunCatalog(projectPath) {
         if (!VITE_PLUS_VERSION.startsWith('file:')) {
             catalog[VITE_PLUS_NAME] = VITE_PLUS_VERSION;
         }
-        // Remove replaced packages from catalog
         for (const name of REMOVE_PACKAGES) {
             delete catalog[name];
         }
-        pkg.catalog = catalog;
+        if (workspacesObj?.catalog != null) {
+            workspacesObj.catalog = catalog;
+        }
+        else {
+            pkg.catalog = catalog;
+        }
         // bun overrides support catalog: references
         const overrides = { ...pkg.overrides };
         for (const key of Object.keys(VITE_PLUS_OVERRIDE_PACKAGES)) {
@@ -1073,6 +1081,15 @@ export function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMi
             ...pkg.devDependencies,
             [VITE_PLUS_NAME]: version,
         };
+        // Add vitest to devDependencies when a remaining dependency likely peer-depends
+        // on vitest (e.g., vitest-browser-svelte). Without this, pnpm resolves the real
+        // vitest for peer deps instead of @voidzero-dev/vite-plus-test, causing
+        // third-party type augmentations to target the wrong module.
+        const allDeps = { ...pkg.dependencies, ...pkg.devDependencies };
+        if (!allDeps.vitest && Object.keys(allDeps).some((name) => name.includes('vitest'))) {
+            const ver = VITE_PLUS_OVERRIDE_PACKAGES.vitest;
+            pkg.devDependencies.vitest = supportCatalog && !ver.startsWith('file:') ? 'catalog:' : ver;
+        }
     }
     return extractedStagedConfig;
 }
@@ -1769,6 +1786,8 @@ function setPackageManager(projectDir, downloadPackageManager) {
 }
 /**
  * Detect a .nvmrc file in the project directory.
+ * If not found, check for a Volta node version in package.json.
+ * If either is found, return the relevant info for migration.
  * Returns undefined if not found or .node-version already exists.
  */
 export function detectNodeVersionManagerFile(projectPath) {
@@ -1777,8 +1796,14 @@ export function detectNodeVersionManagerFile(projectPath) {
         return undefined;
     }
     const configs = detectConfigs(projectPath);
+    // .nvmrc takes priority over volta.node when both are present.
+    // voltaPresent is carried through so the migration step can remind the user
+    // to remove the now-redundant volta field from package.json.
     if (configs.nvmrcFile) {
-        return { file: '.nvmrc' };
+        return configs.voltaNode ? { file: '.nvmrc', voltaPresent: true } : { file: '.nvmrc' };
+    }
+    if (configs.voltaNode) {
+        return { file: 'package.json', voltaNodeVersion: configs.voltaNode };
     }
     return undefined;
 }
@@ -1814,12 +1839,34 @@ export function parseNvmrcVersion(alias) {
     return normalized;
 }
 /**
- * Migrate .nvmrc to .node-version and remove .nvmrc.
+ * Migrate .nvmrc or Volta node version from package.json to .node-version.
+ * - For .nvmrc: the source file is removed after migration.
+ * - For package.json (Volta): the volta field is left as-is; removal is left to the user's discretion.
  * Returns true on success, false if migration was skipped or failed.
  */
-export function migrateNodeVersionManagerFile(projectPath, _detection, report) {
-    const sourcePath = path.join(projectPath, '.nvmrc');
+export function migrateNodeVersionManagerFile(projectPath, detection, report) {
     const nodeVersionPath = path.join(projectPath, '.node-version');
+    // Volta: node version was already extracted during detection — no package.json re-read needed
+    if (detection.file === 'package.json') {
+        const { voltaNodeVersion } = detection;
+        // Normalize Volta's "lts" alias to the .node-version compatible form
+        const resolvedVersion = voltaNodeVersion === 'lts' ? 'lts/*' : voltaNodeVersion;
+        if (!semver.valid(resolvedVersion) && resolvedVersion !== 'lts/*') {
+            warnMigration(`package.json volta.node "${voltaNodeVersion}" is not an exact version. Pin an exact version (e.g. ${voltaNodeVersion}.0 or run \`volta pin node@${voltaNodeVersion}\`) then re-run migration.`, report);
+            return false;
+        }
+        fs.writeFileSync(nodeVersionPath, `${resolvedVersion}\n`);
+        if (report) {
+            report.manualSteps.push('Remove the "volta" field from package.json');
+            report.nodeVersionFileMigrated = true;
+        }
+        else {
+            prompts.log.info('You can now remove the "volta" field from package.json manually.');
+        }
+        return true;
+    }
+    // .nvmrc: parse version alias and write to .node-version
+    const sourcePath = path.join(projectPath, '.nvmrc');
     const content = fs.readFileSync(sourcePath, 'utf8');
     const originalAlias = content.split('\n')[0]?.trim() ?? '';
     const version = parseNvmrcVersion(originalAlias);
@@ -1836,6 +1883,13 @@ export function migrateNodeVersionManagerFile(projectPath, _detection, report) {
     fs.unlinkSync(sourcePath);
     if (report) {
         report.nodeVersionFileMigrated = true;
+        // Both .nvmrc and volta were present; .nvmrc was migrated but volta still lingers.
+        if (detection.voltaPresent) {
+            report.manualSteps.push('Remove the "volta" field from package.json');
+        }
+    }
+    else if (detection.voltaPresent) {
+        prompts.log.info('You can now remove the "volta" field from package.json manually.');
     }
     return true;
 }

package/dist/resolve-lint.js

@@ -10,7 +10,7 @@
  * Oxlint is a fast JavaScript/TypeScript linter written in Rust that
  * provides ESLint-compatible linting with significantly better performance.
  */
-import { existsSync } from 'node:fs';
+import { existsSync, realpathSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { relative } from 'node:path/win32';
 import { fileURLToPath } from 'node:url';
@@ -37,7 +37,8 @@ export async function lint() {
     let oxlintTsgolintPath = resolve('oxlint-tsgolint/bin/tsgolint');
     if (process.platform === 'win32') {
         // On Windows, try .exe first (bun creates .exe), then .cmd (npm/pnpm/yarn create .cmd)
-        const localBinDir = join(dirname(fileURLToPath(import.meta.url)), '..', 'node_modules', '.bin');
+        const scriptDir = dirname(fileURLToPath(import.meta.url));
+        const localBinDir = join(scriptDir, '..', 'node_modules', '.bin');
         const cwdBinDir = join(process.cwd(), 'node_modules', '.bin');
         oxlintTsgolintPath =
             [
@@ -45,7 +46,22 @@ export async function lint() {
                 join(localBinDir, 'tsgolint.cmd'),
                 join(cwdBinDir, 'tsgolint.exe'),
                 join(cwdBinDir, 'tsgolint.cmd'),
-            ].find((p) => existsSync(p)) ?? join(cwdBinDir, 'tsgolint.cmd');
+            ].find((p) => existsSync(p)) ?? '';
+        // Bun stores packages in .bun/ cache dirs where the symlinked paths above won't match.
+        if (!oxlintTsgolintPath) {
+            try {
+                const realPkgDir = realpathSync(join(scriptDir, '..'));
+                const realBinDir = join(dirname(realPkgDir), '.bin');
+                oxlintTsgolintPath =
+                    [join(realBinDir, 'tsgolint.exe'), join(realBinDir, 'tsgolint.cmd')].find((p) => existsSync(p)) ?? '';
+            }
+            catch {
+                // realpath failed, fall through to default
+            }
+        }
+        if (!oxlintTsgolintPath) {
+            oxlintTsgolintPath = join(cwdBinDir, 'tsgolint.cmd');
+        }
         const relativePath = relative(process.cwd(), oxlintTsgolintPath);
         // Only prepend .\ if it's actually a relative path (not an absolute path returned by relative())
         oxlintTsgolintPath = /^[a-zA-Z]:/.test(relativePath) ? relativePath : `.\\${relativePath}`;

package/dist/staged-config.d.ts

@@ -1 +1,9 @@
-export type StagedConfig = Record<string, string | string[]>;
+type SyncGenerateTask = (stagedFileNames: readonly string[]) => string | string[];
+type AsyncGenerateTask = (stagedFileNames: readonly string[]) => Promise<string | string[]>;
+type GenerateTask = SyncGenerateTask | AsyncGenerateTask;
+type TaskFunction = {
+    title: string;
+    task: (stagedFileNames: readonly string[]) => void | Promise<void>;
+};
+export type StagedConfig = Record<string, string | TaskFunction | GenerateTask | (string | GenerateTask)[]> | GenerateTask;
+export {};

package/dist/staged-config.js

@@ -1 +1,3 @@
+// Copied from lint-staged@16.4.0 (node_modules/lint-staged/lib/index.d.ts)
+// TODO: Re-export directly from lint-staged once we can bundle .d.ts files (#744).
 export {};

package/dist/utils/workspace.d.ts

@@ -1,4 +1,8 @@
 import { DependencyType, type WorkspaceInfo, type WorkspaceInfoOptional, type WorkspacePackage } from '../types/index.js';
+export type NpmWorkspaces = string[] | {
+    packages?: string[];
+    catalog?: Record<string, string>;
+};
 export declare function findPackageJsonFilesFromPatterns(patterns: string[], cwd: string): string[];
 export declare function detectWorkspace(rootDir: string): Promise<WorkspaceInfoOptional>;
 export declare function discoverWorkspacePackages(workspacePatterns: string[], rootDir: string): WorkspacePackage[];

package/dist/utils/workspace.js

@@ -51,11 +51,14 @@ export async function detectWorkspace(rootDir) {
             }
         }
         else if (fs.existsSync(packageJsonFile)) {
-            // Check for npm/yarn workspace
+            // Check for npm/yarn/bun workspace (array or object form)
             const pkg = readJsonFile(packageJsonFile);
             if (Array.isArray(pkg.workspaces)) {
                 result.workspacePatterns = pkg.workspaces;
             }
+            else if (pkg.workspaces && Array.isArray(pkg.workspaces.packages)) {
+                result.workspacePatterns = pkg.workspaces.packages;
+            }
         }
         const dirs = new Set();
         for (const pattern of result.workspacePatterns) {
@@ -153,9 +156,15 @@ export function updateWorkspaceConfig(projectPath, workspaceInfo) {
         });
     }
     else {
-        // Update package.json workspaces
+        // Update package.json workspaces (array or object form)
         editJsonFile(path.join(workspaceInfo.rootDir, 'package.json'), (pkg) => {
-            pkg.workspaces = [...(pkg.workspaces || []), pattern];
+            if (pkg.workspaces && !Array.isArray(pkg.workspaces)) {
+                // Preserve object form (e.g., Bun catalogs, Yarn classic nohoist)
+                pkg.workspaces.packages = [...(pkg.workspaces.packages || []), pattern];
+            }
+            else {
+                pkg.workspaces = [...(pkg.workspaces || []), pattern];
+            }
             return pkg;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plus",
-  "version": "0.1.15",
+  "version": "0.1.16-alpha.0",
   "description": "The Unified Toolchain for the Web",
   "homepage": "https://viteplus.dev/guide",
   "bugs": {
@@ -326,8 +326,8 @@
     "oxlint": "=1.58.0",
     "oxlint-tsgolint": "=0.18.1",
     "picocolors": "^1.1.1",
-    "@voidzero-dev/vite-plus-core": "0.1.15",
-    "@voidzero-dev/vite-plus-test": "0.1.15"
+    "@voidzero-dev/vite-plus-core": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-test": "0.1.16-alpha.0"
   },
   "devDependencies": {
     "@napi-rs/cli": "^3.4.1",
@@ -348,9 +348,9 @@
     "tsdown": "^0.21.7",
     "validate-npm-package-name": "^7.0.2",
     "yaml": "^2.8.1",
-    "@voidzero-dev/vite-plus-prompts": "0.0.0",
     "rolldown": "1.0.0-rc.12",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.15"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-prompts": "0.0.0"
   },
   "napi": {
     "binaryName": "vite-plus",
@@ -370,14 +370,14 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "optionalDependencies": {
-    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.15",
-    "@voidzero-dev/vite-plus-darwin-x64": "0.1.15",
-    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.15",
-    "@voidzero-dev/vite-plus-linux-arm64-musl": "0.1.15",
-    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.15",
-    "@voidzero-dev/vite-plus-linux-x64-musl": "0.1.15",
-    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.15",
-    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.15"
+    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-darwin-x64": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-linux-arm64-musl": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-linux-x64-musl": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.16-alpha.0",
+    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.16-alpha.0"
   },
   "scripts": {
     "build": "oxnode -C dev ./build.ts",

package/skills/vite-plus/docs/guide/upgrade.md

@@ -26,3 +26,24 @@ vp update vite-plus
 ```
 
 You can also use `vp add vite-plus@latest` if you want to move the dependency explicitly to the latest version.
+
+### Updating Aliased Packages
+
+Vite+ sets up npm aliases for its core packages during installation:
+
+- `vite` is aliased to `npm:@voidzero-dev/vite-plus-core@latest`
+- `vitest` is aliased to `npm:@voidzero-dev/vite-plus-test@latest`
+
+`vp update vite-plus` does not re-resolve these aliases in the lockfile. To fully upgrade, update them separately:
+
+```bash
+vp update @voidzero-dev/vite-plus-core @voidzero-dev/vite-plus-test
+```
+
+Or update everything at once:
+
+```bash
+vp update vite-plus @voidzero-dev/vite-plus-core @voidzero-dev/vite-plus-test
+```
+
+You can verify with `vp outdated` that no Vite+ packages remain outdated.