vite-plus 1.3.0 → 1.5.0

package/dist/create/bin.js

@@ -1,27 +1,27 @@
-import { r as __toESM, t as __commonJSMin } from "../rolldown-runtime-kJ_i4yPo.js";
-import { t as documentationUrl$1 } from "../documentation-DqcZSthV.js";
-import { t as renderCliDoc } from "../help-BmKpeOP9.js";
-import { a as muted, i as log, o as printHeader, r as formatDuration, s as success, t as accent } from "../terminal-MKGAuy-p.js";
-import { d as VITE_PLUS_OVERRIDE_PACKAGES, f as VITE_PLUS_VERSION, u as VITE_PLUS_NAME } from "../constants-DR55DpRm.js";
-import { i as readJsonFile, n as editJsonFile } from "../json-JP24qHUF.js";
-import { c as getNpmRegistry, r as getScopeFromPackageName, s as fetchNpmResource, t as checkNpmPackageExists } from "../package-CQDXTm6j.js";
-import { i as hasViteConfig, o as resolveViteConfig, r as findWorkspaceRoot, t as findViteConfig } from "../resolve-vite-config-BVr1SUNg.js";
-import { A as text, E as multiselect, M as isCancel, O as select, S as normalize$1, T as log$1, a as resolveGitInit, c as selectPackageManager, d as readYamlFile, h as resolveApproveBuildTargets, i as promptGitHooks, j as require_picocolors, k as spinner, m as detectGatedBuilds, n as defaultInteractive, o as runViteFmt, p as approveBuilds, r as downloadPackageManager$1, s as runViteInstall, t as cancelAndExit, u as editYamlFile, v as DependencyType, w as intro, y as PackageManager } from "../prompts-1xNz_ne0.js";
-import { a as selectAgentTargets, c as writeCopilotSetupWorkflow, d as templatesDir, l as displayRelative, r as detectExistingAgentTargetPaths, s as writeAgentInstructions, t as COPILOT_AGENT_ID } from "../agent-97KmGCyL.js";
-import { A as createCatalogDependencyResolver, B as addFrameworkShim, F as updateWorkspaceConfig, H as hasFrameworkShim, K as promptTsupMigration, L as findGitRoot, M as detectWorkspace$1, N as isBingoTemplate, P as updatePackageJsonWithDeps, R as initGitRepository, V as detectFramework, W as detectTsupProject, Y as detectPrettierProject, Z as promptPrettierMigration, _ as installGitHooks, a as selectEditors, b as injectCreateDefaultTemplate, c as rewriteMonorepoProject, et as detectEslintProject, h as setPackageManager, j as supportsCatalog, l as rewriteStandaloneProject, n as detectExistingEditors, o as writeEditorConfigs, rt as promptEslintMigration, s as rewriteMonorepo, y as shouldSkipStagedMigrationForHooks } from "../editor-CtJGQP7C.js";
-import { n as runCommandSilently, t as runCommand$1 } from "../command-CdMBoZFD.js";
-import { t as require_dist } from "../dist-DIpm7mot.js";
-import { t as unwrapCliParseOutcome } from "../cli-parse-DHE8NrBU.js";
+import { r as __toESM, t as __commonJSMin } from "../rolldown-runtime-DegdyBIC.js";
+import { A as text, E as multiselect, M as isCancel, O as select, S as normalize$1, T as log, a as resolveGitInit, c as selectPackageManager, d as readYamlFile, h as resolveApproveBuildTargets, i as promptGitHooks, j as require_picocolors, k as spinner, m as detectGatedBuilds, n as defaultInteractive, o as runViteFmt, p as approveBuilds, r as downloadPackageManager$1, s as runViteInstall, t as cancelAndExit, u as editYamlFile, v as DependencyType, w as intro, y as PackageManager } from "../prompts-C7DI63WP.js";
+import { $ as promptTsupMigration, B as isBingoTemplate, G as initGitRepository, H as updateWorkspaceConfig, I as createCatalogDependencyResolver, J as detectFramework, L as supportsCatalog, R as detectWorkspace$1, V as updatePackageJsonWithDeps, W as findGitRoot, Y as hasFrameworkShim, Z as detectTsupProject, a as selectEditors, c as rewriteMonorepoProject, h as setPackageManager, it as promptPrettierMigration, l as rewriteStandaloneProject, n as detectExistingEditors, nt as detectPrettierProject, o as writeEditorConfigs, q as addFrameworkShim, s as rewriteMonorepo, st as detectEslintProject, ut as promptEslintMigration, v as installGitHooks, w as injectCreateDefaultTemplate, x as shouldSkipStagedMigrationForHooks, z as discoverWorkspacePackages } from "../editor-aOy1T15H.js";
+import { a as selectAgentTargets, c as writeCopilotSetupWorkflow, d as templatesDir, l as displayRelative, r as detectExistingAgentTargetPaths, s as writeAgentInstructions, t as COPILOT_AGENT_ID } from "../agent-DkQD3xqe.js";
+import { t as unwrapCliParseOutcome } from "../cli-parse-aeUeFDlC.js";
+import { t as documentationUrl$1 } from "../documentation-cv_y0Auv.js";
+import { t as renderCliDoc } from "../help-B03t_iQ4.js";
+import { i as readJsonFile, n as editJsonFile } from "../json-kl84kDyH.js";
+import { a as muted, i as log$1, o as printHeader, r as formatDuration, s as success, t as accent } from "../terminal-BcuPUy-j.js";
+import { c as getNpmRegistry, r as getScopeFromPackageName, s as fetchNpmResource, t as checkNpmPackageExists } from "../package-DfFo6-E-.js";
+import { a as resolveViteConfig, r as hasViteConfig, t as findViteConfig } from "../resolve-vite-config-Cx3cnVVI.js";
+import { t as require_dist } from "../dist-Bs0SObNC.js";
+import { d as VITE_PLUS_OVERRIDE_PACKAGES, f as VITE_PLUS_VERSION, u as VITE_PLUS_NAME } from "../constants-D2P2aVKb.js";
+import { i as runCommandSilently, r as runCommand$1 } from "../command-rY79K5NI.js";
 import path from "node:path";
-import { getVpDirs, parseCreateArgs, removeConfigKey, runCommand, upsertJsonConfig, vitePlusHeader } from "../../binding/index.js";
+import { findMonorepoRoot, getVpDirs, parseCreateArgs, removeConfigKey, runCommand, upsertJsonConfig, vitePlusHeader } from "../../binding/index.js";
 import { promisify, styleText } from "node:util";
 import fs from "node:fs";
-import os from "node:os";
 import { createHash, randomUUID } from "node:crypto";
+import os from "node:os";
 import fsPromises from "node:fs/promises";
 import { gunzip } from "node:zlib";
 import assert from "node:assert";
-//#region src/create/command.ts
+// src/create/command.ts
 async function runCommandAndDetectProjectDir(options, parentDir) {
 	const cwd = parentDir ? path.join(options.cwd, parentDir) : options.cwd;
 	const existingDirs = /* @__PURE__ */ new Set();
@@ -97,8 +97,7 @@ function prependToPathToEnvs(extraPath, envs) {
 	if (!current.split(delimiter).filter(Boolean).includes(extraPath)) envs[pathKey] = extraPath + (current ? delimiter + current : "");
 	return envs;
 }
-//#endregion
-//#region ../../node_modules/.pnpm/nanotar@0.3.0/node_modules/nanotar/dist/index.mjs
+// ../../node_modules/.pnpm/nanotar@0.3.0/node_modules/nanotar/dist/index.mjs
 const tarItemTypeMap = {
 	"0": "file",
 	"1": "hardLink",
@@ -239,8 +238,7 @@ function _parseExtendedHeaders(data) {
 	}
 	return headers;
 }
-//#endregion
-//#region src/create/org-tarball-reader.ts
+// src/create/org-tarball-reader.ts
 const decompress = promisify(gunzip);
 const TAR_BLOCK_BYTES = 512;
 const ORG_TARBALL_LIMITS = {
@@ -311,8 +309,7 @@ async function parseOrgTarball(bytes, limits = ORG_TARBALL_LIMITS) {
 		return true;
 	} });
 }
-//#endregion
-//#region src/create/org-tarball.ts
+// src/create/org-tarball.ts
 function getCacheRoot() {
 	return path.join(getVpDirs().cache, "create-org");
 }
@@ -545,8 +542,7 @@ function resolveBundledPath(extractedRoot, relativePath) {
 	if (resolvedTarget !== resolvedRoot && !resolvedTarget.startsWith(`${resolvedRoot}${path.sep}`)) throw new Error(`bundled template path escapes the package root: ${relativePath}`);
 	return resolvedTarget;
 }
-//#endregion
-//#region src/create/org-manifest.ts
+// src/create/org-manifest.ts
 /**
 * Parse the org picker specifier: `@scope` (scope only → picker) or
 * `@scope:name` (direct manifest-entry selection). Colon mirrors the
@@ -767,8 +763,7 @@ function filterManifestForContext(templates, isMonorepo) {
 	if (!isMonorepo) return [...templates];
 	return templates.filter((entry) => !entry.monorepo);
 }
-//#endregion
-//#region src/create/templates/types.ts
+// src/create/templates/types.ts
 const LibraryTemplateRepo = "github:sxzz/tsdown-templates/vite-plus";
 const BuiltinTemplate = {
 	generator: "vite:generator",
@@ -782,8 +777,7 @@ const TemplateType = {
 	remote: "remote",
 	bundled: "bundled"
 };
-//#endregion
-//#region src/create/discovery.ts
+// src/create/discovery.ts
 function isGitHubUrl(templateName) {
 	return templateName.startsWith("https://github.com/") || templateName.startsWith("github:") || templateName.includes("github.com/");
 }
@@ -935,8 +929,7 @@ function inferParentDir(templateName, workspaceInfo, localTemplate = false) {
 	else if (templateName === BuiltinTemplate.generator) rule = /generator|tool/i;
 	for (const parentDir of workspaceInfo.parentDirs) if (rule.test(parentDir)) return parentDir;
 }
-//#endregion
-//#region src/create/initial-template-options.ts
+// src/create/initial-template-options.ts
 function getInitialTemplateOptions(isMonorepo, templates = []) {
 	return [
 		...!isMonorepo ? [{
@@ -961,8 +954,7 @@ function getInitialTemplateOptions(isMonorepo, templates = []) {
 		})) : []
 	];
 }
-//#endregion
-//#region src/create/org-picker.ts
+// src/create/org-picker.ts
 const ORG_PICKER_CANCEL = Symbol("org-picker-cancel");
 const ORG_PICKER_BUILTIN_ESCAPE = Symbol("org-picker-builtin-escape");
 const ESCAPE_HATCH = Symbol("builtin-escape");
@@ -1027,8 +1019,7 @@ function formatManifestTable(manifest, isMonorepo) {
 		filteredCount
 	};
 }
-//#endregion
-//#region src/create/org-resolve.ts
+// src/create/org-resolve.ts
 function printNonInteractiveTable(manifest, orgSpec, isMonorepo) {
 	const { lines, filteredCount } = formatManifestTable(manifest, isMonorepo);
 	const [firstVisible] = filterManifestForContext(manifest.templates, isMonorepo);
@@ -1048,7 +1039,7 @@ function printNonInteractiveTable(manifest, orgSpec, isMonorepo) {
 }
 function rejectMonorepoEntryInsideMonorepo(entry, isMonorepo) {
 	if (entry.monorepo && isMonorepo) {
-		log$1.info("You are already in a monorepo workspace.\nUse a different template or run this command outside the monorepo");
+		log.info("You are already in a monorepo workspace.\nUse a different template or run this command outside the monorepo");
 		cancelAndExit("Cannot create a monorepo inside an existing monorepo", 1);
 	}
 }
@@ -1086,7 +1077,7 @@ async function resolveOrgManifestForCreate(args) {
 	}
 	if (!manifest) {
 		if (orgSpec.name !== void 0) cancelAndExit(`No \`createConfig.templates\` manifest in ${orgSpec.scope}/create — \`@org:name\` requires one.`, 1);
-		log$1.info(`No \`createConfig.templates\` manifest in ${orgSpec.scope}/create — running it as a normal package.`);
+		log.info(`No \`createConfig.templates\` manifest in ${orgSpec.scope}/create — running it as a normal package.`);
 		return { kind: "passthrough" };
 	}
 	if (orgSpec.name === void 0) {
@@ -1097,7 +1088,7 @@ async function resolveOrgManifestForCreate(args) {
 		const picked = await pickOrgTemplate(manifest, { isMonorepo: args.isMonorepo });
 		if (picked === ORG_PICKER_CANCEL) cancelAndExit();
 		if (picked === ORG_PICKER_BUILTIN_ESCAPE) {
-			if (args.isMonorepo && manifest.templates.every((t) => t.monorepo)) log$1.info(`No templates from ${manifest.packageName} are applicable inside a monorepo — showing Vite+ built-in templates instead.`);
+			if (args.isMonorepo && manifest.templates.every((t) => t.monorepo)) log.info(`No templates from ${manifest.packageName} are applicable inside a monorepo — showing Vite+ built-in templates instead.`);
 			return { kind: "escape-hatch" };
 		}
 		rejectMonorepoEntryInsideMonorepo(picked.entry, args.isMonorepo);
@@ -1115,9 +1106,9 @@ async function resolveOrgManifestForCreate(args) {
 * Read the `create` config (`defaultTemplate` + validated `templates`) from
 * a workspace's `vite.config.ts` in a single config evaluation.
 *
-* By default, walks up from `startDir` via `findWorkspaceRoot` (monorepo
-* markers only — `pnpm-workspace.yaml`, `workspaces` in `package.json`,
-* `lerna.json`) so monorepo invocations from any subdirectory still pick up
+* By default, walks up from `startDir` via `findMonorepoRoot` (monorepo
+* markers only — `pnpm-workspace.yaml` or `workspaces` in `package.json`)
+* so monorepo invocations from any subdirectory still pick up
 * the root config. Pass `walkUp: false` to read `startDir` directly when the
 * caller already holds the exact workspace root.
 *
@@ -1131,7 +1122,7 @@ async function resolveOrgManifestForCreate(args) {
 * instead of swallowed.
 */
 async function getConfiguredCreate(startDir, options) {
-	const projectRoot = options?.walkUp === false ? startDir : findWorkspaceRoot(startDir) ?? startDir;
+	const projectRoot = options?.walkUp === false ? startDir : findMonorepoRoot(startDir) ?? startDir;
 	if (!hasViteConfig(projectRoot)) return { templates: [] };
 	let create;
 	try {
@@ -1161,8 +1152,7 @@ async function getConfiguredDefaultTemplate(startDir) {
 		return;
 	}
 }
-//#endregion
-//#region ../../node_modules/.pnpm/validate-npm-package-name@8.0.0/node_modules/validate-npm-package-name/lib/builtin-modules.json
+// ../../node_modules/.pnpm/validate-npm-package-name@8.0.0/node_modules/validate-npm-package-name/lib/builtin-modules.json
 var require_builtin_modules = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = [
 		"_http_agent",
@@ -1239,8 +1229,7 @@ var require_builtin_modules = /* @__PURE__ */ __commonJSMin(((exports, module) =
 		"node:test/reporters"
 	];
 }));
-//#endregion
-//#region ../../node_modules/.pnpm/@nkzw+safe-word-list@3.1.0/node_modules/@nkzw/safe-word-list/index.js
+// ../../node_modules/.pnpm/@nkzw+safe-word-list@3.1.0/node_modules/@nkzw/safe-word-list/index.js
 var import_lib = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const builtins = require_builtin_modules();
 	var scopedPackagePattern = /* @__PURE__ */ new RegExp("^(?:@([^/]+?)[/])?([^/]+?)$");
@@ -4031,8 +4020,7 @@ const random = (min, max) => Math.floor(min + Math.random() * (max - min + 1));
 function getRandomWord() {
 	return words[random(0, words.length - 1)];
 }
-//#endregion
-//#region src/create/random-name.ts
+// src/create/random-name.ts
 const isTest = process.env.VP_CLI_TEST === "1";
 function getRandomWords() {
 	const first = getRandomWord();
@@ -4047,8 +4035,7 @@ function getRandomProjectName(options = {}) {
 	const projectName = isTest && fallbackName ? fallbackName : getRandomWords().join("-");
 	return scope ? `${scope}/${projectName}` : projectName;
 }
-//#endregion
-//#region src/create/utils.ts
+// src/create/utils.ts
 var import_dist = require_dist();
 /** Complete only the managed catalog references of a newly created workspace member.
 * Running the full root migrator here would also change unrelated packages and overrides.
@@ -4268,8 +4255,7 @@ function deriveDefaultPackageName(cwd, scope, fallbackName) {
 		fallbackName
 	});
 }
-//#endregion
-//#region src/create/prompts.ts
+// src/create/prompts.ts
 async function promptPackageNameAndTargetDir(defaultPackageName, interactive) {
 	let packageName;
 	let targetDir;
@@ -4291,7 +4277,7 @@ async function promptPackageNameAndTargetDir(defaultPackageName, interactive) {
 	} else {
 		packageName = defaultPackageName;
 		targetDir = getProjectDirFromPackageName(packageName);
-		log$1.info(`Using default package name: ${accent(packageName)}`);
+		log.info(`Using default package name: ${accent(packageName)}`);
 	}
 	return {
 		packageName,
@@ -4311,7 +4297,7 @@ async function promptTargetDir(defaultTargetDir, interactive, options) {
 		targetDir = validateTargetDir(selected ?? defaultTargetDir, options?.cwd).directory;
 	} else {
 		targetDir = validateTargetDir(defaultTargetDir, options?.cwd).directory;
-		log$1.info(`Using default target directory: ${accent(targetDir)}`);
+		log.info(`Using default target directory: ${accent(targetDir)}`);
 	}
 	return targetDir;
 }
@@ -4324,26 +4310,57 @@ function suggestAvailableTargetDir(defaultTargetDir, cwd) {
 	}
 	return suggestedTargetDir;
 }
+function describeExistingTarget(projectDirFullPath, stats) {
+	if (stats.isSymbolicLink()) {
+		let linkedPath;
+		try {
+			linkedPath = fs.realpathSync(projectDirFullPath);
+		} catch {
+			linkedPath = path.resolve(path.dirname(projectDirFullPath), fs.readlinkSync(projectDirFullPath));
+		}
+		return {
+			description: `Target path "${projectDirFullPath}" is a symbolic link to "${linkedPath}"`,
+			removeLabel: "Remove symbolic link and continue"
+		};
+	}
+	if (stats.isDirectory()) return {
+		description: `Target directory "${projectDirFullPath}" is not empty`,
+		removeLabel: "Remove existing files and continue"
+	};
+	return {
+		description: `Target path "${projectDirFullPath}" already exists`,
+		removeLabel: "Remove existing path and continue"
+	};
+}
+function stripTrailingPathSeparators(targetPath) {
+	const root = path.parse(targetPath).root;
+	let end = targetPath.length;
+	while (end > root.length && targetPath[end - 1] === path.sep) end--;
+	return targetPath.slice(0, end);
+}
 async function checkProjectDirExists(projectDirFullPath, interactive) {
-	if (isTargetDirAvailable(projectDirFullPath)) return;
+	const targetPath = stripTrailingPathSeparators(projectDirFullPath);
+	const stats = fs.lstatSync(targetPath, { throwIfNoEntry: false });
+	if (!stats || stats.isDirectory() && isEmpty(targetPath)) return;
+	const { description, removeLabel } = describeExistingTarget(targetPath, stats);
 	if (!interactive) {
-		log$1.info("Use --directory to specify a different location or remove the directory first");
-		cancelAndExit(`Target directory "${projectDirFullPath}" is not empty`, 1);
+		log.info("Use --directory to specify a different location or remove the directory first");
+		cancelAndExit(description, 1);
 	}
 	const overwrite = await select({
-		message: `Target directory "${projectDirFullPath}" is not empty. Please choose how to proceed:`,
+		message: `${description}. Please choose how to proceed:`,
 		options: [{
 			label: "Cancel operation",
 			value: "no"
 		}, {
-			label: "Remove existing files and continue",
+			label: removeLabel,
 			value: "yes"
 		}]
 	});
 	if (isCancel(overwrite)) cancelAndExit();
 	switch (overwrite) {
 		case "yes":
-			emptyDir(projectDirFullPath);
+			clearTargetPath(targetPath, stats);
 			break;
 		case "no": cancelAndExit();
 	}
@@ -4352,18 +4369,37 @@ function isEmpty(path) {
 	const files = fs.readdirSync(path);
 	return files.length === 0 || files.length === 1 && files[0] === ".git";
 }
-function emptyDir(dir) {
-	if (!fs.existsSync(dir)) return;
-	for (const file of fs.readdirSync(dir)) {
+function isSameTargetEntry(expected, actual) {
+	return expected.dev === actual.dev && expected.ino === actual.ino && expected.isDirectory() === actual.isDirectory() && expected.isSymbolicLink() === actual.isSymbolicLink();
+}
+function getUnchangedTargetStats(targetPath, expected, cleanupStarted = false) {
+	const stats = fs.lstatSync(targetPath, { throwIfNoEntry: false });
+	if (!stats) return;
+	if (!isSameTargetEntry(expected, stats)) throw new Error(cleanupStarted ? `Target path "${targetPath}" changed during cleanup. Cleanup was stopped. Please inspect the target and retry the command.` : `Target path "${targetPath}" changed while waiting for confirmation. No files were removed. Please retry the command.`);
+	return stats;
+}
+function clearTargetPath(targetPath, expectedStats) {
+	const strippedTargetPath = stripTrailingPathSeparators(targetPath);
+	const stats = getUnchangedTargetStats(strippedTargetPath, expectedStats);
+	if (!stats) return;
+	if (!stats.isDirectory()) {
+		fs.unlinkSync(strippedTargetPath);
+		return;
+	}
+	const files = fs.readdirSync(strippedTargetPath);
+	for (const file of files) {
 		if (file === ".git") continue;
-		fs.rmSync(path.resolve(dir, file), {
+		if (!getUnchangedTargetStats(strippedTargetPath, expectedStats, true)) return;
+		fs.rmSync(path.resolve(strippedTargetPath, file), {
 			recursive: true,
 			force: true
 		});
 	}
 }
 function isTargetDirAvailable(projectDirFullPath) {
-	return !fs.existsSync(projectDirFullPath) || isEmpty(projectDirFullPath);
+	const targetPath = stripTrailingPathSeparators(projectDirFullPath);
+	const stats = fs.lstatSync(targetPath, { throwIfNoEntry: false });
+	return !stats || stats.isDirectory() && isEmpty(targetPath);
 }
 function validateTargetDir(input, cwd) {
 	const value = input?.trim() ?? "";
@@ -4390,8 +4426,7 @@ function validateTargetDir(input, cwd) {
 	};
 	return { directory: targetDir };
 }
-//#endregion
-//#region src/create/register-template.ts
+// src/create/register-template.ts
 /**
 * Register a local template into `create.templates` in a monorepo's root
 * `vite.config.ts`. Used after `vp create vite:generator` scaffolds a
@@ -4426,7 +4461,7 @@ async function registerLocalTemplate(workspaceRoot, entry, silent = false) {
 	});
 	const existingEntry = existing.templates.find((t) => t.name === entry.name);
 	if (existingEntry) {
-		if (existingEntry.template !== entry.template) log$1.warn(`create.templates already has an entry named '${entry.name}' pointing at '${existingEntry.template}'; left unchanged.\nUpdate it by hand if it should run '${entry.template}' instead.`);
+		if (existingEntry.template !== entry.template) log.warn(`create.templates already has an entry named '${entry.name}' pointing at '${existingEntry.template}'; left unchanged.\nUpdate it by hand if it should run '${entry.template}' instead.`);
 		return;
 	}
 	const nextCreate = {
@@ -4444,7 +4479,7 @@ async function registerLocalTemplate(workspaceRoot, entry, silent = false) {
 function ensureViteConfig(workspaceRoot, silent) {
 	const configPath = path.join(workspaceRoot, "vite.config.ts");
 	fs.writeFileSync(configPath, `import { defineConfig } from '${VITE_PLUS_NAME}';\n\nexport default defineConfig({});\n`);
-	if (!silent) log$1.success(`✔ Created vite.config.ts in ${displayRelative(configPath)}`);
+	if (!silent) log.success(`✔ Created vite.config.ts in ${displayRelative(configPath)}`);
 	return configPath;
 }
 /**
@@ -4469,10 +4504,9 @@ function writeCreateBlock(configPath, create) {
 		fs.rmSync(tempPath, { force: true });
 	}
 }
-//#endregion
-//#region src/create/templates/generator.ts
+// src/create/templates/generator.ts
 async function executeGeneratorScaffold(workspaceInfo, templateInfo, options) {
-	if (!options?.silent) log$1.step("Creating generator scaffold...");
+	if (!options?.silent) log.step("Creating generator scaffold...");
 	let description;
 	if (templateInfo.interactive) {
 		const defaultDescription = "Generate new components for our monorepo";
@@ -4495,26 +4529,25 @@ async function executeGeneratorScaffold(workspaceInfo, templateInfo, options) {
 		if (description) pkg.description = description;
 		return pkg;
 	});
-	if (!options?.silent) log$1.success("Generator scaffold created");
+	if (!options?.silent) log.success("Generator scaffold created");
 	return {
 		exitCode: 0,
 		projectDir: templateInfo.targetDir
 	};
 }
-//#endregion
-//#region src/create/templates/remote.ts
+// src/create/templates/remote.ts
 var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 const { gray, yellow } = import_picocolors.default;
 async function executeRemoteTemplate(workspaceInfo, templateInfo, options) {
 	const silent = options?.silent ?? false;
-	if (!silent) log$1.step("Generating project…");
+	if (!silent) log.step("Generating project…");
 	let isGitHubTemplate = templateInfo.command === "degit";
 	let result;
 	if (templateInfo.command === "node") {
 		const command = templateInfo.command;
 		const args = templateInfo.args;
 		const envs = templateInfo.envs;
-		if (!silent) log$1.info(`Running: ${gray(`${command} ${args.join(" ")}`)}`);
+		if (!silent) log.info(`Running: ${gray(`${command} ${args.join(" ")}`)}`);
 		result = await runCommandAndDetectProjectDir({
 			command,
 			args,
@@ -4524,7 +4557,7 @@ async function executeRemoteTemplate(workspaceInfo, templateInfo, options) {
 	} else {
 		if (!isGitHubTemplate) {
 			if (!await checkNpmPackageExists(templateInfo.command)) {
-				if (!silent) log$1.error(`Template "${templateInfo.command}" not found on npm. Run ${yellow("vp create --list")} to see available templates.`);
+				if (!silent) log.error(`Template "${templateInfo.command}" not found on npm. Run ${yellow("vp create --list")} to see available templates.`);
 				return { exitCode: 1 };
 			}
 		}
@@ -4532,13 +4565,13 @@ async function executeRemoteTemplate(workspaceInfo, templateInfo, options) {
 	}
 	const exitCode = result.exitCode;
 	if (exitCode === 127) {
-		log$1.info(yellow("\nTroubleshooting:"));
-		log$1.info(`  ${gray("•")} Command not found. Make sure Node.js is installed`);
+		log.info(yellow("\nTroubleshooting:"));
+		log.info(`  ${gray("•")} Command not found. Make sure Node.js is installed`);
 	} else if (isGitHubTemplate && exitCode !== 0) {
-		log$1.info(yellow("\nTroubleshooting:"));
-		log$1.info(`  ${gray("•")} Make sure the GitHub repository exists`);
-		log$1.info(`  ${gray("•")} Check your internet connection`);
-		log$1.info(`  ${gray("•")} Repository might be private (requires authentication)`);
+		log.info(yellow("\nTroubleshooting:"));
+		log.info(`  ${gray("•")} Make sure the GitHub repository exists`);
+		log.info(`  ${gray("•")} Check your internet connection`);
+		log.info(`  ${gray("•")} Repository might be private (requires authentication)`);
 	}
 	return result;
 }
@@ -4548,7 +4581,7 @@ async function runRemoteTemplateCommand(workspaceInfo, cwd, templateInfo, detect
 	const execArgs = [...templateInfo.args];
 	const envs = templateInfo.envs;
 	const { command, args } = formatDlxCommand(remotePackageName, execArgs, workspaceInfo);
-	if (!silent) log$1.info(`Running: ${gray(`${command} ${args.join(" ")}`)}`);
+	if (!silent) log.info(`Running: ${gray(`${command} ${args.join(" ")}`)}`);
 	if (detectCreatedProjectDir) return await runCommandAndDetectProjectDir({
 		command,
 		args,
@@ -4588,8 +4621,7 @@ function autoFixRemoteTemplateCommand(templateInfo, workspaceInfo) {
 		else if (packageName === "@tanstack/cli") templateInfo.args.push("--no-git");
 	}
 }
-//#endregion
-//#region src/create/templates/monorepo.ts
+// src/create/templates/monorepo.ts
 const InitialMonorepoAppDir = "apps/website";
 async function executeMonorepoTemplate(workspaceInfo, templateInfo, options) {
 	assert(templateInfo.packageName, "packageName is required");
@@ -4597,8 +4629,8 @@ async function executeMonorepoTemplate(workspaceInfo, templateInfo, options) {
 	workspaceInfo.monorepoScope = getScopeFromPackageName(templateInfo.packageName);
 	const fullPath = path.join(workspaceInfo.rootDir, templateInfo.targetDir);
 	if (!options?.silent) {
-		log$1.info(`Target directory: ${formatDisplayTargetDir(templateInfo.targetDir)}`);
-		log$1.step("Creating Vite+ monorepo...");
+		log.info(`Target directory: ${formatDisplayTargetDir(templateInfo.targetDir)}`);
+		log.step("Creating Vite+ monorepo...");
 	}
 	copyDir(path.join(templatesDir, "monorepo"), fullPath);
 	renameFiles(fullPath);
@@ -4631,8 +4663,8 @@ async function executeMonorepoTemplate(workspaceInfo, templateInfo, options) {
 		const yarnrcPath = path.join(fullPath, ".yarnrc.yml");
 		if (fs.existsSync(yarnrcPath)) fs.unlinkSync(yarnrcPath);
 	}
-	if (!options?.silent) log$1.success("Monorepo template created");
-	if (!options?.silent) log$1.step("Creating default application in apps/website...");
+	if (!options?.silent) log.success("Monorepo template created");
+	if (!options?.silent) log.step("Creating default application in apps/website...");
 	const appResult = await runRemoteTemplateCommand(workspaceInfo, fullPath, discoverTemplate("create-vite@latest", [
 		InitialMonorepoAppDir,
 		"--template",
@@ -4640,7 +4672,7 @@ async function executeMonorepoTemplate(workspaceInfo, templateInfo, options) {
 		"--no-interactive"
 	], workspaceInfo), false, options?.silent ?? false);
 	if (appResult.exitCode !== 0) {
-		log$1.error(`Failed to create default application: ${appResult.exitCode}`);
+		log.error(`Failed to create default application: ${appResult.exitCode}`);
 		return appResult;
 	}
 	const appPackageName = workspaceInfo.monorepoScope ? `${workspaceInfo.monorepoScope}/website` : "website";
@@ -4648,11 +4680,11 @@ async function executeMonorepoTemplate(workspaceInfo, templateInfo, options) {
 	setPackageName(appProjectPath, appPackageName);
 	rewriteMonorepoProject(appProjectPath, workspaceInfo.packageManager, void 0, options?.silent ?? false);
 	dropAliasedRuntimeDevDeps(appProjectPath, workspaceInfo.packageManager);
-	if (!options?.silent) log$1.step("Creating default library in packages/utils...");
+	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);
 	if (libraryResult.exitCode !== 0) {
-		log$1.error(`Failed to create default library, exit code: ${libraryResult.exitCode}`);
+		log.error(`Failed to create default library, exit code: ${libraryResult.exitCode}`);
 		return libraryResult;
 	}
 	const libraryPackageName = workspaceInfo.monorepoScope ? `${workspaceInfo.monorepoScope}/utils` : "utils";
@@ -4739,8 +4771,7 @@ function dropAliasedRuntimeDevDeps(appProjectPath, packageManager) {
 		return changed ? pkg : void 0;
 	});
 }
-//#endregion
-//#region src/create/templates/builtin.ts
+// src/create/templates/builtin.ts
 async function executeBuiltinTemplate(workspaceInfo, templateInfo, options) {
 	assert(templateInfo.targetDir, "targetDir is required");
 	assert(templateInfo.packageName, "packageName is required");
@@ -4762,7 +4793,7 @@ async function executeBuiltinTemplate(workspaceInfo, templateInfo, options) {
 		};
 	}
 	if (templateInfo.command.startsWith("vite:")) {
-		if (!options?.silent) log$1.error(`Unknown builtin template "${templateInfo.command}". Run ${import_picocolors.default.yellow("vp create --list")} to see available templates.`);
+		if (!options?.silent) log.error(`Unknown builtin template "${templateInfo.command}". Run ${import_picocolors.default.yellow("vp create --list")} to see available templates.`);
 		return { exitCode: 1 };
 	}
 	const result = await runRemoteTemplateCommand(workspaceInfo, workspaceInfo.rootDir, templateInfo, false, options?.silent ?? false);
@@ -4773,8 +4804,7 @@ async function executeBuiltinTemplate(workspaceInfo, templateInfo, options) {
 		projectDir: templateInfo.targetDir
 	};
 }
-//#endregion
-//#region src/create/templates/bundled.ts
+// src/create/templates/bundled.ts
 /**
 * Scaffold a bundled template by copying the pre-extracted directory at
 * `localPath` into `workspaceInfo.rootDir/targetDir`.
@@ -4799,8 +4829,7 @@ async function executeBundledTemplate(workspaceInfo, templateInfo) {
 		projectDir: templateInfo.targetDir
 	};
 }
-//#endregion
-//#region src/create/bin.ts
+// src/create/bin.ts
 const listTemplatesMessage = renderCliDoc({
 	usage: "vp create --list",
 	summary: "List available builtin and popular project templates.",
@@ -4941,15 +4970,15 @@ function getCopilotSetupRoot(projectRoot, isExistingMonorepo) {
 }
 function showCreateSummary(options) {
 	const { description, gitInitialized, installSummary, nextCommand, packageManager, packageManagerVersion, projectDir } = options;
-	log(`${styleText("magenta", "◇")} Scaffolded ${accent(projectDir)}${description ? ` with ${description}` : ""}`);
-	log(`${styleText("gray", "•")} Node ${process.versions.node}  ${packageManager} ${packageManagerVersion}`);
-	if (installSummary?.status === "installed") log(`${styleText("green", "✓")} Dependencies installed in ${formatDuration(installSummary.durationMs)}`);
+	log$1(`${styleText("magenta", "◇")} Scaffolded ${accent(projectDir)}${description ? ` with ${description}` : ""}`);
+	log$1(`${styleText("gray", "•")} Node ${process.versions.node}  ${packageManager} ${packageManagerVersion}`);
+	if (installSummary?.status === "installed") log$1(`${styleText("green", "✓")} Dependencies installed in ${formatDuration(installSummary.durationMs)}`);
 	if (gitInitialized) {
 		const git = !projectDir || projectDir === "." ? "git" : `git -C ${formatProjectDirArgument(projectDir)}`;
 		const gitCommand = `${git} add -A && ${git} commit -m "chore: initial commit"`;
-		log(`${styleText("blue", "→")} Git (optional): ${accent(gitCommand)}`);
+		log$1(`${styleText("blue", "→")} Git (optional): ${accent(gitCommand)}`);
 	}
-	log(`${styleText("blue", "→")} Next: ${accent(nextCommand)}`);
+	log$1(`${styleText("blue", "→")} Next: ${accent(nextCommand)}`);
 }
 async function main() {
 	const { templateName, options, templateArgs } = parseArgs();
@@ -4964,7 +4993,7 @@ async function main() {
 	if (options.directory) {
 		const formatted = formatTargetDir(options.directory);
 		if (formatted.error) {
-			log$1.error(formatted.error);
+			log.error(formatted.error);
 			cancelAndExit("The --directory option is invalid", 1);
 		}
 		targetDir = formatted.directory;
@@ -4998,7 +5027,7 @@ async function main() {
 		if (!selectedTemplateName && configuredCreate.defaultTemplate) selectedTemplateName = configuredCreate.defaultTemplate;
 	} catch (error) {
 		if (error instanceof CreateConfigSchemaError) cancelAndExit(error.message, 1);
-		log$1.warn(`Could not read \`create\` config from the workspace vite.config (${error.message}); local templates are unavailable`);
+		log.warn(`Could not read \`create\` config from the workspace vite.config (${error.message}); local templates are unavailable`);
 	}
 	else if (!selectedTemplateName) {
 		let defaultTemplate;
@@ -5061,15 +5090,15 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 	if (!isDirectScaffoldTemplate) compactOutput = false;
 	if (targetDir && !isDirectScaffoldTemplate) cancelAndExit("The --directory option is only available for builtin and bundled @org templates", 1);
 	if (selectedTemplateName === BuiltinTemplate.monorepo && isMonorepo) {
-		log$1.info("You are already in a monorepo workspace.\nUse a different template or run this command outside the monorepo");
+		log.info("You are already in a monorepo workspace.\nUse a different template or run this command outside the monorepo");
 		cancelAndExit("Cannot create a monorepo inside an existing monorepo", 1);
 	}
 	if (selectedTemplateName === BuiltinTemplate.generator && !isMonorepo) {
-		log$1.info("The vite:generator template requires a monorepo workspace.\nRun this command inside a Vite+ monorepo, or create one first with `vp create vite:monorepo`");
+		log.info("The vite:generator template requires a monorepo workspace.\nRun this command inside a Vite+ monorepo, or create one first with `vp create vite:monorepo`");
 		cancelAndExit("Cannot create a generator outside a monorepo", 1);
 	}
 	if (isMonorepo && options.git !== void 0) cancelAndExit("The --git/--no-git options are not available when adding a package to an existing monorepo", 1);
-	if (isInSubdirectory && !compactOutput) log$1.info(`Detected monorepo root at ${accent(workspaceInfoOptional.rootDir)}`);
+	if (isInSubdirectory && !compactOutput) log.info(`Detected monorepo root at ${accent(workspaceInfoOptional.rootDir)}`);
 	if (isMonorepo && options.interactive && !targetDir) {
 		let parentDir;
 		if (workspaceInfoOptional.parentDirs.length > 0 || isInSubdirectory) {
@@ -5111,7 +5140,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 		selectedParentDir = parentDir;
 	}
 	if (isMonorepo && !options.interactive && !targetDir) {
-		if (isInSubdirectory && !compactOutput) log$1.info(`Use ${accent("--directory")} to specify a different target location.`);
+		if (isInSubdirectory && !compactOutput) log.info(`Use ${accent("--directory")} to specify a different target location.`);
 		selectedParentDir = inferParentDir(selectedTemplateName, workspaceInfoOptional, isLocalTemplate) ?? workspaceInfoOptional.parentDirs[0];
 	}
 	if (isGitHubUrl(selectedTemplateName)) {
@@ -5120,7 +5149,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 			const inferredTargetDir = inferGitHubRepoName(selectedTemplateName) ?? "template";
 			const remoteTargetBaseDir = selectedParentDir ? path.join(workspaceInfoOptional.rootDir, selectedParentDir) : workspaceInfoOptional.rootDir;
 			const defaultTargetDir = suggestAvailableTargetDir(inferredTargetDir, remoteTargetBaseDir);
-			if (defaultTargetDir !== inferredTargetDir && options.interactive) log$1.info(`  Target directory "${inferredTargetDir}" already exists. Suggested: ${accent(defaultTargetDir)}`);
+			if (defaultTargetDir !== inferredTargetDir && options.interactive) log.info(`  Target directory "${inferredTargetDir}" already exists. Suggested: ${accent(defaultTargetDir)}`);
 			remoteTargetDir = await promptTargetDir(defaultTargetDir, options.interactive, { cwd: remoteTargetBaseDir });
 			selectedTemplateArgs = [remoteTargetDir, ...selectedTemplateArgs];
 		}
@@ -5135,7 +5164,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 				if (enclosingPackage) cancelAndExit(`Cannot scaffold inside existing package "${enclosingPackage.name}" (${enclosingPackage.path}). Use --directory to specify a different location`, 1);
 				targetDir = cwdRelativeToRoot;
 			}
-			log$1.info(`Using package name: ${accent(packageName)}`);
+			log.info(`Using package name: ${accent(packageName)}`);
 		} else if (selectedTemplateName === BuiltinTemplate.monorepo) {
 			const selected = await promptPackageNameAndTargetDir(getRandomProjectName({ fallbackName: "vite-plus-monorepo" }), options.interactive);
 			packageName = selected.packageName;
@@ -5394,7 +5423,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 				template: generatorTemplatePath
 			}, compactOutput);
 		} catch (error) {
-			log$1.warn(`Could not register the generator in create.templates (${error.message}).\nAdd it by hand: { name: '${generatorName || path.basename(projectDir)}', template: '${generatorTemplatePath}' }`);
+			log.warn(`Could not register the generator in create.templates (${error.message}).\nAdd it by hand: { name: '${generatorName || path.basename(projectDir)}', template: '${generatorTemplatePath}' }`);
 		}
 		resumeCreateProgress();
 	}
@@ -5451,7 +5480,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 		resumeCreateProgress();
 	};
 	if (isMonorepo) {
-		if (!compactOutput) log$1.step("Monorepo integration...");
+		if (!compactOutput) log.step("Monorepo integration...");
 		if (workspaceInfo.packages.length > 0) {
 			if (options.interactive) {
 				pauseCreateProgress();
@@ -5487,7 +5516,10 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 		if (shouldMigrateLintFmtTools) await installAndMigrate(workspaceInfo.rootDir);
 		updateCreateProgress("Integrating into monorepo");
 		const skipStagedMigration = shouldSkipStagedMigrationForHooks(fullPath, shouldSetupHooks, workspaceInfo.packageManager);
-		rewriteMonorepoProject(fullPath, workspaceInfo.packageManager, skipStagedMigration, compactOutput, void 0, workspaceInfo.packageManager === PackageManager.pnpm ? createCatalogDependencyResolver(workspaceInfo.rootDir, workspaceInfo.packageManager) : void 0);
+		rewriteMonorepoProject(fullPath, workspaceInfo.packageManager, skipStagedMigration, compactOutput, void 0, workspaceInfo.packageManager === PackageManager.pnpm ? createCatalogDependencyResolver(workspaceInfo.rootDir, workspaceInfo.packageManager) : void 0, {
+			rootDir: workspaceInfo.rootDir,
+			packages: discoverWorkspacePackages([...workspaceInfo.workspacePatterns, projectDir], workspaceInfo.rootDir)
+		});
 		if (workspaceInfo.packageManager === PackageManager.pnpm) ensurePnpmCreateCatalogEntries(workspaceInfo.rootDir, fullPath);
 		for (const framework of detectFramework(fullPath)) if (!hasFrameworkShim(fullPath, framework)) addFrameworkShim(fullPath, framework);
 		updateCreateProgress("Installing dependencies");
@@ -5538,12 +5570,11 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 }
 async function showAvailableTemplates() {
 	printHeader();
-	log(listTemplatesMessage);
+	log$1(listTemplatesMessage);
 }
 main().catch((err) => {
-	log$1.error(err.message);
+	log.error(err.message);
 	console.error(err);
 	cancelAndExit(`Failed to generate code: ${err.message}`, 1);
 });
-//#endregion
 export {};