vite-plus 0.1.21 → 0.1.23

package/dist/bin.js

@@ -1,9 +1,10 @@
-import { a as DEFAULT_ENVS, i as BASEURL_TSCONFIG_WARNING, o as VITE_PLUS_NAME, u as resolve$1 } from "./main-A6UrSTYb.js";
-import { n as hasBaseUrlInTsconfig, o as runCommandSilently } from "./tsconfig-lBAWm4sf.js";
-import { n as errorMsg, r as log, s as warnMsg, t as accent } from "./terminal-CxTMfsxZ.js";
-import { r as resolveUniversalViteConfig } from "./resolve-vite-config-C1KX9CZU.js";
+import { i as VITE_PLUS_NAME, l as resolve$1, n as BASEURL_TSCONFIG_WARNING, r as DEFAULT_ENVS } from "./constants-DCBWlNrn.js";
+import { r as createDefaultVitePlusLintConfig } from "./oxlint-plugin-config-B89iKTKN.js";
+import { M as runCommandSilently, i as hasBaseUrlInTsconfig, r as fixBaseUrlInTsconfig } from "./tsconfig-DlUVXT3J.js";
+import { n as errorMsg, r as log, s as warnMsg, t as accent } from "./terminal-uTv0ZaMr.js";
+import { r as resolveUniversalViteConfig } from "./resolve-vite-config-TTvhycU1.js";
 import path, { dirname, join } from "node:path";
-import { mergeJsonConfig, run } from "../binding/index.js";
+import { hasConfigKey, mergeJsonConfig, run } from "../binding/index.js";
 import fs, { existsSync, realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { relative } from "node:path/win32";
@@ -112,10 +113,6 @@ export default defineConfig({});
 `);
 	return viteConfigPath;
 }
-function hasConfigKey(viteConfigPath, configKey) {
-	const viteConfig = fs.readFileSync(viteConfigPath, "utf8");
-	return new RegExp(`\\b${configKey}\\s*:`).test(viteConfig);
-}
 async function vpFmt(cwd, filePath) {
 	const { binPath, envs } = await fmt();
 	const result = await runCommandSilently({
@@ -174,13 +171,11 @@ async function applyToolInitConfigToViteConfig(command, args, projectPath = proc
 	}
 	if (spec.configKey === "lint" && hasTriggerFlag(args, ["--init"])) {
 		const lintInitConfigPath = path.join(projectPath, ".vite-plus-lint-init.oxlintrc.json");
+		await fixBaseUrlInTsconfig(projectPath);
 		const hasBaseUrl = hasBaseUrlInTsconfig(projectPath);
-		const initOptions = hasBaseUrl ? {} : {
-			typeAware: true,
-			typeCheck: true
-		};
+		const initConfig = createDefaultVitePlusLintConfig({ includeTypeAwareDefaults: !hasBaseUrl });
 		if (hasBaseUrl) warnMsg(BASEURL_TSCONFIG_WARNING);
-		fs.writeFileSync(lintInitConfigPath, JSON.stringify({ options: initOptions }));
+		fs.writeFileSync(lintInitConfigPath, JSON.stringify(initConfig));
 		const mergeResult = mergeJsonConfig(viteConfigPath, lintInitConfigPath, spec.configKey);
 		if (!mergeResult.updated) throw new Error(`Failed to initialize lint config in ${path.basename(viteConfigPath)}`);
 		fs.writeFileSync(viteConfigPath, mergeResult.content);