vite-plus 0.1.22 → 0.1.23

package/dist/fmt.d.ts

@@ -1,3 +1,3 @@
 import { format } from "oxfmt";
-export * from "oxfmt";
+export type * from "oxfmt";
 export { format };

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_define_config = require("./define-config-GqLoRwH9.cjs");
+const require_define_config = require("./define-config-BR1Y88zz.cjs");
 //#region src/index.cts
 const vite = require("@voidzero-dev/vite-plus-core");
 const vitest = require("@voidzero-dev/vite-plus-test/config");

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { n as lazyPlugins, t as defineConfig } from "./define-config-IMCGDS2K.js";
+import { n as lazyPlugins, t as defineConfig } from "./define-config-COdn-tsn.js";
 export * from "@voidzero-dev/vite-plus-test/config";
 export * from "@voidzero-dev/vite-plus-core";
 export { defineConfig, lazyPlugins };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as lazyPlugins, t as defineConfig } from "./define-config-CzWdQTt2.js";
+import { n as lazyPlugins, t as defineConfig } from "./define-config-BRC7qPNE.js";
 export * from "@voidzero-dev/vite-plus-test/config";
 export * from "@voidzero-dev/vite-plus-core";
 export { defineConfig, lazyPlugins };

package/dist/is-fullwidth-code-point-BUNlIICg.js

@@ -0,0 +1,8 @@
+import { i as isWide, r as isFullWidth } from "./strip-ansi-C3wrWz9t.js";
+//#region ../../node_modules/.pnpm/is-fullwidth-code-point@5.1.0/node_modules/is-fullwidth-code-point/index.js
+function isFullwidthCodePoint(codePoint) {
+	if (!Number.isInteger(codePoint)) return false;
+	return isFullWidth(codePoint) || isWide(codePoint);
+}
+//#endregion
+export { isFullwidthCodePoint as t };

package/dist/lint.d.ts

@@ -1 +1 @@
-export * from "oxlint";
+export type * from "oxlint";

package/dist/{log-update-NRrY6krx.js → log-update-lyIiuflf.js}

@@ -1,6 +1,6 @@
-import { t as stripAnsi } from "./strip-ansi-D-eYYcD2.js";
-import { t as sliceAnsi } from "./slice-ansi-e4todZeH.js";
-import { t as wrapAnsi } from "./wrap-ansi-DtUeUCjE.js";
+import { a as ansiStyles, t as stripAnsi } from "./strip-ansi-C3wrWz9t.js";
+import { t as isFullwidthCodePoint } from "./is-fullwidth-code-point-BUNlIICg.js";
+import { t as wrapAnsi } from "./wrap-ansi-k7Dn4VtV.js";
 import process$1 from "node:process";
 import os from "node:os";
 //#region ../../node_modules/.pnpm/environment@1.1.0/node_modules/environment/index.js
@@ -23,34 +23,18 @@ platform === "Android" || globalThis.navigator?.platform === "Android" || global
 //#endregion
 //#region ../../node_modules/.pnpm/ansi-escapes@7.2.0/node_modules/ansi-escapes/base.js
 const ESC = "\x1B[";
-const isTerminalApp = !isBrowser && process$1.env.TERM_PROGRAM === "Apple_Terminal";
+!isBrowser && process$1.env.TERM_PROGRAM;
 const isWindows = !isBrowser && process$1.platform === "win32";
 !isBrowser && (process$1.env.TERM?.startsWith("screen") || process$1.env.TERM?.startsWith("tmux") || process$1.env.TMUX);
 isBrowser || process$1.cwd;
 const cursorUp = (count = 1) => ESC + count + "A";
-ESC + "";
-isTerminalApp || ESC + "";
-isTerminalApp || ESC + "";
-ESC + "";
-ESC + "";
-ESC + "";
-ESC + "";
-ESC + "";
 const eraseLines = (count) => {
 	let clear = "";
 	for (let i = 0; i < count; i++) clear += eraseLine + (i < count - 1 ? cursorUp() : "");
 	if (count) clear += "\x1B[G";
 	return clear;
 };
-ESC + "";
-ESC + "";
-const eraseLine = ESC + "2K";
-ESC + "";
-ESC + "";
-const eraseScreen = ESC + "2J";
-ESC + "";
-ESC + "";
-`${eraseScreen}${ESC}`;
+const eraseLine = "\x1B[2K";
 const isOldWindows = () => {
 	if (isBrowser || !isWindows) return false;
 	const parts = os.release().split(".");
@@ -60,9 +44,7 @@ const isOldWindows = () => {
 	if (major === 10 && build < 10586) return true;
 	return false;
 };
-isOldWindows() ? `${eraseScreen}${ESC}` : `${eraseScreen}${ESC}${ESC}`;
-ESC + "";
-ESC + "";
+isOldWindows();
 //#endregion
 //#region ../../node_modules/.pnpm/mimic-function@5.0.1/node_modules/mimic-function/index.js
 const copyProperty = (to, from, property, ignoreNonConfigurable) => {
@@ -355,6 +337,111 @@ cliCursor.toggle = (force, writableStream) => {
 	else cliCursor.hide(writableStream);
 };
 //#endregion
+//#region ../../node_modules/.pnpm/slice-ansi@7.1.2/node_modules/slice-ansi/index.js
+const ESCAPES = new Set([27, 155]);
+const CODE_POINT_0 = "0".codePointAt(0);
+const CODE_POINT_9 = "9".codePointAt(0);
+const MAX_ANSI_SEQUENCE_LENGTH = 19;
+const endCodesSet = /* @__PURE__ */ new Set();
+const endCodesMap = /* @__PURE__ */ new Map();
+for (const [start, end] of ansiStyles.codes) {
+	endCodesSet.add(ansiStyles.color.ansi(end));
+	endCodesMap.set(ansiStyles.color.ansi(start), ansiStyles.color.ansi(end));
+}
+function getEndCode(code) {
+	if (endCodesSet.has(code)) return code;
+	if (endCodesMap.has(code)) return endCodesMap.get(code);
+	code = code.slice(2);
+	if (code.includes(";")) code = code[0] + "0";
+	const returnValue = ansiStyles.codes.get(Number.parseInt(code, 10));
+	if (returnValue) return ansiStyles.color.ansi(returnValue);
+	return ansiStyles.reset.open;
+}
+function findNumberIndex(string) {
+	for (let index = 0; index < string.length; index++) {
+		const codePoint = string.codePointAt(index);
+		if (codePoint >= CODE_POINT_0 && codePoint <= CODE_POINT_9) return index;
+	}
+	return -1;
+}
+function parseAnsiCode(string, offset) {
+	string = string.slice(offset, offset + MAX_ANSI_SEQUENCE_LENGTH);
+	const startIndex = findNumberIndex(string);
+	if (startIndex !== -1) {
+		let endIndex = string.indexOf("m", startIndex);
+		if (endIndex === -1) endIndex = string.length;
+		return string.slice(0, endIndex + 1);
+	}
+}
+function tokenize(string, endCharacter = Number.POSITIVE_INFINITY) {
+	const returnValue = [];
+	let index = 0;
+	let visibleCount = 0;
+	while (index < string.length) {
+		const codePoint = string.codePointAt(index);
+		if (ESCAPES.has(codePoint)) {
+			const code = parseAnsiCode(string, index);
+			if (code) {
+				returnValue.push({
+					type: "ansi",
+					code,
+					endCode: getEndCode(code)
+				});
+				index += code.length;
+				continue;
+			}
+		}
+		const isFullWidth = isFullwidthCodePoint(codePoint);
+		const character = String.fromCodePoint(codePoint);
+		returnValue.push({
+			type: "character",
+			value: character,
+			isFullWidth
+		});
+		index += character.length;
+		visibleCount += isFullWidth ? 2 : character.length;
+		if (visibleCount >= endCharacter) break;
+	}
+	return returnValue;
+}
+function reduceAnsiCodes(codes) {
+	let returnValue = [];
+	for (const code of codes) if (code.code === ansiStyles.reset.open) returnValue = [];
+	else if (endCodesSet.has(code.code)) returnValue = returnValue.filter((returnValueCode) => returnValueCode.endCode !== code.code);
+	else {
+		returnValue = returnValue.filter((returnValueCode) => returnValueCode.endCode !== code.endCode);
+		returnValue.push(code);
+	}
+	return returnValue;
+}
+function undoAnsiCodes(codes) {
+	return reduceAnsiCodes(codes).map(({ endCode }) => endCode).reverse().join("");
+}
+function sliceAnsi(string, start, end) {
+	const tokens = tokenize(string, end);
+	let activeCodes = [];
+	let position = 0;
+	let returnValue = "";
+	let include = false;
+	for (const token of tokens) {
+		if (end !== void 0 && position >= end) break;
+		if (token.type === "ansi") {
+			activeCodes.push(token);
+			if (include) returnValue += token.code;
+		} else {
+			if (!include && position >= start) {
+				include = true;
+				activeCodes = reduceAnsiCodes(activeCodes);
+				returnValue = activeCodes.map(({ code }) => code).join("");
+			}
+			if (include) returnValue += token.value;
+			position += token.isFullWidth ? 2 : token.value.length;
+		}
+	}
+	returnValue += undoAnsiCodes(activeCodes);
+	return returnValue;
+}
+//#endregion
 //#region ../../node_modules/.pnpm/log-update@6.1.0/node_modules/log-update/index.js
 const defaultTerminalHeight = 24;
 const getWidth = ({ columns = 80 }) => columns;

package/dist/migration/bin.js

@@ -1,12 +1,13 @@
-import { r as __toESM } from "../chunk-q7NCDQ7-.js";
-import { o as isForceOverrideMode } from "../constants-kDaYqyWd.js";
-import { a as printHeader, i as muted, r as log, t as accent } from "../terminal-D_Kg-AA6.js";
-import { $ as log$1, C as migratePrettierToOxfmt, D as rewriteMonorepo, E as promptPrettierMigration, G as displayRelative, H as runViteInstall, I as cancelAndExit, J as PackageManager, L as defaultInteractive, M as warnPackageLevelEslint, N as warnPackageLevelPrettier, R as downloadPackageManager, S as migrateNodeVersionManagerFile, T as promptEslintMigration, U as selectPackageManager, W as upgradeYarn, Y as require_semver, Z as confirm, a as writeAgentInstructions, b as mergeViteConfigFiles, c as checkVitestVersion, d as detectEslintProject, f as detectFramework, g as hasFrameworkShim, j as warnLegacyEslintConfig, k as rewriteStandaloneProject, l as confirmEslintMigration, m as detectPrettierProject, n as detectExistingAgentTargetPaths, nt as select, o as addFrameworkShim, ot as q, p as detectNodeVersionManagerFile, r as selectAgentTargetPaths, rt as spinner, s as checkViteVersion, t as detectAgentConflicts, tt as outro, u as confirmPrettierMigration, w as preflightGitHooksSetup, x as migrateEslintToOxlint, y as installGitHooks, z as promptGitHooks } from "../agent-BWLe0i9g.js";
-import { t as lib_default } from "../lib-DpwyUJWo.js";
-import { a as readNearestPackageJson, i as hasVitePlusDependency } from "../package-BoLLED6j.js";
-import { r as createMigrationReport } from "../report-CYPv1VK1.js";
-import { c as writeEditorConfigs, i as detectEditorConflicts, o as selectEditor, t as detectWorkspace } from "../workspace-Bi_9spVt.js";
-import { t as renderCliDoc } from "../help-DK5wuu34.js";
+import { r as __toESM } from "../chunk-DnnnRqeS.js";
+import { c as isForceOverrideMode } from "../constants-DCBWlNrn.js";
+import { A as q, C as log, D as spinner, E as select, T as outro, c as defaultInteractive, d as promptGitHooks, g as upgradeYarn, h as selectPackageManager, i as hasBaseUrlInTsconfig, l as downloadPackageManager, m as runViteInstall, r as fixBaseUrlInTsconfig, s as cancelAndExit, t as confirmBaseUrlFix, v as PackageManager, x as confirm, y as require_semver } from "../tsconfig-DlUVXT3J.js";
+import { a as printHeader, i as muted, r as log$1, t as accent } from "../terminal-uTv0ZaMr.js";
+import { t as lib_default } from "../lib-L3DWSRQp.js";
+import { a as readNearestPackageJson, i as hasVitePlusDependency } from "../package-PmBUZ-ve.js";
+import { A as promptEslintMigration, C as injectLintTypeCheckDefaults, D as migrateNodeVersionManagerFile, E as migrateEslintToOxlint, H as displayRelative, I as warnIncompatibleEslintIntegration, L as warnLegacyEslintConfig, M as rewriteMonorepo, O as migratePrettierToOxfmt, P as rewriteStandaloneProject, R as warnPackageLevelEslint, T as mergeViteConfigFiles, _ as detectNodeVersionManagerFile, b as hasFrameworkShim, d as checkVitestVersion, f as confirmEslintMigration, g as detectIncompatibleEslintIntegration, h as detectFramework, i as selectAgentTargetPaths, j as promptPrettierMigration, k as preflightGitHooksSetup, l as addFrameworkShim, m as detectEslintProject, n as detectAgentConflicts, p as confirmPrettierMigration, r as detectExistingAgentTargetPaths, s as writeAgentInstructions, u as checkViteVersion, v as detectPrettierProject, w as installGitHooks, z as warnPackageLevelPrettier } from "../agent-aSGY0osq.js";
+import { n as addMigrationWarning, r as createMigrationReport } from "../report-DgSBQUdz.js";
+import { c as writeEditorConfigs, i as detectEditorConflicts, o as selectEditor, t as detectWorkspace } from "../workspace-DElv730L.js";
+import { t as renderCliDoc } from "../help-YP84FSEz.js";
 import path from "node:path";
 import { styleText } from "node:util";
 //#region src/migration/bin.ts
@@ -41,6 +42,31 @@ async function confirmFrameworkShim(framework, interactive) {
 	}
 	return true;
 }
+async function fixBaseUrlForWorkspace(workspaceInfo, fixBaseUrl, updateProgress, report) {
+	if (!fixBaseUrl) return [];
+	const fixedProjectPaths = [];
+	for (const projectPath of getWorkspaceProjectPaths(workspaceInfo)) {
+		if (!hasBaseUrlInTsconfig(projectPath)) continue;
+		updateProgress?.(`Fixing tsconfig baseUrl${projectPath === workspaceInfo.rootDir ? "" : ` in ${displayRelative(projectPath, workspaceInfo.rootDir)}`}`);
+		const status = await fixBaseUrlInTsconfig(projectPath, {
+			confirmed: true,
+			silent: true
+		});
+		if (status === "failed") addMigrationWarning(report, `Failed to remove tsconfig baseUrl in ${displayRelative(projectPath, workspaceInfo.rootDir) || "."}. Run \`vp dlx @andrewbranch/ts5to6 --fixBaseUrl <tsconfig path>\` manually and re-run the migration.`);
+		if (status === "fixed") fixedProjectPaths.push(projectPath);
+	}
+	return fixedProjectPaths;
+}
+function getWorkspaceProjectPaths(workspaceInfo) {
+	return [workspaceInfo.rootDir, ...(workspaceInfo.packages ?? []).map((pkg) => path.join(workspaceInfo.rootDir, pkg.path))];
+}
+function hasBaseUrlInWorkspace(workspaceInfo) {
+	for (const projectPath of getWorkspaceProjectPaths(workspaceInfo)) {
+		if (!hasBaseUrlInTsconfig(projectPath)) continue;
+		return true;
+	}
+	return false;
+}
 const helpMessage = renderCliDoc({
 	usage: "vp migrate [PATH] [OPTIONS]",
 	summary: "Migrate standalone Vite, Vitest, Oxlint, Oxfmt, and Prettier projects to unified Vite+.",
@@ -176,7 +202,7 @@ async function collectMigrationPlan(rootDir, detectedPackageManager, options, pa
 	if (shouldSetupHooks) {
 		const reason = preflightGitHooksSetup(rootDir);
 		if (reason) {
-			log$1.warn(`⚠ ${reason}`);
+			log.warn(`⚠ ${reason}`);
 			shouldSetupHooks = false;
 		}
 	}
@@ -236,14 +262,20 @@ async function collectMigrationPlan(rootDir, detectedPackageManager, options, pa
 		editorConflictDecisions.set(conflict.fileName, action);
 	} else editorConflictDecisions.set(conflict.fileName, "merge");
 	const eslintProject = detectEslintProject(rootDir, packages);
+	const incompatibleEslintIntegration = detectIncompatibleEslintIntegration(rootDir, packages);
 	let migrateEslint = false;
-	if (eslintProject.hasDependency && !eslintProject.configFile && eslintProject.legacyConfigFile) warnLegacyEslintConfig(eslintProject.legacyConfigFile);
+	if (incompatibleEslintIntegration) warnIncompatibleEslintIntegration(incompatibleEslintIntegration);
+	else if (eslintProject.hasDependency && !eslintProject.configFile && eslintProject.legacyConfigFile) warnLegacyEslintConfig(eslintProject.legacyConfigFile);
 	else if (eslintProject.hasDependency && eslintProject.configFile) migrateEslint = await confirmEslintMigration(options.interactive);
 	else if (eslintProject.hasDependency) warnPackageLevelEslint();
 	const prettierProject = detectPrettierProject(rootDir, packages);
 	let migratePrettier = false;
 	if (prettierProject.hasDependency && prettierProject.configFile) migratePrettier = await confirmPrettierMigration(options.interactive);
 	else if (prettierProject.hasDependency) warnPackageLevelPrettier();
+	const fixBaseUrl = hasBaseUrlInWorkspace({
+		rootDir,
+		packages
+	}) ? await confirmBaseUrlFix(options.interactive) : false;
 	const nodeVersionDetection = detectNodeVersionManagerFile(rootDir);
 	let migrateNodeVersionFile = false;
 	if (nodeVersionDetection) migrateNodeVersionFile = await confirmNodeVersionFileMigration(options.interactive, nodeVersionDetection);
@@ -267,6 +299,7 @@ async function collectMigrationPlan(rootDir, detectedPackageManager, options, pa
 		eslintConfigFile: eslintProject.configFile,
 		migratePrettier,
 		prettierConfigFile: prettierProject.configFile,
+		fixBaseUrl,
 		migrateNodeVersionFile,
 		nodeVersionDetection,
 		frameworkShimFrameworks: frameworkShimFrameworks.length > 0 ? frameworkShimFrameworks : void 0
@@ -282,33 +315,33 @@ function showMigrationSummary(options) {
 	const { projectRoot, packageManager, packageManagerVersion, installDurationMs, report, updatedExistingVitePlus } = options;
 	const projectLabel = displayRelative(projectRoot) || ".";
 	const configUpdates = report.createdViteConfigCount + report.mergedConfigCount + report.mergedStagedConfigCount + report.inlinedLintStagedConfigCount + report.removedConfigCount + report.tsdownImportCount;
-	log(`${styleText("magenta", "◇")} ${updatedExistingVitePlus ? "Updated" : "Migrated"} ${accent(projectLabel)}${updatedExistingVitePlus ? "" : " to Vite+"}`);
-	log(`${styleText("gray", "•")} Node ${process.versions.node}  ${packageManager} ${packageManagerVersion}`);
-	if (installDurationMs > 0) log(`${styleText("green", "✓")} Dependencies installed in ${formatDuration(installDurationMs)}`);
+	log$1(`${styleText("magenta", "◇")} ${updatedExistingVitePlus ? "Updated" : "Migrated"} ${accent(projectLabel)}${updatedExistingVitePlus ? "" : " to Vite+"}`);
+	log$1(`${styleText("gray", "•")} Node ${process.versions.node}  ${packageManager} ${packageManagerVersion}`);
+	if (installDurationMs > 0) log$1(`${styleText("green", "✓")} Dependencies installed in ${formatDuration(installDurationMs)}`);
 	if (configUpdates > 0 || report.rewrittenImportFileCount > 0) {
 		const parts = [];
 		if (configUpdates > 0) parts.push(`${configUpdates} ${configUpdates === 1 ? "config update" : "config updates"} applied`);
 		if (report.rewrittenImportFileCount > 0) parts.push(`${report.rewrittenImportFileCount} ${report.rewrittenImportFileCount === 1 ? "file had" : "files had"} imports rewritten`);
-		log(`${styleText("gray", "•")} ${parts.join(", ")}`);
+		log$1(`${styleText("gray", "•")} ${parts.join(", ")}`);
 	}
-	if (report.eslintMigrated) log(`${styleText("gray", "•")} ESLint rules migrated to Oxlint`);
-	if (report.prettierMigrated) log(`${styleText("gray", "•")} Prettier migrated to Oxfmt`);
-	if (report.nodeVersionFileMigrated) log(`${styleText("gray", "•")} Node version manager file migrated to .node-version`);
-	if (report.gitHooksConfigured) log(`${styleText("gray", "•")} Git hooks configured`);
-	if (report.frameworkShimAdded) log(`${styleText("gray", "•")} TypeScript shim added for framework component files`);
+	if (report.eslintMigrated) log$1(`${styleText("gray", "•")} ESLint rules migrated to Oxlint`);
+	if (report.prettierMigrated) log$1(`${styleText("gray", "•")} Prettier migrated to Oxfmt`);
+	if (report.nodeVersionFileMigrated) log$1(`${styleText("gray", "•")} Node version manager file migrated to .node-version`);
+	if (report.gitHooksConfigured) log$1(`${styleText("gray", "•")} Git hooks configured`);
+	if (report.frameworkShimAdded) log$1(`${styleText("gray", "•")} TypeScript shim added for framework component files`);
 	if (report.warnings.length > 0) {
-		log(`${styleText("yellow", "!")} Warnings:`);
-		for (const warning of report.warnings) log(`  - ${warning}`);
+		log$1(`${styleText("yellow", "!")} Warnings:`);
+		for (const warning of report.warnings) log$1(`  - ${warning}`);
 	}
 	if (report.manualSteps.length > 0) {
-		log(`${styleText("blue", "→")} Manual follow-up:`);
-		for (const step of report.manualSteps) log(`  - ${step}`);
+		log$1(`${styleText("blue", "→")} Manual follow-up:`);
+		for (const step of report.manualSteps) log$1(`  - ${step}`);
 	}
 }
 async function checkRolldownCompatibility(rootDir, report) {
 	try {
 		const { resolveConfig } = await import("../index.js");
-		const { checkManualChunksCompat } = await import("../compat-OlmU9EQz.js");
+		const { checkManualChunksCompat } = await import("../compat-DXZgnEyq.js");
 		checkManualChunksCompat((await resolveConfig({
 			root: rootDir,
 			logLevel: "silent",
@@ -353,11 +386,11 @@ async function executeMigrationPlan(workspaceInfoOptional, plan, interactive) {
 		await upgradeYarn(workspaceInfo.rootDir, interactive, true);
 	} else if (plan.packageManager === PackageManager.pnpm && import_semver.default.satisfies(downloadResult.version, "< 9.5.0")) {
 		failMigrationProgress("Migration failed");
-		log$1.error(`✘ pnpm@${downloadResult.version} is not supported by auto migration, please upgrade pnpm to >=9.5.0 first`);
+		log.error(`✘ pnpm@${downloadResult.version} is not supported by auto migration, please upgrade pnpm to >=9.5.0 first`);
 		cancelAndExit("Vite+ cannot automatically migrate this project yet.", 1);
 	} else if (plan.packageManager === PackageManager.npm && import_semver.default.satisfies(downloadResult.version, "< 8.3.0")) {
 		failMigrationProgress("Migration failed");
-		log$1.error(`✘ npm@${downloadResult.version} is not supported by auto migration, please upgrade npm to >=8.3.0 first`);
+		log.error(`✘ npm@${downloadResult.version} is not supported by auto migration, please upgrade npm to >=8.3.0 first`);
 		cancelAndExit("Vite+ cannot automatically migrate this project yet.", 1);
 	}
 	if (plan.migrateNodeVersionFile && plan.nodeVersionDetection) {
@@ -380,6 +413,7 @@ async function executeMigrationPlan(workspaceInfoOptional, plan, interactive) {
 	updateMigrationProgress("Checking config compatibility");
 	await checkRolldownCompatibility(workspaceInfo.rootDir, report);
 	if (workspaceInfo.packages) for (const pkg of workspaceInfo.packages) await checkRolldownCompatibility(path.join(workspaceInfo.rootDir, pkg.path), report);
+	await fixBaseUrlForWorkspace(workspaceInfo, plan.fixBaseUrl, updateMigrationProgress, report);
 	if (plan.migrateEslint) {
 		updateMigrationProgress("Migrating ESLint");
 		if (!await migrateEslintToOxlint(workspaceInfo.rootDir, interactive, plan.eslintConfigFile, workspaceInfo.packages, {
@@ -452,7 +486,7 @@ async function main() {
 	const { projectPath, options } = parseArgs();
 	if (options.help) {
 		printHeader();
-		log(helpMessage);
+		log$1(helpMessage);
 		return;
 	}
 	printHeader();
@@ -480,6 +514,13 @@ async function main() {
 				migrationProgressStarted = false;
 			}
 		};
+		const fixedBaseUrlProjectPaths = await fixBaseUrlForWorkspace(workspaceInfoOptional, hasBaseUrlInWorkspace(workspaceInfoOptional) ? await confirmBaseUrlFix(options.interactive) : false, updateMigrationProgress, report);
+		if (fixedBaseUrlProjectPaths.length > 0) {
+			updateMigrationProgress("Updating lint defaults");
+			for (const projectPath of fixedBaseUrlProjectPaths) injectLintTypeCheckDefaults(projectPath, true, report);
+			didMigrate = true;
+		}
+		clearMigrationProgress();
 		const eslintMigrated = await promptEslintMigration(workspaceInfoOptional.rootDir, options.interactive, workspaceInfoOptional.packages);
 		const prettierMigrated = await promptPrettierMigration(workspaceInfoOptional.rootDir, options.interactive, workspaceInfoOptional.packages);
 		const nodeVersionDetection = detectNodeVersionManagerFile(workspaceInfoOptional.rootDir);
@@ -488,7 +529,7 @@ async function main() {
 		}
 		if (eslintMigrated || prettierMigrated) {
 			updateMigrationProgress("Rewriting configs");
-			mergeViteConfigFiles(workspaceInfoOptional.rootDir, true, report);
+			mergeViteConfigFiles(workspaceInfoOptional.rootDir, true, report, workspaceInfoOptional.packages);
 			updateMigrationProgress("Installing dependencies");
 			let resolvedVersion = workspaceInfoOptional.packageManagerVersion;
 			if (workspaceInfoOptional.packageManager && !import_semver.default.valid(import_semver.default.coerce(resolvedVersion) ?? "")) resolvedVersion = (await downloadPackageManager(workspaceInfoOptional.packageManager, resolvedVersion, options.interactive, true)).version;
@@ -533,7 +574,7 @@ async function main() {
 	});
 }
 main().catch((err) => {
-	log$1.error(err.message);
+	log.error(err.message);
 	console.error(err);
 	process.exit(1);
 });

package/dist/{oxlint-plugin-config-BkQeR4FR.js → oxlint-plugin-config-B89iKTKN.js}

@@ -1,4 +1,4 @@
-import { r as VITE_PLUS_NAME } from "./constants-kDaYqyWd.js";
+import { i as VITE_PLUS_NAME } from "./constants-DCBWlNrn.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,8 +1,6 @@
-import * as _$_oxlint_plugins0 from "@oxlint/plugins";
-
 //#region src/oxlint-plugin.d.ts
 declare function rewriteVitePlusImportSpecifier(specifier: string): string | null;
-declare const preferVitePlusImportsRule: _$_oxlint_plugins0.Rule;
-declare const plugin: _$_oxlint_plugins0.Plugin;
+declare const preferVitePlusImportsRule: import("@oxlint/plugins").Rule;
+declare const plugin: import("@oxlint/plugins").Plugin;
 //#endregion
 export { plugin as default, preferVitePlusImportsRule, 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-BkQeR4FR.js";
+import { n as VITE_PLUS_OXLINT_PLUGIN_NAME, t as PREFER_VITE_PLUS_IMPORTS_RULE_NAME } from "./oxlint-plugin-config-B89iKTKN.js";
 import { definePlugin, defineRule } from "@oxlint/plugins";
 //#region src/oxlint-plugin.ts
 function rewriteVitePlusImportSpecifier(specifier) {

package/dist/pack-bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as resolveViteConfig } from "./resolve-vite-config-C5AjksTj.js";
+import { i as resolveViteConfig } from "./resolve-vite-config-TTvhycU1.js";
 import module from "node:module";
 import { buildWithConfigs, enableDebug, globalLogger, resolveUserConfig } from "@voidzero-dev/vite-plus-core/pack";
 //#region ../../node_modules/.pnpm/cac@7.0.0/node_modules/cac/dist/index.js

package/dist/pack.d.ts

@@ -1,3 +1,3 @@
-import { t as PackUserConfig } from "./pack-K7H72Cum.js";
+import { t as PackUserConfig } from "./pack-Ciiho0Tq.js";
 export * from "@voidzero-dev/vite-plus-core/pack";
 export { PackUserConfig };

package/dist/{package-BoLLED6j.js → package-PmBUZ-ve.js}

@@ -1,5 +1,5 @@
-import "./constants-kDaYqyWd.js";
-import { r as parse } from "./main-DhsO6ndq.js";
+import "./constants-DCBWlNrn.js";
+import { r as parse } from "./main-DpJl3LoU.js";
 import { createRequire } from "node:module";
 import path from "node:path";
 import fs from "node:fs";

package/dist/staged/bin.js

@@ -1,16 +1,16 @@
-import { r as __toESM, t as __commonJSMin } from "../chunk-q7NCDQ7-.js";
-import { a as printHeader, n as errorMsg, r as log } from "../terminal-D_Kg-AA6.js";
-import { i as resolveViteConfig } from "../resolve-vite-config-C5AjksTj.js";
-import { t as lib_default } from "../lib-DpwyUJWo.js";
-import { t as renderCliDoc } from "../help-DK5wuu34.js";
+import { r as __toESM, t as __commonJSMin } from "../chunk-DnnnRqeS.js";
+import { a as printHeader, n as errorMsg, r as log } from "../terminal-uTv0ZaMr.js";
+import { i as resolveViteConfig } from "../resolve-vite-config-TTvhycU1.js";
+import { t as lib_default } from "../lib-L3DWSRQp.js";
+import { t as renderCliDoc } from "../help-YP84FSEz.js";
 import { createRequire } from "node:module";
 import path, { delimiter, dirname, resolve } from "node:path";
 import { constants } from "node:fs";
 import { formatWithOptions, inspect, promisify } from "node:util";
-import { pathToFileURL } from "node:url";
 import { cwd } from "node:process";
 import E from "node:readline";
 import nodeTty from "node:tty";
+import { pathToFileURL } from "node:url";
 import { EOL } from "node:os";
 import fsPromises, { constants as constants$1 } from "node:fs/promises";
 import { PassThrough, Writable } from "node:stream";
@@ -1811,9 +1811,9 @@ var DefaultRenderer = class DefaultRenderer {
 		this.logger.options.color = this.options.color;
 	}
 	async render() {
-		const { createLogUpdate } = await import("../log-update-NRrY6krx.js");
-		const { default: truncate } = await import("../cli-truncate-B62YnW2m.js");
-		const { default: wrap } = await import("../wrap-ansi-3S3qJ7j8.js");
+		const { createLogUpdate } = await import("../log-update-lyIiuflf.js");
+		const { default: truncate } = await import("../cli-truncate-CWsmbK3p.js");
+		const { default: wrap } = await import("../wrap-ansi-CeQuiQ31.js");
 		this.updater = createLogUpdate(this.logger.process.stdout);
 		this.truncate = truncate;
 		this.wrap = wrap;
@@ -6179,7 +6179,7 @@ const jsonParse = async (filename) => {
 const yamlParse = async (filename) => {
 	const isPackageFile = PACKAGE_YAML_FILES.includes(path.basename(filename));
 	try {
-		const [YAML, content] = await Promise.all([import("../dist-DZfItHAr.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1)), readFile(filename)]);
+		const [YAML, content] = await Promise.all([import("../dist-Bapm49IR.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1)), readFile(filename)]);
 		const yaml = YAML.parse(content);
 		return isPackageFile ? yaml[CONFIG_NAME] : yaml;
 	} catch (error) {