vite-plus 1.4.0 → 1.5.0

package/dist/hooks/bin.js

@@ -1,6 +1,6 @@
-import { i as log } from "../terminal-BcuPUy-j.js";
-import { d as status, i as enable, r as disable } from "../hooks-xRcJPc-O.js";
+import { d as status, i as enable, r as disable } from "../hooks-w_e2whkQ.js";
 import { t as unwrapCliParseOutcome } from "../cli-parse-aeUeFDlC.js";
+import { i as log } from "../terminal-BcuPUy-j.js";
 import { parseHooksArgs } from "../../binding/index.js";
 // src/hooks/bin.ts
 function applyResult(result) {

package/dist/{hooks-xRcJPc-O.js → hooks-w_e2whkQ.js}

@@ -168,39 +168,68 @@ function gitConfigLocalMissing(key) {
 		key
 	]).status === 1;
 }
+const GIT_CONFIG_LOCK_STATUSES = /* @__PURE__ */ new Set([255, 4294967295]);
+const GIT_CONFIG_NO_LOCK_RETRY = ["-c", "core.configLockTimeout=0"];
+const GIT_CONFIG_LOCK_RETRY_DELAYS_MS = [
+	50,
+	100,
+	200,
+	400,
+	800
+];
+function sleepSync(ms) {
+	Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function writeGitConfig(args, isApplied) {
+	const gitArgs = [...GIT_CONFIG_NO_LOCK_RETRY, ...args];
+	let result = spawnSync("git", gitArgs);
+	for (const delay of GIT_CONFIG_LOCK_RETRY_DELAYS_MS) {
+		if (!GIT_CONFIG_LOCK_STATUSES.has(result.status)) break;
+		sleepSync(delay);
+		if (isApplied()) return {
+			status: 0,
+			stderr: ""
+		};
+		result = spawnSync("git", gitArgs);
+	}
+	return {
+		status: result.status,
+		stderr: result.stderr?.toString().trim() ?? ""
+	};
+}
 function gitConfigSet(key, value) {
 	if (gitConfigLocalHas(key, value)) return { ok: true };
-	const result = spawnSync("git", [
+	const result = writeGitConfig([
 		"config",
 		"--local",
 		key,
 		value
-	]);
+	], () => gitConfigLocalHas(key, value));
 	if (result.status == null) return {
 		ok: false,
 		error: "git command not found"
 	};
 	if (result.status !== 0) return {
 		ok: false,
-		error: result.stderr?.toString().trim() || `failed to set ${key}`
+		error: result.stderr || `failed to set ${key}`
 	};
 	return { ok: true };
 }
 function gitConfigUnset(key) {
 	if (gitConfigLocalMissing(key)) return { ok: true };
-	const result = spawnSync("git", [
+	const result = writeGitConfig([
 		"config",
 		"--local",
 		"--unset-all",
 		key
-	]);
+	], () => gitConfigLocalMissing(key));
 	if (result.status == null) return {
 		ok: false,
 		error: "git command not found"
 	};
 	if (result.status !== 0 && result.status !== 5) return {
 		ok: false,
-		error: result.stderr?.toString().trim() || `failed to unset ${key}`
+		error: result.stderr || `failed to unset ${key}`
 	};
 	return { ok: true };
 }
@@ -426,21 +455,11 @@ function install(dir, options = {}) {
 		writeFileSync(internal(hook), HOOK_STUB_SCRIPT, { mode: 493 });
 		chmodSync(internal(hook), 493);
 	}
-	if (!gitConfigLocalHas("core.hooksPath", location.target)) {
-		const { status, stderr } = spawnSync("git", [
-			"config",
-			"core.hooksPath",
-			location.target
-		]);
-		if (status == null) return {
-			message: "git command not found",
-			isError: true
-		};
-		if (status) return {
-			message: "" + stderr,
-			isError: true
-		};
-	}
+	const storeHooksPath = gitConfigSet("core.hooksPath", location.target);
+	if (!storeHooksPath.ok) return {
+		message: storeHooksPath.error || "failed to set core.hooksPath",
+		isError: true
+	};
 	const clearDisabled = setHooksUserDisabled(false);
 	if (!clearDisabled.ok) return {
 		message: clearDisabled.error || "failed to clear hooks disabled preference",

package/dist/index.cjs

@@ -1,8 +1,8 @@
-const require_define_config = require("./define-config-Cv2P6NT2.cjs");
+const require_define_config = require("./define-config-CwtQqYC1.cjs");
 // src/index.cts
 const vite = require("vite");
 const { configDefaults, coverageConfigDefaults, defaultBrowserPort, defaultExclude, defaultInclude } = require("vitest/config");
-const { defineConfig, defineProject, lazyPlugins } = (require_define_config.init_define_config(), require_define_config.__toCommonJS(require_define_config.define_config_exports));
+const { defineConfig, defineProject, lazyPlugins, resolveConfigFromFile } = (require_define_config.init_define_config(), require_define_config.__toCommonJS(require_define_config.define_config_exports));
 module.exports = {
 	...vite,
 	configDefaults,
@@ -12,5 +12,6 @@ module.exports = {
 	defaultInclude,
 	defineProject,
 	defineConfig,
-	lazyPlugins
+	lazyPlugins,
+	resolveConfigFromFile
 };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { a as defineConfig, c as lazyPlugins, o as defineProject } from "./define-config-rPhYIFSn.js";
+import { l as lazyPlugins, n as ResolveConfigFromFileOptions, o as defineConfig, s as defineProject, u as resolveConfigFromFile } from "./define-config-BrvHRi-G.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 "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 };
+export { type ResolveConfigFromFileOptions, 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, resolveConfigFromFile };

package/dist/index.js

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

package/dist/lint-plugins.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./define-config-Cv2P6NT2.cjs");
+require("./define-config-CwtQqYC1.cjs");
 let _oxlint_plugins = require("@oxlint/plugins");
 Object.defineProperty(exports, "definePlugin", {
 	enumerable: true,