vite-plus 0.3.1 → 0.3.2

package/dist/create/bin.js

@@ -1,13 +1,14 @@
 import { r as __toESM, t as __commonJSMin } from "../rolldown-runtime-CMFfr-1z.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-0IAVgpox.js";
+import { u as VITE_PLUS_NAME } from "../constants-IhOditRA.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-BZz2Ij68.js";
-import { i as hasViteConfig, o as resolveViteConfig, r as findWorkspaceRoot, t as findViteConfig } from "../resolve-vite-config-CGks1xR7.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-CtzEgFY-.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-C5jMYVfB.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-B5-lvRaU.js";
+import { o as fetchNpmResource, r as getScopeFromPackageName, s as getNpmRegistry, t as checkNpmPackageExists } from "../package-BB-Jh_z3.js";
+import { i as hasViteConfig, o as resolveViteConfig, r as findWorkspaceRoot, t as findViteConfig } from "../resolve-vite-config-CHHjsjKJ.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-CujFOJXu.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-C59HKB4Y.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-QOIGtmH4.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";
@@ -96,6 +97,7 @@ function prependToPathToEnvs(extraPath, envs) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/nanotar@0.3.0/node_modules/nanotar/dist/index.mjs
+var import_semver = /* @__PURE__ */ __toESM(require_semver(), 1);
 const tarItemTypeMap = {
 	"0": "file",
 	"1": "hardLink",
@@ -263,10 +265,16 @@ function sanitizeHostForPath(host) {
 * (via `.npmrc` scope mappings) don't share a cache slot. The registry
 * guarantees `manifest.tarballUrl` is a valid URL, so any parse failure
 * here is a real bug worth surfacing.
+*
+* Require a strict descendant of `cacheRoot` so sibling staging directories
+* stay inside the cache, even if a caller skips `readOrgManifest` validation.
 */
-function getExtractionDir(manifest) {
+function resolveExtractionDir(cacheRoot, manifest) {
 	const { host } = new URL(manifest.tarballUrl);
-	return path.join(getCacheRoot(), sanitizeHostForPath(host), manifest.scope, "create", manifest.version);
+	const resolvedRoot = path.resolve(cacheRoot);
+	const resolvedDir = path.resolve(resolvedRoot, sanitizeHostForPath(host), manifest.scope, "create", manifest.version);
+	if (!resolvedDir.startsWith(`${resolvedRoot}${path.sep}`)) throw new Error(`org template extraction path escapes the cache root: ${manifest.version}`);
+	return resolvedDir;
 }
 function parseIntegrity(integrity) {
 	const match = integrity.split(/\s+/)[0].match(/^(sha\d+)-(.+)$/);
@@ -446,7 +454,7 @@ async function cleanupStaleStagingDirs(destDir) {
 * cleans up and returns the existing directory.
 */
 async function ensureOrgPackageExtracted(manifest) {
-	const extractedRoot = getExtractionDir(manifest);
+	const extractedRoot = resolveExtractionDir(getCacheRoot(), manifest);
 	if (fs.existsSync(path.join(extractedRoot, "package.json"))) return extractedRoot;
 	const parent = path.dirname(extractedRoot);
 	await fs.promises.mkdir(parent, { recursive: true });
@@ -668,6 +676,7 @@ async function readOrgManifest(scope, requestedVersion) {
 		resolvedVersion = packument["dist-tags"]?.latest;
 		if (!resolvedVersion) return null;
 	}
+	if (import_semver.default.valid(resolvedVersion) === null) throw new OrgManifestSchemaError(`invalid version "${resolvedVersion}" (expected a semantic version)`, packageName);
 	const meta = packument.versions?.[resolvedVersion];
 	if (!meta) return null;
 	let templates = validateManifest(meta, packageName);
@@ -783,6 +792,7 @@ function discoverTemplate(templateName, templateArgs, workspaceInfo, interactive
 		if (isBingoTemplate(pkg)) {
 			type = TemplateType.bingo;
 			args.push("--skip-requests");
+			envs.VP_CREATE_INTERACTIVE = interactive === false ? "0" : "1";
 		}
 		return {
 			command: "node",

package/dist/{define-config-U3_xg7i-.js → define-config-DAaCa0U_.js}

@@ -1,10 +1,10 @@
-import { c as VITEST_VERSION, r as CONFIG_METADATA_ENV } from "./constants-0IAVgpox.js";
+import { c as VITEST_VERSION, r as CONFIG_METADATA_ENV } from "./constants-IhOditRA.js";
 import { createRequire } from "node:module";
 import path 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_d87cbece06b286a357367d730f55a698/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_298964156353ef75a02894ab80b3a2e6/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();

package/dist/{define-config-DIE9de46.cjs → define-config-DpAPETDf.cjs}

@@ -37,7 +37,7 @@ let node_module = require("node:module");
 let node_url = require("node:url");
 let vitest_config = require("vitest/config");
 //#region package.json
-var version = "0.3.1", VITE_PLUS_VERSION, VITEST_VERSION, CONFIG_METADATA_ENV;
+var version = "0.3.2", VITE_PLUS_VERSION, VITEST_VERSION, CONFIG_METADATA_ENV;
 var init_constants = __esmMin((() => {
 	VITE_PLUS_VERSION = process.env.VP_VERSION || version;
 	VITEST_VERSION = "4.1.11";

package/dist/define-config.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_define_config = require("./define-config-DIE9de46.cjs");
+const require_define_config = require("./define-config-DpAPETDf.cjs");
 require_define_config.init_define_config();
 exports.AUTO_INLINE_DEPS = require_define_config.AUTO_INLINE_DEPS;
 exports.assertCoverageProviderVersionMatch = require_define_config.assertCoverageProviderVersionMatch;

package/dist/define-config.js

@@ -1,2 +1,2 @@
-import { a as defineConfig, c as lazyPlugins, i as computeAutoInlineList, l as resolveCoverageProviderToCheck, n as assertCoverageProviderVersionMatch, o as defineProject, r as checkCoverageProviderVersion, s as isVitestFamilySpecifier, t as AUTO_INLINE_DEPS, u as withConfigMetadataResolution } from "./define-config-U3_xg7i-.js";
+import { a as defineConfig, c as lazyPlugins, i as computeAutoInlineList, l as resolveCoverageProviderToCheck, n as assertCoverageProviderVersionMatch, o as defineProject, r as checkCoverageProviderVersion, s as isVitestFamilySpecifier, t as AUTO_INLINE_DEPS, u as withConfigMetadataResolution } from "./define-config-DAaCa0U_.js";
 export { AUTO_INLINE_DEPS, assertCoverageProviderVersionMatch, checkCoverageProviderVersion, computeAutoInlineList, defineConfig, defineProject, isVitestFamilySpecifier, lazyPlugins, resolveCoverageProviderToCheck, withConfigMetadataResolution };

package/dist/{editor-B5-lvRaU.js → editor-QOIGtmH4.js}

@@ -1,15 +1,15 @@
 import { r as __toESM } from "./rolldown-runtime-CMFfr-1z.js";
-import { a as SETUP_VP_VERSION, c as VITEST_VERSION, d as VITE_PLUS_OVERRIDE_PACKAGES, f as VITE_PLUS_VERSION, l as VITE_CONFIG_FILES, m as isForceOverrideMode, n as BASEURL_TSCONFIG_WARNING, o as TSDOWN_MIGRATION_SKILL_URL, s as VITEST_AGE_GATE_EXEMPT_PACKAGES, u as VITE_PLUS_NAME } from "./constants-0IAVgpox.js";
-import { i as ensureVitePlusImportRuleDefaults, r as createDefaultVitePlusLintConfig } from "./oxlint-plugin-config-Drdl67Xp.js";
+import { a as SETUP_VP_VERSION, c as VITEST_VERSION, d as VITE_PLUS_OVERRIDE_PACKAGES, f as VITE_PLUS_VERSION, l as VITE_CONFIG_FILES, m as isForceOverrideMode, n as BASEURL_TSCONFIG_WARNING, o as TSDOWN_MIGRATION_SKILL_URL, s as VITEST_AGE_GATE_EXEMPT_PACKAGES, u as VITE_PLUS_NAME } from "./constants-IhOditRA.js";
+import { i as ensureVitePlusImportRuleDefaults, r as createDefaultVitePlusLintConfig } from "./oxlint-plugin-config-BU42tr8y.js";
 import { a as writeJsonFile, c as parse, i as readJsonFile, n as editJsonFile, o as applyEdits, r as isJsonFile, s as modify, t as detectFormattingOptions } from "./json-cULBl7Pi.js";
-import { n as detectPackageMetadata, r as getScopeFromPackageName } from "./package-BZz2Ij68.js";
-import { C as multiselect, S as log, T as select, _ as getSpinner, b as confirm, d as readYamlFile, f as scalarString, g as getSilentSpinner, k as isCancel, t as cancelAndExit, u as editYamlFile, y as PackageManager } from "./prompts-CtzEgFY-.js";
+import { n as detectPackageMetadata, r as getScopeFromPackageName } from "./package-BB-Jh_z3.js";
+import { C as multiselect, S as log, T as select, _ as getSpinner, b as confirm, d as readYamlFile, f as scalarString, g as getSilentSpinner, k as isCancel, t as cancelAndExit, u as editYamlFile, y as PackageManager } from "./prompts-CujFOJXu.js";
 import { t as require_semver } from "./semver-CaDAb8vV.js";
-import { l as displayRelative, u as rulesDir } from "./agent-C5jMYVfB.js";
+import { l as displayRelative, u as rulesDir } from "./agent-C59HKB4Y.js";
 import { n as addMigrationWarning, t as addManualStep } from "./report-CK5TnTsr.js";
 import { n as runCommandSilently, r as require_cross_spawn } from "./command-CguLh2KL.js";
 import { t as require_dist } from "./dist-BDYZP12R.js";
-import { a as hasBaseUrlInTsconfig, c as hasVitestTypesInTsconfig, l as removeDeprecatedTsconfigFalseOption, n as findTsconfigFiles, s as hasTypesToRewriteInTsconfig, u as rewriteTypesInTsconfig } from "./tsconfig-CUggNuJR.js";
+import { a as hasBaseUrlInTsconfig, c as hasVitestTypesInTsconfig, l as removeDeprecatedTsconfigFalseOption, n as findTsconfigFiles, s as hasTypesToRewriteInTsconfig, u as rewriteTypesInTsconfig } from "./tsconfig-DCtWfQPA.js";
 import { n as extractOverrideTargetName, t as isAlignableVitestEcosystemPackage } from "./vitest-ecosystem-BiRqcaRI.js";
 import { i as findUnsafeHookInstallPath, t as SUPPORTED_GIT_HOOK_NAMES } from "./hooks-C-4gykWR.js";
 import path, { posix, win32 } from "node:path";
@@ -62,13 +62,14 @@ const BROWSER_PROVIDER_PEER_DEPS = {
 	"@vitest/browser-playwright": "playwright",
 	"@vitest/browser-webdriverio": "webdriverio"
 };
-const PROVIDER_PEER_VERSION_SIBLINGS = {
-	playwright: ["@playwright/test"],
-	webdriverio: ["@wdio/cli", "@wdio/globals"]
-};
+const RUNTIME_PEER_INCLUDED_BY = { playwright: ["@playwright/test"] };
+const PROVIDER_PEER_VERSION_SIBLINGS = { webdriverio: ["@wdio/cli", "@wdio/globals"] };
 function findDeclaredSpec(pkg, name) {
 	return pkg.dependencies?.[name] ?? pkg.devDependencies?.[name] ?? pkg.peerDependencies?.[name] ?? pkg.optionalDependencies?.[name];
 }
+function hasProviderPeerDependency(pkg, runtimePeer) {
+	return findDeclaredSpec(pkg, runtimePeer) !== void 0 || (RUNTIME_PEER_INCLUDED_BY[runtimePeer] ?? []).some((packageName) => findDeclaredSpec(pkg, packageName) !== void 0);
+}
 function resolveProviderPeerSpec(pkg, peer, supportCatalog, catalogDependencyResolver) {
 	if (supportCatalog && catalogDependencyResolver?.("catalog:", peer) !== void 0) return "catalog:";
 	for (const sibling of PROVIDER_PEER_VERSION_SIBLINGS[peer] ?? []) {
@@ -175,6 +176,24 @@ function pnpmMajor(version) {
 	const coerced = version ? import_semver.default.coerce(version)?.version : void 0;
 	return coerced ? import_semver.default.major(coerced) : void 0;
 }
+const OXLINT_PLUGINS_PACKAGE = "@oxlint/plugins";
+const OXLINT_PLUGIN_API_PACKAGES = ["oxlint", OXLINT_PLUGINS_PACKAGE];
+function packageOwnsOxlintApi(pkg) {
+	return pkg.optionalDependencies?.["@oxlint/plugins"] !== void 0 || OXLINT_PLUGIN_API_PACKAGES.some((name) => pkg.dependencies?.[name] !== void 0 || pkg.peerDependencies?.[name] !== void 0);
+}
+/**
+* Capture plugin owners before manifest edits, so the import rewriter can
+* preserve their upstream API imports after those edits.
+*/
+function collectOxlintOwnerDirs(rootDir, packages) {
+	const owners = [];
+	const candidates = [rootDir, ...(packages ?? []).map((pkg) => path.join(rootDir, pkg.path))];
+	for (const dir of candidates) {
+		const pkg = readPackageJsonIfExists(path.join(dir, "package.json"));
+		if (pkg && packageOwnsOxlintApi(pkg)) owners.push(dir);
+	}
+	return owners;
+}
 //#endregion
 //#region src/migration/detector.ts
 const PRETTIER_PACKAGE_JSON_CONFIG = "package.json#prettier";
@@ -331,6 +350,18 @@ function detectEslintProject(projectPath, packages) {
 		legacyConfigFile
 	};
 }
+function extractSkippedRules(output) {
+	const lines = output.toString().replaceAll("\r\n", "\n").split("\n");
+	const start = lines.findIndex((line) => /^\s*Skipped \d+ rules:/.test(line));
+	if (start === -1) return;
+	const indentation = lines[start].search(/\S/);
+	const block = [lines[start].trim()];
+	for (const line of lines.slice(start + 1)) {
+		if (line.trim() === "" || line.search(/\S/) <= indentation) break;
+		block.push(`  ${line.slice(indentation)}`);
+	}
+	return block.join("\n");
+}
 /**
 * Run a `vp dlx @oxlint/migrate` step with graceful error handling.
 * Returns true on success, false on failure (spawn error or non-zero exit).
@@ -352,13 +383,16 @@ async function runOxlintMigrateStep(vpBin, cwd, migratePackage, args, spinner, f
 			const stderr = result.stderr.toString().trim();
 			if (stderr) log.warn(`⚠ ${stderr}`);
 			log.info(manualHint);
-			return false;
+			return { ok: false };
 		}
-		return true;
+		return {
+			ok: true,
+			skippedRules: extractSkippedRules(result.stdout)
+		};
 	} catch {
 		spinner.stop(failMessage);
 		log.info(manualHint);
-		return false;
+		return { ok: false };
 	}
 }
 async function migrateEslintToOxlint(projectPath, interactive, eslintConfigFile, packages, options) {
@@ -374,10 +408,12 @@ async function migrateEslintToOxlint(projectPath, interactive, eslintConfigFile,
 			"--details"
 		];
 		spinner.start("Migrating ESLint config to Oxlint...");
-		if (!await runOxlintMigrateStep(vpBin, projectPath, migratePackage, migrateArgs, spinner, "ESLint migration failed", `You can run \`vp dlx ${migratePackage} ${migrateArgs.join(" ")}\` manually later`)) return false;
+		const migrateResult = await runOxlintMigrateStep(vpBin, projectPath, migratePackage, migrateArgs, spinner, "ESLint migration failed", `You can run \`vp dlx ${migratePackage} ${migrateArgs.join(" ")}\` manually later`);
+		if (!migrateResult.ok) return false;
 		spinner.stop("ESLint config migrated to .oxlintrc.json");
+		if (migrateResult.skippedRules) warnMigration(migrateResult.skippedRules, options?.report);
 		spinner.start("Replacing ESLint comments with Oxlint equivalents...");
-		if (await runOxlintMigrateStep(vpBin, projectPath, migratePackage, ["--replace-eslint-comments"], spinner, "ESLint comment replacement failed", `You can run \`vp dlx ${migratePackage} --replace-eslint-comments\` manually later`)) spinner.stop("ESLint comments replaced");
+		if ((await runOxlintMigrateStep(vpBin, projectPath, migratePackage, ["--replace-eslint-comments"], spinner, "ESLint comment replacement failed", `You can run \`vp dlx ${migratePackage} --replace-eslint-comments\` manually later`)).ok) spinner.stop("ESLint comments replaced");
 	}
 	if (options?.report) options.report.eslintMigrated = true;
 	const preserveJsPlugins = collectJsPluginPackageNames(projectPath);
@@ -8069,6 +8105,12 @@ const VITEST_SCAN_SKIP_DIRS = /* @__PURE__ */ new Set([
 	".vite",
 	".cache"
 ]);
+const OXLINT_RETENTION_SKIP_DIRS = /* @__PURE__ */ new Set([
+	"node_modules",
+	".git",
+	".hg",
+	".svn"
+]);
 /**
 * Detect whether a package uses vitest's browser mode.
 *
@@ -8093,26 +8135,35 @@ const VITEST_SCAN_SKIP_DIRS = /* @__PURE__ */ new Set([
 * is a separate package that the migration scans on its own pass, so the root
 * package must not inherit a browser-mode signal from a sub-package.
 */
-function sourceTreeMatches(projectPath, matchesContent) {
-	const scanDir = (dir, isRoot) => {
+function sourceTreeMatches(projectPath, matchesContent, options = {}) {
+	const skipDirs = options.skipDirs ?? VITEST_SCAN_SKIP_DIRS;
+	function scanDir(dir, isRoot) {
 		let entries;
 		try {
 			entries = fs.readdirSync(dir, { withFileTypes: true });
 		} catch {
 			return false;
 		}
-		if (!isRoot && entries.some((e) => e.isFile() && e.name === "package.json")) return false;
+		if (!options.crossPackageBoundaries && !isRoot && entries.some((e) => e.isFile() && e.name === "package.json")) return false;
 		for (const entry of entries) {
 			const entryPath = path.join(dir, entry.name);
 			if (entry.isDirectory()) {
-				if (VITEST_SCAN_SKIP_DIRS.has(entry.name)) continue;
+				if (skipDirs.has(entry.name)) continue;
 				if (scanDir(entryPath, false)) return true;
-			} else if (entry.isFile() && VITEST_SCAN_EXTENSIONS.has(path.extname(entry.name))) try {
-				if (matchesContent(fs.readFileSync(entryPath, "utf8"))) return true;
+			} else if (entry.isFile() && (VITEST_SCAN_EXTENSIONS.has(path.extname(entry.name)) || options.includePackageReferences && entry.name === "package.json")) try {
+				let content = fs.readFileSync(entryPath, "utf8");
+				if (entry.name === "package.json") {
+					const pkg = JSON.parse(content);
+					content = JSON.stringify({
+						imports: pkg.imports,
+						scripts: pkg.scripts
+					});
+				}
+				if (matchesContent(content)) return true;
 			} catch {}
 		}
 		return false;
-	};
+	}
 	return scanDir(projectPath, true);
 }
 function sourceTreeReferencesAny(projectPath, hints) {
@@ -8161,6 +8212,39 @@ function collectProviderSourceModes(projectPath) {
 	for (const provider of OPT_IN_BROWSER_PROVIDERS) modes[provider] = sourceTreeReferencesAny(projectPath, BROWSER_PROVIDER_SPECIFIER_HINTS[provider]);
 	return modes;
 }
+/**
+* Check final source, build output, package import aliases, and package scripts.
+* A substring scan conservatively retains references the rewriter leaves alone,
+* including require calls, type references, and strings.
+*/
+function sourceTreeReferencesOxlintPluginsPackage(projectPath) {
+	return sourceTreeMatches(projectPath, (content) => content.includes(OXLINT_PLUGINS_PACKAGE), {
+		crossPackageBoundaries: true,
+		includePackageReferences: true,
+		skipDirs: OXLINT_RETENTION_SKIP_DIRS
+	});
+}
+/**
+* Drop `@oxlint/plugins` from devDependencies once nothing names it any more.
+*
+* Runs AFTER the import rewrite, so the scan sees final source. Skips a package
+* that owns the API as a runtime or peer dependency, and skips any package
+* whose source or build output still names it.
+*/
+function dropDeadOxlintPluginsDependency(rootDir, packages) {
+	const dirs = [rootDir, ...(packages ?? []).map((pkg) => path.join(rootDir, pkg.path))];
+	for (const dir of dirs) {
+		const packageJsonPath = path.join(dir, "package.json");
+		const pkg = readPackageJsonIfExists(packageJsonPath);
+		if (pkg?.devDependencies?.["@oxlint/plugins"] === void 0) continue;
+		if (packageOwnsOxlintApi(pkg) || sourceTreeReferencesOxlintPluginsPackage(dir)) continue;
+		editJsonFile(packageJsonPath, (json) => {
+			if (json.devDependencies?.["@oxlint/plugins"] === void 0) return;
+			delete json.devDependencies[OXLINT_PLUGINS_PACKAGE];
+			return json;
+		});
+	}
+}
 //#endregion
 //#region src/migration/migrator/vite-plus-bootstrap.ts
 function bunWorkspaceDeclaresPackages(workspaces) {
@@ -8301,8 +8385,7 @@ function reconcileVitePlusBootstrapPackage(projectPath, pkg, vitePlusVersion, pa
 			pkg.devDependencies[provider] = getCatalogDependencySpec(void 0, VITEST_VERSION, supportCatalog && packageManager !== PackageManager.bun, { preferredCatalogSpec: catalogDependencyResolver?.preferredCatalogSpec });
 		}
 		const frameworkPeer = BROWSER_PROVIDER_PEER_DEPS[provider];
-		const frameworkPresent = dependencyGroups.some((dependencies) => dependencies?.[frameworkPeer] !== void 0);
-		if (frameworkPeer && !frameworkPresent) {
+		if (!hasProviderPeerDependency(pkg, frameworkPeer)) {
 			pkg.devDependencies ??= {};
 			pkg.devDependencies[frameworkPeer] = resolveProviderPeerSpec(pkg, frameworkPeer, supportCatalog, catalogDependencyResolver);
 		}
@@ -8762,11 +8845,23 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 		}
 	}
 	const hasBrowserDepSignal = VITEST_BROWSER_DEP_NAMES.some((name) => dependencyGroups.some(({ dependencies }) => dependencies?.[name] !== void 0));
+	const ownsOxlintApi = packageOwnsOxlintApi(pkg);
+	if (pkg.devDependencies?.["@oxlint/plugins"] !== void 0 && !ownsOxlintApi) needVitePlus = true;
 	for (const name of REMOVE_PACKAGES) {
 		let wasRemoved = false;
-		for (const { dependencies } of dependencyGroups) if (dependencies?.[name]) {
-			delete dependencies[name];
-			wasRemoved = true;
+		for (const { dependencyField, dependencies } of dependencyGroups) {
+			if (ownsOxlintApi && (dependencyField === "peerDependencies" || dependencyField === "dependencies") && OXLINT_PLUGIN_API_PACKAGES.includes(name)) {
+				const current = dependencies?.[name];
+				if (current?.startsWith("catalog:") && dependencies) {
+					const resolved = catalogDependencyResolver?.(current, name);
+					if (resolved) dependencies[name] = resolved;
+				}
+				continue;
+			}
+			if (dependencies?.[name]) {
+				delete dependencies[name];
+				wasRemoved = true;
+			}
 		}
 		if (wasRemoved) needVitePlus = true;
 	}
@@ -8782,8 +8877,7 @@ function rewritePackageJson(pkg, packageManager, isMonorepo, skipStagedMigration
 			pkg.devDependencies[provider] = getCatalogDependencySpec(void 0, VITEST_VERSION, supportCatalog && packageManager !== PackageManager.bun, { preferredCatalogSpec: catalogDependencyResolver?.preferredCatalogSpec });
 		}
 		const peer = BROWSER_PROVIDER_PEER_DEPS[provider];
-		const peerPresent = findDeclaredSpec(pkg, peer);
-		if (peer && !peerPresent) {
+		if (!hasProviderPeerDependency(pkg, peer)) {
 			pkg.devDependencies ??= {};
 			pkg.devDependencies[peer] = resolveProviderPeerSpec(pkg, peer, supportCatalog, catalogDependencyResolver);
 		}
@@ -8911,15 +9005,21 @@ export default defineConfig({});
 */
 function mergeTsdownConfigFile(projectPath, silent = false, report) {
 	const configs = detectConfigs(projectPath);
-	if (!configs.tsdownConfig) return;
+	if (!configs.tsdownConfig) return false;
+	const createdViteConfig = !configs.viteConfig;
 	const viteConfig = ensureViteConfig(projectPath, configs, silent, report);
 	const fullViteConfigPath = path.join(projectPath, viteConfig);
 	const fullTsdownConfigPath = path.join(projectPath, configs.tsdownConfig);
 	if (configs.tsdownConfig.endsWith(".json")) {
 		mergeAndRemoveJsonConfig(projectPath, viteConfig, configs.tsdownConfig, "pack", silent, report);
-		return;
+		return createdViteConfig || !fs.existsSync(fullTsdownConfigPath);
 	}
 	const tsdownRelativePath = `./${configs.tsdownConfig}`;
+	if (hasConfigKey(fullViteConfigPath, "pack")) {
+		const viteConfigContent = fs.readFileSync(fullViteConfigPath, "utf8");
+		if (![tsdownRelativePath, tsdownRelativePath.replace(/\.mts$/, ".mjs").replace(/\.cts$/, ".cjs").replace(/\.ts$/, ".js")].some((importPath) => viteConfigContent.includes(`from '${importPath}'`) || viteConfigContent.includes(`from "${importPath}"`))) infoMigration(`Please manually merge ${displayRelative(fullTsdownConfigPath)} into ${displayRelative(fullViteConfigPath)}, see https://viteplus.dev/guide/migrate#tsdown`, report);
+		return false;
+	}
 	const result = mergeTsdownConfig(fullViteConfigPath, tsdownRelativePath);
 	if (result.updated) {
 		fs.writeFileSync(fullViteConfigPath, result.content);
@@ -8927,6 +9027,7 @@ function mergeTsdownConfigFile(projectPath, silent = false, report) {
 		if (!silent) log.success(`✔ Added import for ${displayRelative(fullTsdownConfigPath)} in ${displayRelative(fullViteConfigPath)}`);
 	}
 	infoMigration(`Please manually merge ${displayRelative(fullTsdownConfigPath)} into ${displayRelative(fullViteConfigPath)}, see https://viteplus.dev/guide/migrate#tsdown`, report);
+	return createdViteConfig || result.updated;
 }
 /**
 * Merge oxlint and oxfmt config into vite.config.ts
@@ -9067,8 +9168,8 @@ function wrapLazyPluginsInViteConfig(projectPath, silent = false, report) {
 * This rewrites vite/vitest imports to @voidzero-dev/vite-plus
 * @param projectPath - The root directory to search for files
 */
-function rewriteAllImports(projectPath, silent = false, report, preserveNuxtVitestImports = true) {
-	const result = rewriteImportsInDirectory(projectPath, preserveNuxtVitestImports);
+function rewriteAllImports(projectPath, silent = false, report, preserveNuxtVitestImports = true, oxlintOwnerDirs = []) {
+	const result = rewriteImportsInDirectory(projectPath, preserveNuxtVitestImports, oxlintOwnerDirs);
 	const modified = result.modifiedFiles.length;
 	const preserved = result.preservedVitestFiles.length;
 	const errors = result.errors.length;
@@ -9577,11 +9678,13 @@ function finalizeCoreMigrationForExistingVitePlus(workspaceInfo, silent = false,
 	const result = {
 		scripts: false,
 		tsconfigTypes: false,
-		imports: false
+		imports: false,
+		tsdownConfig: false
 	};
 	if (pending.scripts) for (const projectPath of projectPaths) result.scripts = rewriteCorePackageScripts(projectPath) || result.scripts;
 	if (pending.tsconfigTypes) for (const projectPath of projectPaths) result.tsconfigTypes = rewriteTsconfigTypes(projectPath, silent, report) || result.tsconfigTypes;
 	result.imports = rewriteAllImports(workspaceInfo.rootDir, silent, report, true);
+	for (const projectPath of projectPaths) result.tsdownConfig = mergeTsdownConfigFile(projectPath, silent, report) || result.tsdownConfig;
 	return result;
 }
 //#endregion
@@ -9592,6 +9695,7 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 	const packageManager = workspaceInfo.packageManager;
 	const catalogDependencyResolver = createCatalogDependencyResolver(projectPath, packageManager);
 	const vitestEcosystemPackages = collectVitestEcosystemInstallDependencyNames(projectPath);
+	const oxlintOwnerDirs = collectOxlintOwnerDirs(projectPath, workspaceInfo.packages);
 	const providerSourceModes = collectProviderSourceModes(projectPath);
 	const browserMode = usesVitestBrowserMode(projectPath);
 	const retainedVitestModule = sourceTreeReferencesRetainedVitestModule(projectPath);
@@ -9688,7 +9792,8 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 	injectLintTypeCheckDefaults(projectPath, silent, report);
 	injectFmtDefaults(projectPath, silent, report);
 	mergeTsdownConfigFile(projectPath, silent, report);
-	rewriteAllImports(projectPath, silent, report, true);
+	rewriteAllImports(projectPath, silent, report, true, oxlintOwnerDirs);
+	dropDeadOxlintPluginsDependency(projectPath, workspaceInfo.packages);
 	wrapLazyPluginsInViteConfig(projectPath, silent, report);
 	setPackageManager(projectPath, workspaceInfo.downloadPackageManager);
 }
@@ -9698,6 +9803,7 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 */
 function rewriteMonorepo(workspaceInfo, skipStagedMigration, silent = false, report) {
 	const catalogDependencyResolver = createCatalogDependencyResolver(workspaceInfo.rootDir, workspaceInfo.packageManager);
+	const oxlintOwnerDirs = collectOxlintOwnerDirs(workspaceInfo.rootDir, workspaceInfo.packages);
 	const pnpmMajorVersion = pnpmMajor(workspaceInfo.downloadPackageManager.version);
 	const usePnpmWorkspaceSettings = pnpmSupportsWorkspaceSettings(workspaceInfo.downloadPackageManager.version);
 	const workspaceShouldAllowBrowserBuilds = workspaceUsesWebdriverio(workspaceInfo.rootDir, workspaceInfo.packages);
@@ -9724,7 +9830,8 @@ function rewriteMonorepo(workspaceInfo, skipStagedMigration, silent = false, rep
 	injectLintTypeCheckDefaults(workspaceInfo.rootDir, silent, report);
 	injectFmtDefaults(workspaceInfo.rootDir, silent, report);
 	mergeTsdownConfigFile(workspaceInfo.rootDir, silent, report);
-	rewriteAllImports(workspaceInfo.rootDir, silent, report, true);
+	rewriteAllImports(workspaceInfo.rootDir, silent, report, true, oxlintOwnerDirs);
+	dropDeadOxlintPluginsDependency(workspaceInfo.rootDir, workspaceInfo.packages);
 	wrapLazyPluginsInViteConfig(workspaceInfo.rootDir, silent, report);
 	for (const pkg of workspaceInfo.packages) wrapLazyPluginsInViteConfig(path.join(workspaceInfo.rootDir, pkg.path), silent, report);
 	setPackageManager(workspaceInfo.rootDir, workspaceInfo.downloadPackageManager);

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_define_config = require("./define-config-DIE9de46.cjs");
+const require_define_config = require("./define-config-DpAPETDf.cjs");
 //#region src/index.cts
 const vite = require("vite");
 const { configDefaults, coverageConfigDefaults, defaultBrowserPort, defaultExclude, defaultInclude } = require("vitest/config");

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as defineConfig, c as lazyPlugins, o as defineProject } from "./define-config-U3_xg7i-.js";
+import { a as defineConfig, c as lazyPlugins, o as defineProject } from "./define-config-DAaCa0U_.js";
 import { configDefaults, coverageConfigDefaults, defaultBrowserPort, defaultExclude, defaultInclude } from "vitest/config";
 export * from "vite";
 export { configDefaults, coverageConfigDefaults, defaultBrowserPort, defaultExclude, defaultInclude, defineConfig, defineProject, lazyPlugins };

package/dist/lint-plugins-dev.d.ts

@@ -0,0 +1,3 @@
+import { RuleTester } from "oxlint/plugins-dev";
+export type * from "oxlint/plugins-dev";
+export { RuleTester };

package/dist/lint-plugins-dev.js

@@ -0,0 +1,2 @@
+import { RuleTester } from "oxlint/plugins-dev";
+export { RuleTester };

package/dist/lint-plugins.cjs

@@ -0,0 +1,21 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("./define-config-DpAPETDf.cjs");
+let _oxlint_plugins = require("@oxlint/plugins");
+Object.defineProperty(exports, "definePlugin", {
+	enumerable: true,
+	get: function() {
+		return _oxlint_plugins.definePlugin;
+	}
+});
+Object.defineProperty(exports, "defineRule", {
+	enumerable: true,
+	get: function() {
+		return _oxlint_plugins.defineRule;
+	}
+});
+Object.defineProperty(exports, "eslintCompatPlugin", {
+	enumerable: true,
+	get: function() {
+		return _oxlint_plugins.eslintCompatPlugin;
+	}
+});

package/dist/lint-plugins.d.ts

@@ -0,0 +1,3 @@
+import { definePlugin, defineRule, eslintCompatPlugin } from "@oxlint/plugins";
+export type * from "@oxlint/plugins";
+export { definePlugin, defineRule, eslintCompatPlugin };

package/dist/lint-plugins.js

@@ -0,0 +1,2 @@
+import { definePlugin, defineRule, eslintCompatPlugin } from "@oxlint/plugins";
+export { definePlugin, defineRule, eslintCompatPlugin };

package/dist/migration/bin.js

@@ -1,15 +1,15 @@
 import { r as __toESM } from "../rolldown-runtime-CMFfr-1z.js";
 import { a as muted, c as warnMsg, i as log, o as printHeader, r as formatDuration, t as accent } from "../terminal-MKGAuy-p.js";
-import { a as SETUP_VP_VERSION, f as VITE_PLUS_VERSION, m as isForceOverrideMode } from "../constants-0IAVgpox.js";
+import { a as SETUP_VP_VERSION, f as VITE_PLUS_VERSION, m as isForceOverrideMode } from "../constants-IhOditRA.js";
 import { a as writeJsonFile, i as readJsonFile } from "../json-cULBl7Pi.js";
-import { a as readNearestPackageJson, i as hasVitePlusDependency } from "../package-BZz2Ij68.js";
-import { E as spinner, S as log$1, T as select, b as confirm, c as selectPackageManager, i as promptGitHooks, k as isCancel, l as upgradeYarn, n as defaultInteractive, o as runViteFmt, r as downloadPackageManager$1, s as runViteInstall, t as cancelAndExit, w as outro, y as PackageManager } from "../prompts-CtzEgFY-.js";
+import { a as readNearestPackageJson, i as hasVitePlusDependency } from "../package-BB-Jh_z3.js";
+import { E as spinner, S as log$1, T as select, b as confirm, c as selectPackageManager, i as promptGitHooks, k as isCancel, l as upgradeYarn, n as defaultInteractive, o as runViteFmt, r as downloadPackageManager$1, s as runViteInstall, t as cancelAndExit, w as outro, y as PackageManager } from "../prompts-CujFOJXu.js";
 import { t as require_semver } from "../semver-CaDAb8vV.js";
-import { i as selectAgentTargetPaths, l as displayRelative, n as detectAgentConflicts, r as detectExistingAgentTargetPaths, s as writeAgentInstructions } from "../agent-C5jMYVfB.js";
+import { i as selectAgentTargetPaths, l as displayRelative, n as detectAgentConflicts, r as detectExistingAgentTargetPaths, s as writeAgentInstructions } from "../agent-C59HKB4Y.js";
 import { n as addMigrationWarning, r as createMigrationReport } from "../report-CK5TnTsr.js";
-import { $ as warnIncompatibleEslintIntegration, A as detectYarnPnpMode, B as migrateTsupToTsdown, C as injectLintTypeCheckDefaults, D as detectVitePlusBootstrapPending, E as collectToolchainVersionChanges, F as addFrameworkShim, G as migratePrettierToOxfmt, H as warnMissingTsupConfig, I as detectFramework, J as confirmEslintMigration, L as hasFrameworkShim, O as ensureVitePlusBootstrap, R as confirmTsupMigration, T as mergeViteConfigFiles, U as confirmPrettierMigration, W as detectPrettierProject, X as detectIncompatibleEslintIntegration, Y as detectEslintProject, Z as migrateEslintToOxlint, _ as installGitHooks, d as finalizeCoreMigrationForExistingVitePlus, et as warnLegacyEslintConfig, f as detectNodeVersionManagerFile, g as detectLegacyGitHooksMigrationCandidate, i as selectEditor, j as detectWorkspace$1, k as configureYarnNodeModulesMode, l as rewriteStandaloneProject, m as migrateSetupVpVersion, nt as checkViteVersion, o as writeEditorConfigs, p as migrateNodeVersionManagerFile, q as warnPackageLevelPrettier, r as isJsonLikeFile, rt as checkVitestVersion, s as rewriteMonorepo, t as detectEditorConflicts, tt as warnPackageLevelEslint, u as detectPendingCoreMigration, v as preflightGitHooksSetup, w as mergeTsdownConfigFile, y as shouldSkipStagedMigrationForHooks, z as detectTsupProject } from "../editor-B5-lvRaU.js";
+import { $ as warnIncompatibleEslintIntegration, A as detectYarnPnpMode, B as migrateTsupToTsdown, C as injectLintTypeCheckDefaults, D as detectVitePlusBootstrapPending, E as collectToolchainVersionChanges, F as addFrameworkShim, G as migratePrettierToOxfmt, H as warnMissingTsupConfig, I as detectFramework, J as confirmEslintMigration, L as hasFrameworkShim, O as ensureVitePlusBootstrap, R as confirmTsupMigration, T as mergeViteConfigFiles, U as confirmPrettierMigration, W as detectPrettierProject, X as detectIncompatibleEslintIntegration, Y as detectEslintProject, Z as migrateEslintToOxlint, _ as installGitHooks, d as finalizeCoreMigrationForExistingVitePlus, et as warnLegacyEslintConfig, f as detectNodeVersionManagerFile, g as detectLegacyGitHooksMigrationCandidate, i as selectEditor, j as detectWorkspace$1, k as configureYarnNodeModulesMode, l as rewriteStandaloneProject, m as migrateSetupVpVersion, nt as checkViteVersion, o as writeEditorConfigs, p as migrateNodeVersionManagerFile, q as warnPackageLevelPrettier, r as isJsonLikeFile, rt as checkVitestVersion, s as rewriteMonorepo, t as detectEditorConflicts, tt as warnPackageLevelEslint, u as detectPendingCoreMigration, v as preflightGitHooksSetup, w as mergeTsdownConfigFile, y as shouldSkipStagedMigrationForHooks, z as detectTsupProject } from "../editor-QOIGtmH4.js";
 import { n as runCommandSilently } from "../command-CguLh2KL.js";
-import { a as hasBaseUrlInTsconfig, i as fixBaseUrlInTsconfig, t as confirmBaseUrlFix } from "../tsconfig-CUggNuJR.js";
+import { a as hasBaseUrlInTsconfig, i as fixBaseUrlInTsconfig, t as confirmBaseUrlFix } from "../tsconfig-DCtWfQPA.js";
 import { t as unwrapCliParseOutcome } from "../cli-parse-DHE8NrBU.js";
 import { t as ROLLDOWN_COMPAT_RESULT_PREFIX } from "../protocol-D99W10Qi.js";
 import path from "node:path";
@@ -887,7 +887,7 @@ async function main() {
 		report.dependencyUpgrades = await collectToolchainVersionChanges(workspaceInfoOptional.rootDir);
 		updateMigrationProgress("Rewriting toolchain imports across the workspace");
 		const coreMigrationResult = finalizeCoreMigrationForExistingVitePlus(workspaceInfoOptional, true, report, pendingCoreMigration);
-		if (coreMigrationResult.scripts || coreMigrationResult.tsconfigTypes || coreMigrationResult.imports) didMigrate = true;
+		if (coreMigrationResult.scripts || coreMigrationResult.tsconfigTypes || coreMigrationResult.imports || coreMigrationResult.tsdownConfig) didMigrate = true;
 		clearMigrationProgress();
 		const fullSetup = options.full === true;
 		const skippedSetupCandidates = !fullSetup && !hasExplicitExistingVitePlusSetupRequest(options) && hasExistingVitePlusMigrationCandidates(workspaceInfoOptional, options);

package/dist/{oxlint-plugin-config-Drdl67Xp.js → oxlint-plugin-config-BU42tr8y.js}

@@ -1,4 +1,4 @@
-import { u as VITE_PLUS_NAME } from "./constants-0IAVgpox.js";
+import { u as VITE_PLUS_NAME } from "./constants-IhOditRA.js";
 //#region src/oxlint-plugin-config.ts
 const VITE_PLUS_OXLINT_PLUGIN_NAME = VITE_PLUS_NAME;
 const VITE_PLUS_OXLINT_PLUGIN_SPECIFIER = `${VITE_PLUS_NAME}/oxlint-plugin`;