vite-plus 0.1.6 → 0.1.7

package/dist/config/hooks.js

@@ -77,7 +77,10 @@ export function install(dir = '.vite-hooks') {
     const target = rel ? `${rel}/${dir}/_` : `${dir}/_`;
     const checkResult = spawnSync('git', ['config', '--local', 'core.hooksPath']);
     const existingHooksPath = checkResult.status === 0 ? checkResult.stdout?.toString().trim() : '';
-    if (existingHooksPath && existingHooksPath !== target) {
+    if (existingHooksPath &&
+        existingHooksPath !== target &&
+        existingHooksPath !== '.husky' &&
+        !existingHooksPath.startsWith('.husky/')) {
         return {
             message: `core.hooksPath is already set to "${existingHooksPath}", skipping`,
             isError: false,

package/dist/global/config.js

@@ -327,7 +327,7 @@ function install(dir = ".vite-hooks") {
 		"core.hooksPath"
 	]);
 	const existingHooksPath = checkResult.status === 0 ? checkResult.stdout?.toString().trim() : "";
-	if (existingHooksPath && existingHooksPath !== target) return {
+	if (existingHooksPath && existingHooksPath !== target && existingHooksPath !== ".husky" && !existingHooksPath.startsWith(".husky/")) return {
 		message: `core.hooksPath is already set to "${existingHooksPath}", skipping`,
 		isError: false
 	};

package/dist/global/create.js

@@ -1,7 +1,7 @@
 import { i as __toESM, t as __commonJSMin } from "./chunk-CgnkrU7a.js";
 import { A as select, C as cancel, D as multiselect, E as log, M as text, N as Ct, S as PackageManager, T as intro, a as selectAgentTargetPaths, c as defaultInteractive, d as promptGitHooks, f as runViteFmt, g as displayRelative, j as spinner, l as downloadPackageManager$1, m as selectPackageManager, o as writeAgentInstructions, p as runViteInstall, r as detectExistingAgentTargetPaths, w as confirm, x as DependencyType, y as templatesDir } from "./agent-CpNB3GIY.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
-import { _ as rewriteMonorepo, a as detectExistingEditor, f as installGitHooks, n as updatePackageJsonWithDeps, o as selectEditor, r as updateWorkspaceConfig, s as writeEditorConfigs, t as detectWorkspace$1, v as rewriteMonorepoProject, y as rewriteStandaloneProject } from "./workspace-CiqQdO1L.js";
+import { _ as rewriteMonorepo, a as detectExistingEditor, f as installGitHooks, n as updatePackageJsonWithDeps, o as selectEditor, r as updateWorkspaceConfig, s as writeEditorConfigs, t as detectWorkspace$1, v as rewriteMonorepoProject, y as rewriteStandaloneProject } from "./workspace-pvS7F6d2.js";
 import "./browser-CBapUTD0.js";
 import { r as readJsonFile, t as editJsonFile } from "./json-BRdVJ52a.js";
 import "./package-YAMvX5PJ.js";
@@ -3700,7 +3700,7 @@ const listTemplatesMessage = renderCliDoc({
 				},
 				{
 					label: "vite:generator",
-					description: "Scaffold a new code generator"
+					description: "Scaffold a new code generator (monorepo only)"
 				}
 			]
 		},
@@ -3952,6 +3952,10 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
 		log.info("You are already in a monorepo workspace.\nUse a different template or run this command outside the monorepo");
 		cancelAndExit("Cannot create a monorepo inside an existing monorepo", 1);
 	}
+	if (selectedTemplateName === BuiltinTemplate.generator && !isMonorepo) {
+		log.info("The vite:generator template requires a monorepo workspace.\nRun this command inside a Vite+ monorepo, or create one first with `vp create vite:monorepo`");
+		cancelAndExit("Cannot create a generator outside a monorepo", 1);
+	}
 	if (isInSubdirectory && !compactOutput) log.info(`Detected monorepo root at ${accent(workspaceInfoOptional.rootDir)}`);
 	if (isMonorepo && options.interactive && !targetDir) {
 		let parentDir;

package/dist/global/migrate.js

@@ -1,7 +1,7 @@
 import { i as __toESM } from "./chunk-CgnkrU7a.js";
 import { A as select, E as log, N as Ct, S as PackageManager, a as selectAgentTargetPaths, c as defaultInteractive, d as promptGitHooks, g as displayRelative, h as upgradeYarn, j as spinner, k as outro, l as downloadPackageManager$1, m as selectPackageManager, o as writeAgentInstructions, p as runViteInstall, s as cancelAndExit, t as detectAgentConflicts, w as confirm } from "./agent-CpNB3GIY.js";
 import { t as lib_default } from "./lib-DxappLRQ.js";
-import { _ as rewriteMonorepo, b as createMigrationReport, c as checkViteVersion, d as detectPrettierProject, f as installGitHooks, g as preflightGitHooksSetup, h as migratePrettierToOxfmt, i as detectEditorConflicts, l as checkVitestVersion, m as migrateEslintToOxlint, o as selectEditor, p as mergeViteConfigFiles, s as writeEditorConfigs, t as detectWorkspace$1, u as detectEslintProject, x as require_semver, y as rewriteStandaloneProject } from "./workspace-CiqQdO1L.js";
+import { _ as rewriteMonorepo, b as createMigrationReport, c as checkViteVersion, d as detectPrettierProject, f as installGitHooks, g as preflightGitHooksSetup, h as migratePrettierToOxfmt, i as detectEditorConflicts, l as checkVitestVersion, m as migrateEslintToOxlint, o as selectEditor, p as mergeViteConfigFiles, s as writeEditorConfigs, t as detectWorkspace$1, u as detectEslintProject, x as require_semver, y as rewriteStandaloneProject } from "./workspace-pvS7F6d2.js";
 import "./browser-CBapUTD0.js";
 import "./json-BRdVJ52a.js";
 import { i as readNearestPackageJson, r as hasVitePlusDependency } from "./package-YAMvX5PJ.js";

package/dist/global/{workspace-CiqQdO1L.js → workspace-pvS7F6d2.js}

@@ -1911,6 +1911,8 @@ function rewriteStandaloneProject(projectPath, workspaceInfo, skipStagedMigratio
 	}
 	if (!skipStagedMigration) rewriteLintStagedConfigFile(projectPath, report);
 	mergeViteConfigFiles(projectPath, silent, report);
+	injectLintTypeCheckDefaults(projectPath, silent, report);
+	injectFmtDefaults(projectPath, silent, report);
 	mergeTsdownConfigFile(projectPath, silent, report);
 	rewriteAllImports(projectPath, silent, report);
 	setPackageManager(projectPath, workspaceInfo.downloadPackageManager);
@@ -1926,6 +1928,8 @@ function rewriteMonorepo(workspaceInfo, skipStagedMigration, silent = false, rep
 	for (const pkg of workspaceInfo.packages) rewriteMonorepoProject(path.join(workspaceInfo.rootDir, pkg.path), workspaceInfo.packageManager, skipStagedMigration, silent, report);
 	if (!skipStagedMigration) rewriteLintStagedConfigFile(workspaceInfo.rootDir, report);
 	mergeViteConfigFiles(workspaceInfo.rootDir, silent, report);
+	injectLintTypeCheckDefaults(workspaceInfo.rootDir, silent, report);
+	injectFmtDefaults(workspaceInfo.rootDir, silent, report);
 	mergeTsdownConfigFile(workspaceInfo.rootDir, silent, report);
 	rewriteAllImports(workspaceInfo.rootDir, silent, report);
 	setPackageManager(workspaceInfo.rootDir, workspaceInfo.downloadPackageManager);
@@ -2211,6 +2215,44 @@ function mergeViteConfigFiles(projectPath, silent = false, report) {
 	}
 	if (configs.oxfmtConfig) mergeAndRemoveJsonConfig(projectPath, viteConfig, configs.oxfmtConfig, "fmt", silent, report);
 }
+/**
+* Inject typeAware and typeCheck defaults into vite.config.ts lint config.
+* Called after mergeViteConfigFiles() to handle the case where no .oxlintrc.json exists
+* (e.g., newly created projects from create-vite templates).
+*/
+function injectLintTypeCheckDefaults(projectPath, silent = false, report) {
+	if (hasBaseUrlInTsconfig(projectPath)) return;
+	injectConfigDefaults(projectPath, "lint", ".vite-plus-lint-init.oxlintrc.json", JSON.stringify({ options: {
+		typeAware: true,
+		typeCheck: true
+	} }), silent, report);
+}
+/**
+* Inject an empty `fmt: {}` field into vite.config.ts if it doesn't already exist.
+* This is needed because oxfmt auto-discovers vite.config.ts and errors if
+* the `fmt` field is missing.
+*/
+function injectFmtDefaults(projectPath, silent = false, report) {
+	injectConfigDefaults(projectPath, "fmt", ".vite-plus-fmt-init.oxfmtrc.json", "{}", silent, report);
+}
+function injectConfigDefaults(projectPath, configKey, tempFileName, tempFileContent, silent, report) {
+	const configs = detectConfigs(projectPath);
+	if (configs.viteConfig) {
+		const content = fs.readFileSync(path.join(projectPath, configs.viteConfig), "utf8");
+		if (new RegExp(`\\b${configKey}\\s*:`).test(content)) return;
+	}
+	const viteConfig = ensureViteConfig(projectPath, configs, silent, report);
+	const tempConfigPath = path.join(projectPath, tempFileName);
+	fs.writeFileSync(tempConfigPath, tempFileContent);
+	const fullViteConfigPath = path.join(projectPath, viteConfig);
+	let result;
+	try {
+		result = mergeJsonConfig(fullViteConfigPath, tempConfigPath, configKey);
+	} finally {
+		fs.rmSync(tempConfigPath, { force: true });
+	}
+	if (result.updated) fs.writeFileSync(fullViteConfigPath, result.content);
+}
 function mergeAndRemoveJsonConfig(projectPath, viteConfigPath, jsonConfigPath, configKey, silent = false, report) {
 	const fullViteConfigPath = path.join(projectPath, viteConfigPath);
 	const fullJsonConfigPath = path.join(projectPath, jsonConfigPath);

package/dist/init-config.js

@@ -98,6 +98,26 @@ function hasConfigKey(viteConfigPath, configKey) {
     const viteConfig = fs.readFileSync(viteConfigPath, 'utf8');
     return new RegExp(`\\b${configKey}\\s*:`).test(viteConfig);
 }
+/**
+ * Ensure `fmt: {}` exists in vite.config.ts so oxfmt auto-discovery doesn't
+ * error when the config file lacks a `fmt` field.
+ */
+function injectFmtDefaultsIfMissing(viteConfigPath) {
+    if (hasConfigKey(viteConfigPath, 'fmt')) {
+        return;
+    }
+    const tempConfigPath = `${viteConfigPath}.fmt-init.json`;
+    fs.writeFileSync(tempConfigPath, '{}');
+    try {
+        const result = mergeJsonConfig(viteConfigPath, tempConfigPath, 'fmt');
+        if (result.updated) {
+            fs.writeFileSync(viteConfigPath, result.content);
+        }
+    }
+    finally {
+        fs.rmSync(tempConfigPath, { force: true });
+    }
+}
 async function vpFmt(cwd, filePath) {
     const { binPath, envs } = await resolveFmt();
     const result = await runCommandSilently({
@@ -186,6 +206,7 @@ export async function applyToolInitConfigToViteConfig(command, args, projectPath
         if (generatedConfigPath) {
             fs.rmSync(generatedConfigPath, { force: true });
         }
+        injectFmtDefaultsIfMissing(viteConfigPath);
         await vpFmt(projectPath, path.relative(projectPath, viteConfigPath));
         return {
             handled: true,
@@ -208,6 +229,7 @@ export async function applyToolInitConfigToViteConfig(command, args, projectPath
     }
     fs.writeFileSync(viteConfigPath, mergeResult.content);
     fs.rmSync(generatedConfigPath, { force: true });
+    injectFmtDefaultsIfMissing(viteConfigPath);
     await vpFmt(projectPath, path.relative(projectPath, viteConfigPath));
     return {
         handled: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plus",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "MIT",
   "bin": {
     "oxfmt": "./bin/oxfmt",
@@ -120,8 +120,8 @@
     },
     "./test/config": {
       "types": "./dist/test/config.d.ts",
-      "require": "./dist/test/config.cjs",
-      "default": "./dist/test/config.js"
+      "default": "./dist/test/config.js",
+      "require": "./dist/test/config.cjs"
     },
     "./test/coverage": {
       "types": "./dist/test/coverage.d.ts",
@@ -297,12 +297,12 @@
     "@oxc-project/types": "=0.115.0",
     "cac": "^6.7.14",
     "cross-spawn": "^7.0.5",
-    "oxfmt": "^0.36.0",
-    "oxlint": "^1.51.0",
+    "oxfmt": "^0.38.0",
+    "oxlint": "^1.53.0",
     "oxlint-tsgolint": "^0.16.0",
     "picocolors": "^1.1.1",
-    "@voidzero-dev/vite-plus-core": "0.1.6",
-    "@voidzero-dev/vite-plus-test": "0.1.6"
+    "@voidzero-dev/vite-plus-test": "0.1.7",
+    "@voidzero-dev/vite-plus-core": "0.1.7"
   },
   "devDependencies": {
     "@napi-rs/cli": "^3.4.1",
@@ -325,7 +325,7 @@
     "yaml": "^2.8.1",
     "@voidzero-dev/vite-plus-prompts": "0.0.0",
     "rolldown": "1.0.0-rc.8",
-    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.6"
+    "vite": "npm:@voidzero-dev/vite-plus-core@0.1.7"
   },
   "napi": {
     "binaryName": "vite-plus",
@@ -343,12 +343,12 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "optionalDependencies": {
-    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.6",
-    "@voidzero-dev/vite-plus-darwin-x64": "0.1.6",
-    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.6",
-    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.6",
-    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.6",
-    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.6"
+    "@voidzero-dev/vite-plus-darwin-arm64": "0.1.7",
+    "@voidzero-dev/vite-plus-darwin-x64": "0.1.7",
+    "@voidzero-dev/vite-plus-linux-arm64-gnu": "0.1.7",
+    "@voidzero-dev/vite-plus-linux-x64-gnu": "0.1.7",
+    "@voidzero-dev/vite-plus-win32-x64-msvc": "0.1.7",
+    "@voidzero-dev/vite-plus-win32-arm64-msvc": "0.1.7"
   },
   "scripts": {
     "build": "oxnode -C dev ./build.ts",