vite-plus 0.3.3 → 1.0.0-rc.1

package/dist/create/bin.js

@@ -1,14 +1,15 @@
 import { r as __toESM, t as __commonJSMin } from "../rolldown-runtime-CMFfr-1z.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 { u as VITE_PLUS_NAME } from "../constants-C2dTOTe-.js";
-import { i as readJsonFile, n as editJsonFile } from "../json-cULBl7Pi.js";
-import { o as fetchNpmResource, r as getScopeFromPackageName, s as getNpmRegistry, t as checkNpmPackageExists } from "../package-CHH8jWan.js";
-import { i as hasViteConfig, o as resolveViteConfig, r as findWorkspaceRoot, t as findViteConfig } from "../resolve-vite-config-BqvS2P98.js";
-import { C as multiselect, D as text, E as spinner, O as require_picocolors, S as log$1, T as select, a as resolveGitInit, c as selectPackageManager, d as readYamlFile, h as resolveApproveBuildTargets, i as promptGitHooks, k as isCancel, 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, x as intro, y as PackageManager } from "../prompts-k14KgthC.js";
-import { t as require_semver } from "../semver-CaDAb8vV.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-Cu6-tXIP.js";
-import { F as addFrameworkShim, I as detectFramework, K as promptPrettierMigration, L as hasFrameworkShim, M as isBingoTemplate, N as updatePackageJsonWithDeps, P as updateWorkspaceConfig, Q as promptEslintMigration, S as injectCreateDefaultTemplate, V as promptTsupMigration, W as detectPrettierProject, Y as detectEslintProject, _ as installGitHooks, a as selectEditors, b as findGitRoot, c as rewriteMonorepoProject, h as setPackageManager, j as detectWorkspace$1, l as rewriteStandaloneProject, n as detectExistingEditors, o as writeEditorConfigs, s as rewriteMonorepo, x as initGitRepository, y as shouldSkipStagedMigrationForHooks, z as detectTsupProject } from "../editor-4sjlHmUh.js";
+import { u as VITE_PLUS_NAME } from "../constants-BAsBfS1J.js";
+import { i as readJsonFile, n as editJsonFile } from "../json-JP24qHUF.js";
+import { o as fetchNpmResource, r as getScopeFromPackageName, s as getNpmRegistry, t as checkNpmPackageExists } from "../package-BrupPpWA.js";
+import { i as hasViteConfig, o as resolveViteConfig, r as findWorkspaceRoot, t as findViteConfig } from "../resolve-vite-config-DcsMQaYy.js";
+import { C as multiselect, D as text, E as spinner, O as require_picocolors, S as log$1, T as select, a as resolveGitInit, c as selectPackageManager, d as readYamlFile, h as resolveApproveBuildTargets, i as promptGitHooks, k as isCancel, 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, x as intro, y as PackageManager } from "../prompts-BW7_fDGJ.js";
+import { n as require_semver } from "../dist-BWiANxFS.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-DIwEez_1.js";
+import { 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-DWgrWTbN.js";
 import { n as runCommandSilently, t as runCommand$1 } from "../command-CguLh2KL.js";
 import { t as unwrapCliParseOutcome } from "../cli-parse-DHE8NrBU.js";
 import path from "node:path";
@@ -618,6 +619,7 @@ var CreateConfigSchemaError = class extends Error {
 		this.name = "CreateConfigSchemaError";
 	}
 };
+const makeCreateConfigError = (message) => new CreateConfigSchemaError(message);
 /**
 * Validate `create.templates` from `vite.config.ts`. Returns `[]` when the field
 * is absent or an empty array; throws {@link CreateConfigSchemaError} when present
@@ -626,10 +628,9 @@ var CreateConfigSchemaError = class extends Error {
 function validateCreateTemplates(templates) {
 	if (templates === void 0) return [];
 	if (!Array.isArray(templates)) throw new CreateConfigSchemaError("create.templates must be an array");
-	const makeError = (message) => new CreateConfigSchemaError(message);
-	return validateTemplateEntries(templates, "create.templates", makeError, (entry, index) => {
-		const validated = validateTemplateEntry(entry, index, "create.templates", makeError);
-		if (validated.name.startsWith("vite:")) throw makeError(`create.templates[${index}].name uses the reserved \`vite:\` prefix`);
+	return validateTemplateEntries(templates, "create.templates", makeCreateConfigError, (entry, index) => {
+		const validated = validateTemplateEntry(entry, index, "create.templates", makeCreateConfigError);
+		if (validated.name.startsWith("vite:")) throw makeCreateConfigError(`create.templates[${index}].name uses the reserved \`vite:\` prefix`);
 		return validated;
 	});
 }
@@ -4379,6 +4380,11 @@ async function executeGeneratorScaffold(workspaceInfo, templateInfo, options) {
 	fs.chmodSync(path.join(fullPath, "bin/index.ts"), "755");
 	editJsonFile(path.join(fullPath, "package.json"), (pkg) => {
 		pkg.name = templateInfo.packageName;
+		if (!supportsCatalog(workspaceInfo.packageManager, workspaceInfo.downloadPackageManager.version, workspaceInfo.isMonorepo)) {
+			const { catalog } = readYamlFile(path.join(templatesDir, "monorepo/pnpm-workspace.yaml"));
+			const devDependencies = pkg.devDependencies;
+			for (const [name, spec] of Object.entries(devDependencies)) if (spec === "catalog:" && catalog[name]) devDependencies[name] = catalog[name];
+		}
 		if (description) pkg.description = description;
 		return pkg;
 	});
@@ -4691,7 +4697,7 @@ async function executeBundledTemplate(workspaceInfo, templateInfo) {
 const listTemplatesMessage = renderCliDoc({
 	usage: "vp create --list",
 	summary: "List available builtin and popular project templates.",
-	documentationUrl: "https://viteplus.dev/guide/create",
+	documentationUrl: documentationUrl$1("/guide/create"),
 	sections: [
 		{
 			title: "Vite+ Built-in Templates",

package/dist/{define-config-IgzmnvvV.js → define-config-Bz6dc3fm.js}

@@ -1,10 +1,11 @@
-import { c as VITEST_VERSION, r as CONFIG_METADATA_ENV } from "./constants-C2dTOTe-.js";
+import { c as VITEST_VERSION, r as CONFIG_METADATA_ENV } from "./constants-BAsBfS1J.js";
+import { t as VITEST_RESOLVER_PACKAGES } from "./vitest-ecosystem-BU0AqZq-.js";
 import { createRequire } from "node:module";
-import path from "node:path";
+import path, { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { readFileSync } from "node:fs";
 import { defineConfig, defineProject } from "vitest/config";
-//#region ../../node_modules/.pnpm/tsdown@0.23.0_@arethetypeswrong+core@0.18.2_@tsdown+css@0.23.0_@tsdown+exe@0.23.0_@type_298964156353ef75a02894ab80b3a2e6/node_modules/tsdown/esm-shims.js
+//#region ../../node_modules/.pnpm/tsdown@0.23.0_@arethetypeswrong+core@0.18.2_@tsdown+css@0.23.0_@tsdown+exe@0.23.0_@type_540e13d22e6879071cae9cd3610e4dea/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -43,10 +44,9 @@ const vitePlusRequire = createRequire(typeof __dirname !== "undefined" ? __dirna
 const vitePlusModuleFile = fileURLToPath(import.meta.url);
 /**
 * Absolute path to the bundled `vitest` package's `package.json`, used as a
-* second `this.resolve` importer. The nested `@vitest/*` family (`@vitest/expect`,
-* `@vitest/runner`, `@vitest/snapshot`, …) are dependencies of `vitest` itself —
-* not direct deps of `vite-plus` — so under pnpm's isolated layout they are
-* reachable from `vitest`'s location but not from [[vitePlusModuleFile]].
+* second `this.resolve` importer. Supported transitive packages can be
+* reachable from `vitest`'s location but not from [[vitePlusModuleFile]]
+* under pnpm's isolated layout.
 * Resolving `package.json` is condition-agnostic, so this is safe with
 * `require.resolve`. Cached; `null` once an attempt has failed so we never retry.
 */
@@ -60,6 +60,19 @@ function getVitestAnchor() {
 	}
 	return vitestAnchor;
 }
+let vitestExports;
+function getVitestImportTarget(id) {
+	const anchor = getVitestAnchor();
+	if (!anchor) throw new Error("Cannot resolve the bundled Vitest package. Reinstall vite-plus.");
+	vitestExports ??= JSON.parse(readFileSync(anchor, "utf8")).exports;
+	let target = vitestExports[id === "vitest" ? "." : `.${id.slice(6)}`];
+	while (target && typeof target === "object") {
+		const conditions = target;
+		target = conditions.import ?? conditions.default;
+	}
+	if (typeof target !== "string" || !target.startsWith("./")) throw new Error(`The bundled Vitest has no ESM export for ${id}.`);
+	return resolve(anchor, "..", target);
+}
 /**
 * Match the `vitest` / `@vitest/*` family of bare specifiers — the imports a
 * browser-mode Vite dev server must resolve. Any query string is stripped
@@ -70,7 +83,9 @@ function getVitestAnchor() {
 function isVitestFamilySpecifier(id) {
 	const bare = id.split("?")[0];
 	if (bare.startsWith(".") || bare.startsWith("/") || bare.startsWith("\0")) return false;
-	return bare === "vitest" || bare.startsWith("vitest/") || bare === "@vitest/browser" || bare.startsWith("@vitest/");
+	const segments = bare.split("/");
+	const packageName = bare.startsWith("@") ? segments.slice(0, 2).join("/") : segments[0];
+	return VITEST_RESOLVER_PACKAGES.has(packageName);
 }
 /**
 * Rescue `vitest` / `@vitest/*` resolution for browser-mode tests.
@@ -79,10 +94,10 @@ function isVitestFamilySpecifier(id) {
 * and `@vitest/browser` are transitive deps. pnpm's isolated layout only
 * exposes a package's *direct* deps, so the browser-mode Vite dev server
 * (rooted at the consumer project) cannot resolve `vitest/internal/browser`,
-* `@vitest/expect`, etc. Non-browser tests are unaffected — vitest's own
+* `@vitest/mocker`, etc. Non-browser tests are unaffected — vitest's own
 * module runner handles resolution there.
 *
-* This plugin re-resolves the `vitest` / `@vitest/*` family through Vite's OWN
+* This plugin re-resolves the explicit Vitest runtime allowlist through Vite's OWN
 * resolver, but ROOTED at `vite-plus`'s location ([[vitePlusModuleFile]]) and
 * then the bundled `vitest`'s location ([[getVitestAnchor]]) BEFORE the
 * project. So every such import binds to the same physical (pinned) Vitest that
@@ -123,10 +138,61 @@ function isVitestFamilySpecifier(id) {
 *     [[vitePlusCoverageVersionGuardPlugin]] fails fast on a mismatch instead.
 */
 function vitePlusVitestResolverPlugin() {
+	let isVitestServer = false;
 	return {
 		name: "vite-plus:vitest-resolver",
 		enforce: "pre",
+		config: {
+			order: "post",
+			handler(config, { command }) {
+				isVitestServer = command === "serve" && !!config.environments?.["__vitest__"];
+				if (!isVitestServer || !config.test?.browser?.enabled) return;
+				const aliases = config.resolve?.alias;
+				const entries = Array.isArray(aliases) ? [...aliases] : Object.entries(aliases ?? {}).map(([find, replacement]) => ({
+					find,
+					replacement
+				}));
+				const runtimeRequire = createRequire(getVitestAnchor());
+				const targets = new Map([
+					"vitest",
+					"vitest/internal/browser",
+					"vitest/internal/traces",
+					"expect-type",
+					"magic-string",
+					"chai",
+					"vite/module-runner"
+				].map((id) => [id, id.startsWith("vitest") ? getVitestImportTarget(id) : runtimeRequire.resolve(id)]));
+				if (config.test.browser.provider?.name === "preview") {
+					const previewRequire = createRequire(vitePlusRequire.resolve("@vitest/browser-preview"));
+					for (const id of ["@testing-library/user-event", "@testing-library/dom"]) targets.set(id, previewRequire.resolve(id));
+				}
+				for (const [id, replacement] of targets) {
+					if (entries.some(({ find }) => typeof find === "string" ? id === find || id.startsWith(`${find}/`) : new RegExp(find).test(id))) continue;
+					entries.push({
+						find: new RegExp(`^${id}$`),
+						replacement
+					});
+				}
+				config.resolve ??= {};
+				config.resolve.alias = entries;
+			}
+		},
+		configResolved(config) {
+			const seen = /* @__PURE__ */ new Set();
+			const plugins = config.plugins;
+			const unique = plugins.filter((plugin) => {
+				if (!VITE_PLUS_TEST_PLUGIN_NAMES.has(plugin.name)) return true;
+				if (seen.has(plugin.name)) return false;
+				seen.add(plugin.name);
+				return true;
+			});
+			plugins.splice(0, plugins.length, ...unique);
+		},
 		async resolveId(id, importer, options) {
+			if (isVitestServer && id === "vite-plus/test") return this.resolve("vitest", importer, {
+				...options,
+				skipSelf: true
+			});
 			if (!isVitestFamilySpecifier(id)) return null;
 			if (id.includes("?")) return null;
 			const vitestAnchorPath = getVitestAnchor();
@@ -157,10 +223,9 @@ function vitePlusVitestResolverPlugin() {
 * Absent packages are silently skipped so the server-deps optimizer never
 * tries to resolve a name that does not exist in the project's node_modules.
 *
-* The check is deferred to a `configResolved` plugin hook so that
-* `resolvedConfig.root` points at the actual project root (the value vite has
-* already normalised), rather than relying on `process.cwd()` at config-load
-* time (which can differ in workspace / monorepo setups).
+* The environment hook adds installed packages to the module-runner options
+* inherited by shared-server projects. The resolved-config hook also handles
+* independent project servers, using each project's resolved root.
 *
 * Exported for unit testing.
 */
@@ -179,18 +244,26 @@ const AUTO_INLINE_DEPS = [
 *
 * Exported for unit testing. The `_createRequire` parameter lets tests inject
 * a controlled resolver without needing to spy on Node's ESM module namespace.
+* Callers may share installation results for the same root within one config load.
 */
-function computeAutoInlineList(existingInline, projectRoot, _createRequire = createRequire) {
+function computeAutoInlineList(existingInline, projectRoot, _createRequire = createRequire, installedPackages = /* @__PURE__ */ new Map()) {
 	if (existingInline === true) return null;
-	const projectRequire = _createRequire(`${projectRoot}/package.json`);
+	let projectRequire;
 	const merged = Array.isArray(existingInline) ? [...existingInline] : [];
 	for (const pkg of AUTO_INLINE_DEPS) {
 		if (merged.some((entry) => entry === pkg || entry instanceof RegExp && entry.test(pkg))) continue;
-		try {
-			projectRequire.resolve(pkg);
-		} catch {
-			continue;
+		let installed = installedPackages.get(pkg);
+		if (installed === void 0) {
+			projectRequire ??= _createRequire(`${projectRoot}/package.json`);
+			try {
+				projectRequire.resolve(pkg);
+				installed = true;
+			} catch {
+				installed = false;
+			}
+			installedPackages.set(pkg, installed);
 		}
+		if (!installed) continue;
 		merged.push(pkg);
 	}
 	const hadEntries = Array.isArray(existingInline) ? existingInline.length : 0;
@@ -198,18 +271,47 @@ function computeAutoInlineList(existingInline, projectRoot, _createRequire = cre
 	return merged;
 }
 function vitePlusAutoInlineMatcherPlugin() {
+	let projectRoot = "";
+	let isVitestServer = false;
+	const installedByRoot = /* @__PURE__ */ new Map();
+	function inlineList(existing, root) {
+		root = resolve(root);
+		let installed = installedByRoot.get(root);
+		if (!installed) {
+			installed = /* @__PURE__ */ new Map();
+			installedByRoot.set(root, installed);
+		}
+		return computeAutoInlineList(existing, root, createRequire, installed);
+	}
 	return {
 		name: "vite-plus:auto-inline-matcher-deps",
 		enforce: "pre",
+		config: {
+			order: "post",
+			handler(config, { command }) {
+				isVitestServer = command === "serve" && !!config.environments?.["__vitest__"];
+				projectRoot = resolve(config.root ?? ".");
+				installedByRoot.clear();
+			}
+		},
+		configEnvironment(_name, config) {
+			if (!isVitestServer) return;
+			const existing = config.resolve?.noExternal;
+			const merged = inlineList(typeof existing === "string" || existing instanceof RegExp ? [existing] : existing, projectRoot);
+			if (merged !== null) {
+				config.resolve ??= {};
+				config.resolve.noExternal = merged;
+			}
+		},
 		configResolved(resolvedConfig) {
-			const testConfig = resolvedConfig.test;
-			const merged = computeAutoInlineList(testConfig?.server?.deps?.inline, resolvedConfig.root);
-			if (merged === null) return;
-			if (!testConfig) resolvedConfig.test = { server: { deps: { inline: merged } } };
-			else {
-				if (!testConfig.server) testConfig.server = {};
-				if (!testConfig.server.deps) testConfig.server.deps = {};
-				testConfig.server.deps.inline = merged;
+			if (!isVitestServer) return;
+			const config = resolvedConfig;
+			const merged = inlineList(config.test?.server?.deps?.inline, config.root);
+			if (merged !== null) {
+				config.test ??= {};
+				config.test.server ??= {};
+				config.test.server.deps ??= {};
+				config.test.server.deps.inline = merged;
 			}
 		}
 	};
@@ -340,6 +442,19 @@ function vitePlusCoverageVersionGuardPlugin() {
 * an optional `test.server.deps.inline`), so a shared helper keeps the
 * wiring consistent.
 */
+const VITE_PLUS_TEST_PLUGIN_NAMES = /* @__PURE__ */ new Set([
+	"vite-plus:vitest-resolver",
+	"vite-plus:auto-inline-matcher-deps",
+	"vite-plus:coverage-version-guard"
+]);
+function withoutVitePlusTestPlugins(plugin) {
+	if (Array.isArray(plugin)) return plugin.filter(keepUserPlugin).map(withoutVitePlusTestPlugins);
+	if (plugin instanceof Promise) return plugin.then(withoutVitePlusTestPlugins);
+	return plugin && VITE_PLUS_TEST_PLUGIN_NAMES.has(plugin.name) ? false : plugin;
+}
+function keepUserPlugin(plugin) {
+	return !plugin || !("name" in plugin) || !VITE_PLUS_TEST_PLUGIN_NAMES.has(plugin.name);
+}
 function injectPluginIntoInlineConfig(config) {
 	return {
 		...config,
@@ -347,15 +462,13 @@ function injectPluginIntoInlineConfig(config) {
 			vitePlusVitestResolverPlugin(),
 			vitePlusAutoInlineMatcherPlugin(),
 			vitePlusCoverageVersionGuardPlugin(),
-			...config.plugins ?? []
+			...(config.plugins ?? []).filter(keepUserPlugin).map(withoutVitePlusTestPlugins)
 		]
 	};
 }
 /**
-* Walk `config.test?.projects` and inject the vite-plus plugins into each
-* project entry. Vitest spins up an independent Vite pipeline per project, so
-* root-level plugins do NOT propagate — without this, files matched by a
-* project's `include` glob never get the vitest resolver / auto-inline plugins.
+* Inline projects inherit root plugins by default in Vitest v5. Only projects
+* with inheritance disabled or an external base need their own injection.
 *
 * Entry shapes (from `TestProjectConfiguration`):
 *   - string  (glob path like `'./packages/*'`)  → passed through unchanged.
@@ -377,15 +490,18 @@ function injectPluginIntoProject(project) {
 	if (typeof project === "function") {
 		const wrapped = (env) => {
 			const result = project(env);
-			if (result instanceof Promise) return result.then(injectPluginIntoInlineConfig);
-			return injectPluginIntoInlineConfig(result);
+			if (result instanceof Promise) return result.then(injectIndependentProject);
+			return injectIndependentProject(result);
 		};
 		return wrapped;
 	}
-	if (project instanceof Promise) return project.then(injectPluginIntoInlineConfig);
-	if (typeof project === "object" && project !== null) return injectPluginIntoInlineConfig(project);
+	if (project instanceof Promise) return project.then(injectIndependentProject);
+	if (typeof project === "object" && project !== null) return injectIndependentProject(project);
 	return project;
 }
+function injectIndependentProject(config) {
+	return config.extends === false || typeof config.extends === "string" ? injectPlugin(config) : config;
+}
 function injectPlugin(config) {
 	const injected = injectPluginIntoInlineConfig(config);
 	const projects = injected.test?.projects;
@@ -407,22 +523,28 @@ function injectPluginIntoConfig(config) {
 	if (config instanceof Promise) return config.then(injectPlugin);
 	return injectPlugin(config);
 }
+/**
+* Keep a single generic signature so callback returns receive one contextual
+* config type. Separate sync and async overloads make TypeScript widen nested
+* literals in async callbacks before overload resolution (for example, an
+* Oxlint rule severity of `'warn'` becomes `string`).
+*/
 function defineConfig$1(config) {
 	return defineConfig(injectPluginIntoConfig(config));
 }
 /**
 * Inject the vite-plus plugins into a `defineProject` export. A project config
-* (`UserWorkspaceConfig`) cannot itself nest `test.projects`, so this only
-* touches the top-level `plugins` array (no project recursion like
-* [[injectPluginIntoConfig]] does).
+* (`UserWorkspaceConfig`) can itself declare nested projects in v5. Referenced
+* configs own a Vite server, so inject at their root and apply inheritance rules
+* to their inline children.
 */
 function injectPluginIntoProjectExport(config) {
 	if (typeof config === "function") return (env) => {
 		const result = config(env);
-		return result instanceof Promise ? result.then(injectPluginIntoInlineConfig) : injectPluginIntoInlineConfig(result);
+		return result instanceof Promise ? result.then(injectPlugin) : injectPlugin(result);
 	};
-	if (config instanceof Promise) return config.then(injectPluginIntoInlineConfig);
-	return injectPluginIntoInlineConfig(config);
+	if (config instanceof Promise) return config.then(injectPlugin);
+	return injectPlugin(config);
 }
 function defineProject$1(config) {
 	return defineProject(injectPluginIntoProjectExport(config));