vite-plus 0.3.0 → 0.3.2

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { a as defineConfig, c as lazyPlugins, o as defineProject } from "./define-config-DWoAkNdp.js";
+import { a as defineConfig, c as lazyPlugins, o as defineProject } from "./define-config-DPNEJxPz.js";
 import { TestProjectConfiguration, TestProjectInlineConfiguration, TestTagDefinition, TestUserConfig, UserProjectConfigExport, UserProjectConfigFn, UserWorkspaceConfig, ViteUserConfig, ViteUserConfigExport, ViteUserConfigFn, ViteUserConfigFnObject, ViteUserConfigFnPromise, WatcherTriggerPattern, configDefaults, coverageConfigDefaults, defaultBrowserPort, defaultExclude, defaultInclude } from "vitest/config";
-export * from "@voidzero-dev/vite-plus-core";
+export * from "vite";
 export { type TestProjectConfiguration, type TestProjectInlineConfiguration, type TestTagDefinition, type TestUserConfig, type UserProjectConfigExport, type UserProjectConfigFn, type UserWorkspaceConfig, type ViteUserConfig, type ViteUserConfigExport, type ViteUserConfigFn, type ViteUserConfigFnObject, type ViteUserConfigFnPromise, type WatcherTriggerPattern, configDefaults, coverageConfigDefaults, defaultBrowserPort, defaultExclude, defaultInclude, defineConfig, defineProject, lazyPlugins };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as defineConfig, c as lazyPlugins, o as defineProject } from "./define-config-GXUdVT-0.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 "@voidzero-dev/vite-plus-core";
+export * from "vite";
 export { configDefaults, coverageConfigDefaults, defaultBrowserPort, defaultExclude, defaultInclude, defineConfig, defineProject, lazyPlugins };

package/dist/internal.d.ts

@@ -1 +1 @@
-export * from '@voidzero-dev/vite-plus-core/internal';
+export * from 'vite/internal';

package/dist/internal.js

@@ -1 +1 @@
-export * from '@voidzero-dev/vite-plus-core/internal';
+export * from 'vite/internal';

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,19 +1,20 @@
 import { r as __toESM } from "../rolldown-runtime-CMFfr-1z.js";
-import { t as renderCliDoc } from "../help-BmKpeOP9.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 { f as VITE_PLUS_VERSION, m as isForceOverrideMode } from "../constants-Bn-U8o4v.js";
-import { A as isCancel, C as log$1, D as spinner, E as select, T as outro, b as require_semver, c as selectPackageManager, i as promptGitHooks, l as upgradeYarn, n as defaultInteractive, o as runViteFmt, r as downloadPackageManager, s as runViteInstall, t as cancelAndExit, x as confirm, y as PackageManager } from "../prompts-DF3yU-eU.js";
-import { t as lib_default } from "../lib-L3DWSRQp.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-CBe9EWPY.js";
-import { i as selectAgentTargetPaths, l as displayRelative, n as detectAgentConflicts, r as detectExistingAgentTargetPaths, s as writeAgentInstructions } from "../agent-Wqx0MPk0.js";
-import { n as addMigrationWarning, r as createMigrationReport } from "../report-ZNR1Mk6h.js";
-import { $ as warnLegacyEslintConfig, A as detectWorkspace, C as mergeTsdownConfigFile, D as ensureVitePlusBootstrap, E as detectVitePlusBootstrapPending, F as detectFramework, H as confirmPrettierMigration, I as hasFrameworkShim, J as detectEslintProject, K as warnPackageLevelPrettier, L as confirmTsupMigration, O as configureYarnNodeModulesMode, P as addFrameworkShim, Q as warnIncompatibleEslintIntegration, R as detectTsupProject, S as injectLintTypeCheckDefaults, T as collectToolchainVersionChanges, U as detectPrettierProject, V as warnMissingTsupConfig, W as migratePrettierToOxfmt, X as migrateEslintToOxlint, Y as detectIncompatibleEslintIntegration, _ as preflightGitHooksSetup, d as finalizeCoreMigrationForExistingVitePlus, et as warnPackageLevelEslint, f as detectNodeVersionManagerFile, g as installGitHooks, h as detectLegacyGitHooksMigrationCandidate, i as selectEditor, k as detectYarnPnpMode, l as rewriteStandaloneProject, nt as checkVitestVersion, o as writeEditorConfigs, p as migrateNodeVersionManagerFile, q as confirmEslintMigration, r as isJsonLikeFile, s as rewriteMonorepo, t as detectEditorConflicts, tt as checkViteVersion, u as detectPendingCoreMigration, v as shouldSkipStagedMigrationForHooks, w as mergeViteConfigFiles, z as migrateTsupToTsdown } from "../editor-CC4DqODz.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-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-QOIGtmH4.js";
 import { n as runCommandSilently } from "../command-CguLh2KL.js";
-import { a as hasBaseUrlInTsconfig, i as fixBaseUrlInTsconfig, t as confirmBaseUrlFix } from "../tsconfig-LD2QhQ0O.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";
 import { fileURLToPath } from "node:url";
+import { parseMigrateArgs } from "../../binding/index.js";
 import { styleText } from "node:util";
 import fs, { existsSync } from "node:fs";
 //#region src/migration/compat/runner.ts
@@ -486,136 +487,12 @@ async function checkWorkspaceRolldownCompatibility(workspaceInfo, report, update
 		await checkRolldownCompatibility(projectPath, report);
 	}
 }
-const helpMessage = renderCliDoc({
-	usage: "vp migrate [PATH] [OPTIONS]",
-	summary: "Migrate standalone Vite, Vitest, Oxlint, Oxfmt, and Prettier projects to unified Vite+.",
-	documentationUrl: "https://viteplus.dev/guide/migrate",
-	sections: [
-		{
-			title: "Arguments",
-			rows: [{
-				label: "PATH",
-				description: "Target directory to migrate (default: current directory)"
-			}]
-		},
-		{
-			title: "Options",
-			rows: [
-				{
-					label: "--agent NAME",
-					description: "Write coding agent instructions to AGENTS.md, CLAUDE.md, etc."
-				},
-				{
-					label: "--no-agent",
-					description: "Skip writing coding agent instructions"
-				},
-				{
-					label: "--editor NAME",
-					description: "Write editor config files into the project."
-				},
-				{
-					label: "--no-editor",
-					description: "Skip writing editor config files"
-				},
-				{
-					label: "--hooks",
-					description: "Set up pre-commit hooks (default in non-interactive mode)"
-				},
-				{
-					label: "--no-hooks",
-					description: "Skip pre-commit hooks setup"
-				},
-				{
-					label: "--full",
-					description: "Existing Vite+ projects: also run the full setup (hooks, editor, agent files, ESLint/Prettier migration, framework shims, tsconfig baseUrl, .node-version). Without it, `vp migrate` only upgrades the toolchain version."
-				},
-				{
-					label: "--no-interactive",
-					description: "Run in non-interactive mode (skip prompts and use defaults)"
-				},
-				{
-					label: "-h, --help",
-					description: "Show this help message"
-				}
-			]
-		},
-		{
-			title: "Examples",
-			lines: [
-				`  ${muted("# Migrate current package")}`,
-				`  ${accent("vp migrate")}`,
-				"",
-				`  ${muted("# Migrate specific directory")}`,
-				`  ${accent("vp migrate my-app")}`,
-				"",
-				`  ${muted("# Non-interactive mode")}`,
-				`  ${accent("vp migrate --no-interactive")}`
-			]
-		},
-		{
-			title: "Migration Prompt",
-			lines: [
-				"  Give this to a coding agent when you want it to drive the migration:",
-				"",
-				"  Migrate this project to Vite+.",
-				"  Vite+ replaces the current split tooling around runtime management, package",
-				"  management, dev/build/test commands, linting, formatting, and packaging.",
-				"  Run `vp help` and `vp help migrate` before making changes.",
-				`  Use ${accent("vp migrate --no-interactive")} in the workspace root.`,
-				"  Make sure the project is using Vite 8+ and Vitest 4.1+ before migrating.",
-				"",
-				"  After the migration:",
-				"  - Confirm `vite` imports were rewritten to `vite-plus` where needed",
-				"  - Confirm `vitest` imports were rewritten to `vite-plus/test` where needed",
-				"  - On pnpm, keep the `vite` / `vitest` entries that `vp migrate` aliased to",
-				"    the Vite+ packages so the workspace override stays effective; with other",
-				"    package managers you can remove them once those rewrites are confirmed",
-				"  - Move remaining tool-specific config into the appropriate blocks in",
-				"    `vite.config.ts`",
-				"",
-				"  Command mapping:",
-				"  - `vp run <script>` is the equivalent of `pnpm run <script>`",
-				"  - `vp dev` and `vp test` always run the built-ins; `vp run dev` and",
-				"    `vp run test` run the `dev` and `test` scripts from `package.json`",
-				"  - `vp install`, `vp add`, and `vp remove` delegate through the package",
-				"    manager declared by `packageManager`",
-				"  - `vp dev`, `vp build`, `vp preview`, `vp lint`, `vp fmt`, `vp check`,",
-				"    and `vp pack` replace the corresponding standalone tools",
-				"  - Prefer `vp check` for validation loops",
-				"",
-				"  Finally, verify the migration by running:",
-				`  - ${accent("vp install")}`,
-				`  - ${accent("vp check")}`,
-				`  - ${accent("vp test")}`,
-				`  - ${accent("vp build")}`,
-				"",
-				"  Summarize the migration at the end and report any manual follow-up still",
-				"  required."
-			]
-		}
-	]
-});
 function parseArgs() {
-	const args = process.argv.slice(3);
-	const parsed = lib_default(args, {
-		alias: { h: "help" },
-		boolean: [
-			"help",
-			"interactive",
-			"hooks",
-			"full"
-		],
-		default: { interactive: defaultInteractive() }
-	});
-	const interactive = parsed.interactive;
-	let projectPath = parsed._[0];
-	if (projectPath) projectPath = path.resolve(process.cwd(), projectPath);
-	else projectPath = process.cwd();
+	const parsed = unwrapCliParseOutcome(parseMigrateArgs(process.argv.slice(3)));
 	return {
-		projectPath,
+		projectPath: parsed.path ? path.resolve(process.cwd(), parsed.path) : process.cwd(),
 		options: {
-			interactive,
-			help: parsed.help,
+			interactive: parsed.interactive ?? defaultInteractive(),
 			agent: parsed.agent,
 			editor: parsed.editor,
 			hooks: parsed.hooks,
@@ -763,6 +640,11 @@ function showMigrationSummary(options) {
 	if (report.prettierMigrated) log(`${styleText("gray", "•")} Prettier migrated to Oxfmt`);
 	if (report.tsupMigrated) log(`${styleText("gray", "•")} tsup config migrated to tsdown (\`vp pack\`)`);
 	if (report.nodeVersionFileMigrated) log(`${styleText("gray", "•")} Node version manager file migrated to .node-version`);
+	const setupVpFileCount = report.setupVpVersionUpdatedFileCount;
+	if (setupVpFileCount > 0) {
+		const fileLabel = setupVpFileCount === 1 ? "file" : "files";
+		log(`${styleText("gray", "•")} setup-vp updated to ${SETUP_VP_VERSION} in ${setupVpFileCount} GitHub Actions ${fileLabel}`);
+	}
 	if (report.wrappedPluginConfigCount > 0) log(`${styleText("gray", "•")} Inline Vite plugins wrapped with lazyPlugins for check/lint/fmt`);
 	if (report.gitHooksConfigured) log(`${styleText("gray", "•")} Git hooks configured`);
 	if (report.frameworkShimAdded) log(`${styleText("gray", "•")} TypeScript shim added for framework component files`);
@@ -780,7 +662,7 @@ function showMigrationSummary(options) {
 async function downloadSupportedPackageManager(options) {
 	const { rootDir, packageManager, packageManagerVersion, interactive, updateMigrationProgress, failMigrationProgress } = options;
 	updateMigrationProgress("Preparing migration");
-	const downloadResult = await downloadPackageManager(packageManager, packageManagerVersion, interactive, true);
+	const downloadResult = await downloadPackageManager$1(packageManager, packageManagerVersion, interactive, true);
 	if (packageManager === PackageManager.yarn && import_semver.default.satisfies(downloadResult.version, ">=4.0.0 <4.10.0")) {
 		updateMigrationProgress("Upgrading Yarn");
 		await upgradeYarn(rootDir, interactive, true);
@@ -842,6 +724,8 @@ async function executeMigrationPlan(workspaceInfoOptional, plan, interactive, pr
 		updateMigrationProgress("Migrating node version file");
 		migrateNodeVersionManagerFile(workspaceInfo.rootDir, plan.nodeVersionDetection, report);
 	}
+	updateMigrationProgress("Updating setup-vp workflows");
+	migrateSetupVpVersion(workspaceInfo.rootDir, report);
 	updateMigrationProgress("Installing dependencies");
 	const initialInstallSummary = await runViteInstall(workspaceInfo.rootDir, interactive, void 0, {
 		silent: true,
@@ -936,13 +820,8 @@ async function executeMigrationPlan(workspaceInfoOptional, plan, interactive, pr
 }
 async function main() {
 	const { projectPath, options } = parseArgs();
-	if (options.help) {
-		printHeader();
-		log(helpMessage);
-		return;
-	}
 	printHeader();
-	const workspaceInfoOptional = await detectWorkspace(projectPath);
+	const workspaceInfoOptional = await detectWorkspace$1(projectPath);
 	if (workspaceInfoOptional.isMonorepo && path.resolve(projectPath) !== path.resolve(workspaceInfoOptional.rootDir)) cancelAndExit(`Vite+ cannot migrate a workspace member. Run \`vp migrate\` from the workspace root at ${workspaceInfoOptional.rootDir}.`, 1);
 	const initialChangedPaths = await collectChangedFormatPaths(workspaceInfoOptional.rootDir);
 	const preExistingChangedPaths = initialChangedPaths ? new Set(initialChangedPaths) : void 0;
@@ -978,6 +857,8 @@ async function main() {
 				migrationProgressStarted = false;
 			}
 		};
+		updateMigrationProgress("Updating setup-vp workflows");
+		if (migrateSetupVpVersion(workspaceInfoOptional.rootDir, report).length > 0) didMigrate = true;
 		const pendingCoreMigration = detectPendingCoreMigration(workspaceInfoOptional);
 		const vitePlusBootstrapPending = detectVitePlusBootstrapPending(workspaceInfoOptional.rootDir, workspaceInfoOptional.packageManager, workspaceInfoOptional.packages, workspaceInfoOptional.packageManagerVersion);
 		let packageManager = vitePlusBootstrapPending ? workspaceInfoOptional.packageManager ?? await selectPackageManager(options.interactive, true) : workspaceInfoOptional.packageManager;
@@ -1006,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/migration/compat/worker.js

@@ -1,4 +1,4 @@
-import { n as addMigrationWarning, r as createMigrationReport } from "../../report-ZNR1Mk6h.js";
+import { n as addMigrationWarning, r as createMigrationReport } from "../../report-CK5TnTsr.js";
 import { t as ROLLDOWN_COMPAT_RESULT_PREFIX } from "../../protocol-D99W10Qi.js";
 import { writeSync } from "node:fs";
 //#region src/migration/compat/manual-chunks.ts

package/dist/module-runner.d.ts

@@ -1 +1 @@
-export * from '@voidzero-dev/vite-plus-core/module-runner';
+export * from 'vite/module-runner';

package/dist/module-runner.js

@@ -1 +1 @@
-export * from '@voidzero-dev/vite-plus-core/module-runner';
+export * from 'vite/module-runner';

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

@@ -1,4 +1,4 @@
-import { u as VITE_PLUS_NAME } from "./constants-Bn-U8o4v.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`;

package/dist/oxlint-plugin.d.ts

@@ -1,6 +1,6 @@
 //#region src/oxlint-plugin.d.ts
 declare function rewriteVitePlusImportSpecifier(specifier: string): string | null;
-declare const preferVitePlusImportsRule: import("@oxlint/plugins").Rule;
+export declare const preferVitePlusImportsRule: import("@oxlint/plugins").Rule;
 declare const plugin: import("@oxlint/plugins").Plugin;
 //#endregion
-export { plugin as default, preferVitePlusImportsRule, rewriteVitePlusImportSpecifier };
+export { plugin as default, rewriteVitePlusImportSpecifier };

package/dist/oxlint-plugin.js

@@ -1,4 +1,4 @@
-import { n as VITE_PLUS_OXLINT_PLUGIN_NAME, t as PREFER_VITE_PLUS_IMPORTS_RULE_NAME } from "./oxlint-plugin-config-DX5ezKbB.js";
+import { n as VITE_PLUS_OXLINT_PLUGIN_NAME, t as PREFER_VITE_PLUS_IMPORTS_RULE_NAME } from "./oxlint-plugin-config-BU42tr8y.js";
 import path from "node:path";
 import fs from "node:fs";
 import { definePlugin, defineRule } from "@oxlint/plugins";
@@ -23,12 +23,33 @@ function isVitestFamilyDeclareModuleSpecifier(specifier) {
 	return specifier === "vitest" || specifier.startsWith("vitest/") || specifier === "@vitest/browser" || specifier.startsWith("@vitest/browser/") || specifier.startsWith("@vitest/browser-");
 }
 const VITE_CONFIG_FILE_BASENAMES = new Set(vite_config_entry_basenames_default);
+function isOxlintFamilyDeclareModuleSpecifier(specifier) {
+	return specifier === OXLINT_PACKAGE || specifier.startsWith(`${OXLINT_PACKAGE}/`) || specifier === OXLINT_PLUGINS_PACKAGE;
+}
 function isViteSpecifier(specifier) {
 	return specifier === "vite" || specifier.startsWith("vite/");
 }
 function isViteConfigFile(filename) {
 	return VITE_CONFIG_FILE_BASENAMES.has(path.basename(filename));
 }
+const OXLINT_PACKAGE = "oxlint";
+const OXLINT_PLUGINS_PACKAGE = "@oxlint/plugins";
+const OXLINT_PLUGINS_DEV_SUBPATH = "oxlint/plugins-dev";
+const VITE_PLUS_LINT_PLUGINS = "vite-plus/lint/plugins";
+const VITE_PLUS_LINT_PLUGINS_DEV = "vite-plus/lint/plugins-dev";
+const OXLINT_CONFIG_SURFACE_EXPORTS = /* @__PURE__ */ new Set([
+	"defineConfig",
+	"AllowWarnDeny",
+	"DummyRule",
+	"DummyRuleMap",
+	"ExternalPluginEntry",
+	"ExternalPluginsConfig",
+	"OxlintConfig",
+	"OxlintEnv",
+	"OxlintGlobals",
+	"OxlintOverride",
+	"RuleCategories"
+]);
 function rewriteVitePlusImportSpecifier(specifier) {
 	if (specifier === "vite") return "vite-plus";
 	if (specifier.startsWith("vite/")) return `vite-plus/${specifier.slice(5)}`;
@@ -54,17 +75,26 @@ function rewriteVitePlusImportSpecifier(specifier) {
 		if (specifier === `${prefix}/context`) return "vite-plus/test/browser/context";
 		if (specifier === `${prefix}/provider`) return `vite-plus/test/browser/providers/${provider}`;
 	}
+	if (specifier === OXLINT_PLUGINS_PACKAGE) return VITE_PLUS_LINT_PLUGINS;
+	if (specifier === OXLINT_PLUGINS_DEV_SUBPATH) return VITE_PLUS_LINT_PLUGINS_DEV;
 	return null;
 }
+function moduleBindingName(node) {
+	return node.type === "Identifier" ? node.name : node.value;
+}
+function importsOxlintPluginApi(node) {
+	return node.specifiers.length > 0 && node.specifiers.every((specifier) => specifier.type === "ImportSpecifier" && !OXLINT_CONFIG_SURFACE_EXPORTS.has(moduleBindingName(specifier.imported)));
+}
 function quoteSpecifier(literal, replacement) {
 	const quote = literal.raw?.startsWith("'") ? "'" : "\"";
 	return `${quote}${replacement}${quote}`;
 }
 const nuxtTestUtilsPackageCache = /* @__PURE__ */ new Map();
+const oxlintOwnerPackageCache = /* @__PURE__ */ new Map();
 function isUpstreamVitestSpecifier(specifier) {
 	return specifier === "vitest" || specifier.startsWith("vitest/");
 }
-function nearestPackageUsesNuxtTestUtils(filename) {
+function nearestPackageMatches(filename, cache, matchesPackage) {
 	if (!path.isAbsolute(filename)) return false;
 	let directory = path.dirname(filename);
 	while (true) {
@@ -74,34 +104,34 @@ function nearestPackageUsesNuxtTestUtils(filename) {
 			try {
 				mtimeMs = fs.statSync(packageJsonPath).mtimeMs;
 			} catch {}
-			const cached = mtimeMs === void 0 ? void 0 : nuxtTestUtilsPackageCache.get(packageJsonPath);
-			if (cached !== void 0 && cached.mtimeMs === mtimeMs) return cached.usesNuxtTestUtils;
-			let usesNuxtTestUtils = false;
+			const cached = mtimeMs === void 0 ? void 0 : cache.get(packageJsonPath);
+			if (cached !== void 0 && cached.mtimeMs === mtimeMs) return cached.matches;
+			let matches = false;
 			try {
-				const pkg = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-				usesNuxtTestUtils = [
-					pkg.dependencies,
-					pkg.devDependencies,
-					pkg.optionalDependencies
-				].some((dependencies) => dependencies?.["@nuxt/test-utils"] !== void 0);
+				matches = matchesPackage(JSON.parse(fs.readFileSync(packageJsonPath, "utf8")));
 			} catch {}
-			if (mtimeMs !== void 0) nuxtTestUtilsPackageCache.set(packageJsonPath, {
+			if (mtimeMs !== void 0) cache.set(packageJsonPath, {
 				mtimeMs,
-				usesNuxtTestUtils
+				matches
 			});
-			return usesNuxtTestUtils;
+			return matches;
 		}
 		const parent = path.dirname(directory);
 		if (parent === directory) return false;
 		directory = parent;
 	}
 }
-function maybeReportLiteral(context, literal, preserveUpstreamVitest = false, fileIsViteConfig = false) {
-	if (!literal || literal.type !== "Literal" || typeof literal.value !== "string") return;
-	if (preserveUpstreamVitest && isUpstreamVitestSpecifier(literal.value)) return;
-	if (!fileIsViteConfig && isViteSpecifier(literal.value)) return;
-	const replacement = rewriteVitePlusImportSpecifier(literal.value);
-	if (!replacement) return;
+function nearestPackageUsesNuxtTestUtils(filename) {
+	return nearestPackageMatches(filename, nuxtTestUtilsPackageCache, (pkg) => [
+		pkg.dependencies,
+		pkg.devDependencies,
+		pkg.optionalDependencies
+	].some((dependencies) => dependencies?.["@nuxt/test-utils"] !== void 0));
+}
+function nearestPackageOwnsOxlintApi(filename) {
+	return nearestPackageMatches(filename, oxlintOwnerPackageCache, (pkg) => pkg.optionalDependencies?.[OXLINT_PLUGINS_PACKAGE] !== void 0 || [pkg.dependencies, pkg.peerDependencies].some((dependencies) => dependencies?.[OXLINT_PACKAGE] !== void 0 || dependencies?.[OXLINT_PLUGINS_PACKAGE] !== void 0));
+}
+function reportSpecifier(context, literal, replacement) {
 	context.report({
 		node: literal,
 		messageId: "preferVitePlusImports",
@@ -114,6 +144,30 @@ function maybeReportLiteral(context, literal, preserveUpstreamVitest = false, fi
 		}
 	});
 }
+function isOxlintApiSpecifier(specifier) {
+	return specifier === OXLINT_PLUGINS_PACKAGE || specifier === OXLINT_PLUGINS_DEV_SUBPATH;
+}
+function maybeReportLiteral(context, literal, { preserveUpstreamVitest, fileIsViteConfig, ownsOxlintApi }) {
+	if (!literal || literal.type !== "Literal" || typeof literal.value !== "string") return;
+	if (preserveUpstreamVitest && isUpstreamVitestSpecifier(literal.value)) return;
+	if (!fileIsViteConfig && isViteSpecifier(literal.value)) return;
+	const replacement = rewriteVitePlusImportSpecifier(literal.value);
+	if (!replacement) return;
+	if (ownsOxlintApi && isOxlintApiSpecifier(literal.value)) return;
+	reportSpecifier(context, literal, replacement);
+}
+function reportLegacyOxlintPluginApiExport(context, node, ownsOxlintApi) {
+	const literal = node.source;
+	if (!literal || literal.value !== OXLINT_PACKAGE || ownsOxlintApi) return;
+	if (node.specifiers.length === 0) return;
+	if (!node.specifiers.every((specifier) => !OXLINT_CONFIG_SURFACE_EXPORTS.has(moduleBindingName(specifier.local)))) return;
+	reportSpecifier(context, literal, VITE_PLUS_LINT_PLUGINS);
+}
+function reportLegacyOxlintPluginApiImport(context, node, ownsOxlintApi) {
+	const literal = node.source;
+	if (literal.value !== OXLINT_PACKAGE || ownsOxlintApi || !importsOxlintPluginApi(node)) return;
+	reportSpecifier(context, literal, VITE_PLUS_LINT_PLUGINS);
+}
 const preferVitePlusImportsRule = defineRule({
 	meta: {
 		type: "problem",
@@ -126,36 +180,43 @@ const preferVitePlusImportsRule = defineRule({
 		messages: { preferVitePlusImports: "Use '{{to}}' instead of '{{from}}' in Vite+ projects." }
 	},
 	createOnce(context) {
-		let preserveUpstreamVitest = false;
-		let fileIsViteConfig = false;
+		const options = {
+			preserveUpstreamVitest: false,
+			fileIsViteConfig: false,
+			ownsOxlintApi: false
+		};
 		return {
 			Program() {
-				preserveUpstreamVitest = nearestPackageUsesNuxtTestUtils(context.filename);
-				fileIsViteConfig = isViteConfigFile(context.filename);
+				options.preserveUpstreamVitest = nearestPackageUsesNuxtTestUtils(context.filename);
+				options.fileIsViteConfig = isViteConfigFile(context.filename);
+				options.ownsOxlintApi = nearestPackageOwnsOxlintApi(context.filename);
 			},
 			ImportDeclaration(node) {
-				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
+				maybeReportLiteral(context, node.source, options);
+				reportLegacyOxlintPluginApiImport(context, node, options.ownsOxlintApi);
 			},
 			ExportAllDeclaration(node) {
-				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
+				maybeReportLiteral(context, node.source, options);
 			},
 			ExportNamedDeclaration(node) {
-				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
+				maybeReportLiteral(context, node.source, options);
+				reportLegacyOxlintPluginApiExport(context, node, options.ownsOxlintApi);
 			},
 			ImportExpression(node) {
-				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
+				maybeReportLiteral(context, node.source, options);
 			},
 			TSImportType(node) {
-				maybeReportLiteral(context, node.source, preserveUpstreamVitest, fileIsViteConfig);
+				maybeReportLiteral(context, node.source, options);
 			},
 			TSExternalModuleReference(node) {
-				maybeReportLiteral(context, node.expression, preserveUpstreamVitest, fileIsViteConfig);
+				if (node.expression.type === "Literal" && typeof node.expression.value === "string" && isOxlintApiSpecifier(node.expression.value)) return;
+				maybeReportLiteral(context, node.expression, options);
 			},
 			TSModuleDeclaration(node) {
 				if (node.global) return;
 				const id = node.id;
-				if (id?.type === "Literal" && typeof id.value === "string" && isVitestFamilyDeclareModuleSpecifier(id.value)) return;
-				maybeReportLiteral(context, id, preserveUpstreamVitest, fileIsViteConfig);
+				if (id?.type === "Literal" && typeof id.value === "string" && (isVitestFamilyDeclareModuleSpecifier(id.value) || isOxlintFamilyDeclareModuleSpecifier(id.value))) return;
+				maybeReportLiteral(context, id, options);
 			}
 		};
 	}

package/dist/{pack-PvUg_xpv.d.ts → pack-BK38MLVZ.d.ts}

@@ -1,4 +1,4 @@
-import { UserConfig } from "@voidzero-dev/vite-plus-core/pack";
+import { UserConfig } from "vite/pack";
 //#region src/pack.d.ts
 interface PackUserConfig extends UserConfig {
   /**

package/dist/pack-bin.d.ts

@@ -1,4 +1,3 @@
 //#region src/pack-bin.d.ts
-declare function runCLI(): Promise<void>;
-//#endregion
-export { runCLI };
+export declare function runCLI(): Promise<void>;
+//#endregion