vite-plus 0.1.23 → 0.1.24

package/dist/create/bin.js

@@ -1,11 +1,11 @@
 import { r as __toESM, t as __commonJSMin } from "../chunk-DnnnRqeS.js";
-import { A as q, C as log, D as spinner, E as select, M as runCommandSilently, N as require_cross_spawn, O as text, S as intro, _ as DependencyType, b as cancel, c as defaultInteractive, d as promptGitHooks, f as promptGitInit, h as selectPackageManager, j as runCommand$1, k as require_picocolors, l as downloadPackageManager$1, m as runViteInstall, p as runViteFmt, v as PackageManager, w as multiselect, x as confirm } from "../tsconfig-DlUVXT3J.js";
+import { A as R, C as log, D as spinner, E as select, M as runCommandSilently, N as require_cross_spawn, O as text, S as intro, _ as DependencyType, b as cancel, c as defaultInteractive, d as promptGitHooks, f as promptGitInit, h as selectPackageManager, j as runCommand$1, k as require_picocolors, l as downloadPackageManager$1, m as runViteInstall, p as runViteFmt, v as PackageManager, w as multiselect, x as confirm } from "../tsconfig-DFb5BKyT.js";
 import { a as printHeader, i as muted, o as success, r as log$1, t as accent } from "../terminal-uTv0ZaMr.js";
 import { i as resolveViteConfig, n as hasViteConfig, t as findWorkspaceRoot } from "../resolve-vite-config-TTvhycU1.js";
 import { t as lib_default } from "../lib-L3DWSRQp.js";
 import { c as editJsonFile, o as fetchNpmResource, s as getNpmRegistry, t as checkNpmPackageExists, u as readJsonFile } from "../package-PmBUZ-ve.js";
-import { A as promptEslintMigration, F as setPackageManager, H as displayRelative, M as rewriteMonorepo, N as rewriteMonorepoProject, P as rewriteStandaloneProject, S as injectCreateDefaultTemplate, U as templatesDir, a as selectAgentTargets, b as hasFrameworkShim, c as writeCopilotSetupWorkflow, h as detectFramework, j as promptPrettierMigration, l as addFrameworkShim, m as detectEslintProject, r as detectExistingAgentTargetPaths, s as writeAgentInstructions, t as COPILOT_AGENT_ID, v as detectPrettierProject, w as installGitHooks } from "../agent-aSGY0osq.js";
-import { a as detectExistingEditors, c as writeEditorConfigs, n as updatePackageJsonWithDeps, r as updateWorkspaceConfig, s as selectEditors, t as detectWorkspace$1 } from "../workspace-DElv730L.js";
+import { A as promptEslintMigration, F as setPackageManager, H as displayRelative, M as rewriteMonorepo, N as rewriteMonorepoProject, P as rewriteStandaloneProject, S as injectCreateDefaultTemplate, U as templatesDir, a as selectAgentTargets, b as hasFrameworkShim, c as writeCopilotSetupWorkflow, h as detectFramework, j as promptPrettierMigration, l as addFrameworkShim, m as detectEslintProject, r as detectExistingAgentTargetPaths, s as writeAgentInstructions, t as COPILOT_AGENT_ID, v as detectPrettierProject, w as installGitHooks } from "../agent-Nuk-9l77.js";
+import { a as detectExistingEditors, c as writeEditorConfigs, n as updatePackageJsonWithDeps, r as updateWorkspaceConfig, s as selectEditors, t as detectWorkspace$1 } from "../workspace-NL-m9wgM.js";
 import { t as renderCliDoc } from "../help-YP84FSEz.js";
 import path from "node:path";
 import { runCommand, vitePlusHeader } from "../../binding/index.js";
@@ -496,7 +496,7 @@ async function pickOrgTemplate(manifest, opts) {
 		message: `Pick a template from ${manifest.scope}`,
 		options
 	});
-	if (q(picked)) return ORG_PICKER_CANCEL;
+	if (R(picked)) return ORG_PICKER_CANCEL;
 	const found = lookup.get(picked);
 	if (found === ESCAPE_HATCH) return ORG_PICKER_BUILTIN_ESCAPE;
 	if (!found) throw new Error(`org-picker: prompts.select returned an unregistered value: ${picked}`);
@@ -3763,6 +3763,19 @@ function getRandomProjectName(options = {}) {
 }
 //#endregion
 //#region src/create/utils.ts
+function hasExplicitEditorOptIn(editor) {
+	return typeof editor === "string" && editor.trim() !== "";
+}
+function normalizeEditorOption(editor) {
+	if (!Array.isArray(editor)) return editor;
+	if (editor.includes(false)) return false;
+	return editor.findLast((value) => typeof value === "string");
+}
+function shouldConfigureEditorsForCreate({ editor, isMonorepo }) {
+	if (editor === false) return false;
+	if (!isMonorepo) return true;
+	return hasExplicitEditorOptIn(editor);
+}
 function copy(src, dest) {
 	if (fs.statSync(src).isDirectory()) copyDir(src, dest);
 	else fs.copyFileSync(src, dest);
@@ -3930,7 +3943,7 @@ async function promptPackageNameAndTargetDir(defaultPackageName, interactive) {
 				return result?.errors?.[0] ?? result?.warnings?.[0] ?? "Invalid package name";
 			}
 		});
-		if (q(selected)) cancelAndExit();
+		if (R(selected)) cancelAndExit();
 		packageName = selected;
 		targetDir = getProjectDirFromPackageName(packageName);
 	} else {
@@ -3952,7 +3965,7 @@ async function promptTargetDir(defaultTargetDir, interactive, options) {
 			defaultValue: defaultTargetDir,
 			validate: (value) => validateTargetDir(value ?? defaultTargetDir, options?.cwd).error
 		});
-		if (q(selected)) cancelAndExit();
+		if (R(selected)) cancelAndExit();
 		targetDir = validateTargetDir(selected ?? defaultTargetDir, options?.cwd).directory;
 	} else {
 		targetDir = validateTargetDir(defaultTargetDir, options?.cwd).directory;
@@ -3985,7 +3998,7 @@ async function checkProjectDirExists(projectDirFullPath, interactive) {
 			value: "yes"
 		}]
 	});
-	if (q(overwrite)) cancelAndExit();
+	if (R(overwrite)) cancelAndExit();
 	switch (overwrite) {
 		case "yes":
 			emptyDir(projectDirFullPath);
@@ -4154,7 +4167,7 @@ async function executeGeneratorScaffold(workspaceInfo, templateInfo, options) {
 			placeholder: defaultDescription,
 			defaultValue: defaultDescription
 		});
-		if (!q(descPrompt)) description = descPrompt;
+		if (!R(descPrompt)) description = descPrompt;
 	}
 	const fullPath = path.join(workspaceInfo.rootDir, templateInfo.targetDir);
 	copyDir(path.join(templatesDir, "generator"), fullPath);
@@ -4374,14 +4387,7 @@ async function executeMonorepoTemplate(workspaceInfo, templateInfo, options) {
 	const appProjectPath = path.join(fullPath, InitialMonorepoAppDir);
 	setPackageName(appProjectPath, appPackageName);
 	rewriteMonorepoProject(appProjectPath, workspaceInfo.packageManager, void 0, options?.silent ?? false);
-	editJsonFile(path.join(appProjectPath, "package.json"), (pkg) => {
-		let changed = false;
-		for (const name of ["vite", "vitest"]) if (pkg.devDependencies?.[name]) {
-			delete pkg.devDependencies[name];
-			changed = true;
-		}
-		return changed ? pkg : void 0;
-	});
+	dropAliasedRuntimeDevDeps(appProjectPath, workspaceInfo.packageManager);
 	if (!options?.silent) log.step("Creating default library in packages/utils...");
 	const libraryDir = "packages/utils";
 	const libraryResult = await runRemoteTemplateCommand(workspaceInfo, fullPath, discoverTemplate(LibraryTemplateRepo, [libraryDir], workspaceInfo), false, options?.silent ?? false);
@@ -4398,6 +4404,30 @@ async function executeMonorepoTemplate(workspaceInfo, templateInfo, options) {
 		projectDir: templateInfo.targetDir
 	};
 }
+/**
+* Drop the aliased `vite` / `vitest` devDeps that `create-vite` leaves on a
+* scaffolded sub-package. After migration its scripts already use `vp ...` and
+* nothing imports `'vite'` directly, so `vite-plus` provides them transitively.
+*
+* pnpm is the exception and keeps them: pnpm only surfaces the
+* pnpm-workspace.yaml `overrides.vite: catalog:` entry through a package that
+* directly depends on `vite`, so keeping the aliased devDep lets `vp why vite`
+* reflect the override (resolving to @voidzero-dev/vite-plus-core). npm, yarn,
+* and bun redirect the transitive/peer vite via their root
+* overrides/resolutions regardless of a direct dep, so the aliased keys are
+* dead weight and are dropped.
+*/
+function dropAliasedRuntimeDevDeps(appProjectPath, packageManager) {
+	if (packageManager === PackageManager.pnpm) return;
+	editJsonFile(path.join(appProjectPath, "package.json"), (pkg) => {
+		let changed = false;
+		for (const name of ["vite", "vitest"]) if (pkg.devDependencies?.[name]) {
+			delete pkg.devDependencies[name];
+			changed = true;
+		}
+		return changed ? pkg : void 0;
+	});
+}
 function getScopeFromPackageName(packageName) {
 	if (packageName.startsWith("@")) return packageName.split("/")[0];
 	return "";
@@ -4627,7 +4657,7 @@ function parseArgs() {
 			help: parsed.help || false,
 			verbose: parsed.verbose || false,
 			agent: normalizeAgentOption(parsed.agent),
-			editor: parsed.editor,
+			editor: normalizeEditorOption(parsed.editor),
 			git: parsed.git,
 			hooks: parsed.hooks,
 			packageManager: parsed["package-manager"]
@@ -4776,7 +4806,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 			message: "",
 			options: getInitialTemplateOptions(isMonorepo)
 		});
-		if (q(template)) cancelAndExit();
+		if (R(template)) cancelAndExit();
 		selectedTemplateName = template;
 	}
 	const isBuiltinTemplate = selectedTemplateName.startsWith("vite:");
@@ -4817,7 +4847,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 				options: dirOptions,
 				initialValue: shouldOfferCwdOption ? cwdRelativeToRoot : inferParentDir(selectedTemplateName, workspaceInfoOptional) ?? workspaceInfoOptional.parentDirs[0]
 			});
-			if (q(selected)) cancelAndExit();
+			if (R(selected)) cancelAndExit();
 			if (selected !== "other") parentDir = selected;
 		}
 		if (!parentDir) {
@@ -4828,7 +4858,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 					return value ? formatTargetDir(value).error : "Target directory is required";
 				}
 			});
-			if (q(customTargetDir)) cancelAndExit();
+			if (R(customTargetDir)) cancelAndExit();
 			parentDir = customTargetDir;
 		}
 		selectedParentDir = parentDir;
@@ -4892,7 +4922,11 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 		selectedAgentTargetPaths = agentSelection.targetPaths;
 		shouldWriteCopilotSetupWorkflow = agentSelection.selectedAgents.some((agent) => agent.id === COPILOT_AGENT_ID);
 	}
-	selectedEditors = (options.editor || !options.interactive ? void 0 : detectExistingEditors(workspaceInfoOptional.rootDir)) ?? await selectEditors({
+	const shouldConfigureEditors = shouldConfigureEditorsForCreate({
+		editor: options.editor,
+		isMonorepo
+	});
+	if (shouldConfigureEditors) selectedEditors = (options.editor || !options.interactive ? void 0 : detectExistingEditors(workspaceInfoOptional.rootDir)) ?? await selectEditors({
 		interactive: options.interactive,
 		editor: options.editor,
 		onCancel: () => cancelAndExit()
@@ -4955,7 +4989,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 				initialValue: true
 			});
 			resumeCreateProgress();
-			if (q(selected)) {
+			if (R(selected)) {
 				log.info("Operation cancelled. Skipping git initialization");
 				shouldInitGit = false;
 			} else shouldInitGit = selected;
@@ -5022,7 +5056,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 			await initGitRepository(fullPath);
 		}
 		if (bundled?.monorepo) injectCreateDefaultTemplate(fullPath, bundled.scope, compactOutput);
-		if (shouldSetupHooks) installGitHooks(fullPath, compactOutput);
+		if (shouldSetupHooks) installGitHooks(fullPath, compactOutput, void 0, workspaceInfo.packageManager);
 		updateCreateProgress("Installing dependencies");
 		const installSummary = await runViteInstall(fullPath, options.interactive, installArgs, {
 			silent: compactOutput,
@@ -5103,17 +5137,19 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 		silent: compactOutput
 	});
 	resumeCreateProgress();
-	updateCreateProgress("Writing editor configs");
-	pauseCreateProgress();
-	await writeEditorConfigs({
-		projectRoot: fullPath,
-		editorId: selectedEditors,
-		interactive: options.interactive,
-		silent: compactOutput,
-		extraVsCodeSettings: { "npm.scriptRunner": "vp" }
-	});
-	if (selectedEditors?.includes("vscode")) ensureGitignoreVsCodeEditorConfigs(fullPath);
-	resumeCreateProgress();
+	if (shouldConfigureEditors) {
+		updateCreateProgress("Writing editor configs");
+		pauseCreateProgress();
+		await writeEditorConfigs({
+			projectRoot: fullPath,
+			editorId: selectedEditors,
+			interactive: options.interactive,
+			silent: compactOutput,
+			extraVsCodeSettings: { "npm.scriptRunner": "vp" }
+		});
+		if (selectedEditors?.includes("vscode")) ensureGitignoreVsCodeEditorConfigs(fullPath);
+		resumeCreateProgress();
+	}
 	const shouldMigrateLintFmtTools = detectEslintProject(fullPath).hasDependency || detectPrettierProject(fullPath).hasDependency;
 	let installSummary;
 	const installAndMigrate = async (installCwd) => {
@@ -5151,7 +5187,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 					required: false
 				});
 				let selectedDepTypes = [];
-				if (!q(selectedDepTypeOptions)) selectedDepTypes = selectedDepTypeOptions;
+				if (!R(selectedDepTypeOptions)) selectedDepTypes = selectedDepTypeOptions;
 				for (const selectedDepType of selectedDepTypes) {
 					const selected = await multiselect({
 						message: `Which packages should be added as ${selectedDepType} to ${success(projectDir)}?`,
@@ -5162,7 +5198,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 						required: false
 					});
 					let selectedDeps = [];
-					if (!q(selected)) selectedDeps = selected;
+					if (!R(selected)) selectedDeps = selected;
 					if (selectedDeps.length > 0) updatePackageJsonWithDeps(workspaceInfo.rootDir, projectDir, selectedDeps, selectedDepType);
 				}
 				resumeCreateProgress();
@@ -5195,7 +5231,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 			updateCreateProgress("Initializing git repository");
 			await initGitRepository(fullPath);
 		}
-		if (shouldSetupHooks) installGitHooks(fullPath, compactOutput);
+		if (shouldSetupHooks) installGitHooks(fullPath, compactOutput, void 0, workspaceInfo.packageManager);
 		updateCreateProgress("Installing dependencies");
 		installSummary = await runViteInstall(fullPath, options.interactive, installArgs, {
 			silent: compactOutput,

package/dist/migration/bin.js

@@ -1,12 +1,12 @@
 import { r as __toESM } from "../chunk-DnnnRqeS.js";
 import { c as isForceOverrideMode } from "../constants-DCBWlNrn.js";
-import { A as q, C as log, D as spinner, E as select, T as outro, c as defaultInteractive, d as promptGitHooks, g as upgradeYarn, h as selectPackageManager, i as hasBaseUrlInTsconfig, l as downloadPackageManager, m as runViteInstall, r as fixBaseUrlInTsconfig, s as cancelAndExit, t as confirmBaseUrlFix, v as PackageManager, x as confirm, y as require_semver } from "../tsconfig-DlUVXT3J.js";
+import { A as R, C as log, D as spinner, E as select, T as outro, c as defaultInteractive, d as promptGitHooks, g as upgradeYarn, h as selectPackageManager, i as hasBaseUrlInTsconfig, l as downloadPackageManager, m as runViteInstall, r as fixBaseUrlInTsconfig, s as cancelAndExit, t as confirmBaseUrlFix, v as PackageManager, x as confirm, y as require_semver } from "../tsconfig-DFb5BKyT.js";
 import { a as printHeader, i as muted, r as log$1, t as accent } from "../terminal-uTv0ZaMr.js";
 import { t as lib_default } from "../lib-L3DWSRQp.js";
 import { a as readNearestPackageJson, i as hasVitePlusDependency } from "../package-PmBUZ-ve.js";
-import { A as promptEslintMigration, C as injectLintTypeCheckDefaults, D as migrateNodeVersionManagerFile, E as migrateEslintToOxlint, H as displayRelative, I as warnIncompatibleEslintIntegration, L as warnLegacyEslintConfig, M as rewriteMonorepo, O as migratePrettierToOxfmt, P as rewriteStandaloneProject, R as warnPackageLevelEslint, T as mergeViteConfigFiles, _ as detectNodeVersionManagerFile, b as hasFrameworkShim, d as checkVitestVersion, f as confirmEslintMigration, g as detectIncompatibleEslintIntegration, h as detectFramework, i as selectAgentTargetPaths, j as promptPrettierMigration, k as preflightGitHooksSetup, l as addFrameworkShim, m as detectEslintProject, n as detectAgentConflicts, p as confirmPrettierMigration, r as detectExistingAgentTargetPaths, s as writeAgentInstructions, u as checkViteVersion, v as detectPrettierProject, w as installGitHooks, z as warnPackageLevelPrettier } from "../agent-aSGY0osq.js";
+import { A as promptEslintMigration, C as injectLintTypeCheckDefaults, D as migrateNodeVersionManagerFile, E as migrateEslintToOxlint, H as displayRelative, I as warnIncompatibleEslintIntegration, L as warnLegacyEslintConfig, M as rewriteMonorepo, O as migratePrettierToOxfmt, P as rewriteStandaloneProject, R as warnPackageLevelEslint, T as mergeViteConfigFiles, _ as detectNodeVersionManagerFile, b as hasFrameworkShim, d as checkVitestVersion, f as confirmEslintMigration, g as detectIncompatibleEslintIntegration, h as detectFramework, i as selectAgentTargetPaths, j as promptPrettierMigration, k as preflightGitHooksSetup, l as addFrameworkShim, m as detectEslintProject, n as detectAgentConflicts, p as confirmPrettierMigration, r as detectExistingAgentTargetPaths, s as writeAgentInstructions, u as checkViteVersion, v as detectPrettierProject, w as installGitHooks, z as warnPackageLevelPrettier } from "../agent-Nuk-9l77.js";
 import { n as addMigrationWarning, r as createMigrationReport } from "../report-DgSBQUdz.js";
-import { c as writeEditorConfigs, i as detectEditorConflicts, o as selectEditor, t as detectWorkspace } from "../workspace-DElv730L.js";
+import { c as writeEditorConfigs, i as detectEditorConflicts, o as selectEditor, t as detectWorkspace } from "../workspace-NL-m9wgM.js";
 import { t as renderCliDoc } from "../help-YP84FSEz.js";
 import path from "node:path";
 import { styleText } from "node:util";
@@ -22,7 +22,7 @@ async function confirmNodeVersionFileMigration(interactive, detection) {
 			message,
 			initialValue: true
 		});
-		if (q(confirmed)) cancelAndExit();
+		if (R(confirmed)) cancelAndExit();
 		return confirmed;
 	}
 	return true;
@@ -37,7 +37,7 @@ async function confirmFrameworkShim(framework, interactive) {
 			message: `Add TypeScript shim for ${name} component files (*.${framework})?\n  ` + styleText("gray", `Lets TypeScript recognize .${framework} files until vp check fully supports them.`),
 			initialValue: true
 		});
-		if (q(confirmed)) cancelAndExit();
+		if (R(confirmed)) cancelAndExit();
 		return confirmed;
 	}
 	return true;
@@ -144,8 +144,9 @@ const helpMessage = renderCliDoc({
 				"  After the migration:",
 				"  - Confirm `vite` imports were rewritten to `vite-plus` where needed",
 				"  - Confirm `vitest` imports were rewritten to `vite-plus/test` where needed",
-				"  - Remove old `vite` and `vitest` dependencies only after those rewrites",
-				"    are confirmed",
+				"  - On pnpm, keep the `vite` / `vitest` entries that `vp migrate` aliased to",
+				"    the Vite+ packages so the workspace override stays effective; with other",
+				"    package managers you can remove them once those rewrites are confirmed",
 				"  - Move remaining tool-specific config into the appropriate blocks in",
 				"    `vite.config.ts`",
 				"",
@@ -200,7 +201,7 @@ async function collectMigrationPlan(rootDir, detectedPackageManager, options, pa
 	const packageManager = detectedPackageManager ?? await selectPackageManager(options.interactive, true);
 	let shouldSetupHooks = await promptGitHooks(options);
 	if (shouldSetupHooks) {
-		const reason = preflightGitHooksSetup(rootDir);
+		const reason = preflightGitHooksSetup(rootDir, packageManager);
 		if (reason) {
 			log.warn(`⚠ ${reason}`);
 			shouldSetupHooks = false;
@@ -231,7 +232,7 @@ async function collectMigrationPlan(rootDir, detectedPackageManager, options, pa
 			}],
 			initialValue: "skip"
 		});
-		if (q(action)) cancelAndExit();
+		if (R(action)) cancelAndExit();
 		agentConflictDecisions.set(conflict.targetPath, action);
 	} else agentConflictDecisions.set(conflict.targetPath, "skip");
 	const selectedEditor = await selectEditor({
@@ -258,7 +259,7 @@ async function collectMigrationPlan(rootDir, detectedPackageManager, options, pa
 			}],
 			initialValue: "skip"
 		});
-		if (q(action)) cancelAndExit();
+		if (R(action)) cancelAndExit();
 		editorConflictDecisions.set(conflict.fileName, action);
 	} else editorConflictDecisions.set(conflict.fileName, "merge");
 	const eslintProject = detectEslintProject(rootDir, packages);
@@ -440,7 +441,7 @@ async function executeMigrationPlan(workspaceInfoOptional, plan, interactive) {
 	else rewriteStandaloneProject(workspaceInfo.rootDir, workspaceInfo, skipStagedMigration, true, report);
 	if (plan.shouldSetupHooks) {
 		updateMigrationProgress("Configuring git hooks");
-		installGitHooks(workspaceInfo.rootDir, true, report);
+		installGitHooks(workspaceInfo.rootDir, true, report, plan.packageManager);
 	}
 	updateMigrationProgress("Writing agent instructions");
 	await writeAgentInstructions({
@@ -546,7 +547,7 @@ async function main() {
 		if (rootPkg?.devDependencies?.husky || rootPkg?.dependencies?.husky || rootPkg?.devDependencies?.["lint-staged"] || rootPkg?.dependencies?.["lint-staged"]) {
 			const shouldSetupHooks = await promptGitHooks(options);
 			if (shouldSetupHooks) updateMigrationProgress("Configuring git hooks");
-			if (shouldSetupHooks && installGitHooks(workspaceInfoOptional.rootDir, true, report)) didMigrate = true;
+			if (shouldSetupHooks && installGitHooks(workspaceInfoOptional.rootDir, true, report, workspaceInfoOptional.packageManager)) didMigrate = true;
 		}
 		await checkRolldownCompatibility(workspaceInfoOptional.rootDir, report);
 		if (workspaceInfoOptional.packages) for (const pkg of workspaceInfoOptional.packages) await checkRolldownCompatibility(path.join(workspaceInfoOptional.rootDir, pkg.path), report);