vite-plus 1.3.0 → 1.5.0

package/dist/{help-BmKpeOP9.js → help-B03t_iQ4.js}

@@ -1,5 +1,5 @@
 import { stripVTControlCharacters, styleText } from "node:util";
-//#region src/utils/help.ts
+// src/utils/help.ts
 const HELP_RIGHT_MARGIN = 4;
 function toLines(value) {
 	if (!value) return [];
@@ -87,5 +87,4 @@ function renderCliDoc(doc, options = {}) {
 	output.push("");
 	return output.join("\n");
 }
-//#endregion
 export { renderCliDoc as t };

package/dist/hooks/bin.js

@@ -1,8 +1,8 @@
-import { i as log } from "../terminal-MKGAuy-p.js";
-import { l as status, n as disable, r as enable } from "../hooks-DhwsWb46.js";
-import { t as unwrapCliParseOutcome } from "../cli-parse-DHE8NrBU.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";
-//#region src/hooks/bin.ts
+// src/hooks/bin.ts
 function applyResult(result) {
 	if (result.message) log(result.message);
 	if (result.isError) process.exit(1);
@@ -22,5 +22,4 @@ async function main() {
 	}
 }
 main();
-//#endregion
 export {};

package/dist/{hooks-DhwsWb46.js → hooks-w_e2whkQ.js}

@@ -1,7 +1,7 @@
 import { isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import { chmodSync, existsSync, lstatSync, mkdirSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { spawnSync } from "node:child_process";
-//#region src/config/hooks.ts
+// src/config/hooks.ts
 const SUPPORTED_GIT_HOOK_NAMES = [
 	"pre-commit",
 	"pre-merge-commit",
@@ -58,6 +58,8 @@ c=$?
 [ $c = 127 ] && echo "VITE+ - command not found in PATH=$PATH"
 exit $c`;
 }
+/** The per-hook stub written to `<dir>/_/<hook>`; it sources the `h` dispatcher. */
+const HOOK_STUB_SCRIPT = "#!/usr/bin/env sh\n. \"$(dirname \"$0\")/h\"";
 function normalizeHooksPath(hooksPath) {
 	let normalized = normalize(hooksPath);
 	while (normalized.endsWith(sep)) normalized = normalized.slice(0, -1);
@@ -166,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 };
 }
@@ -421,24 +452,14 @@ function install(dir, options = {}) {
 	writeFileSync(internal("h"), hookScript(location.dir), { mode: 493 });
 	chmodSync(internal("h"), 493);
 	for (const hook of SUPPORTED_GIT_HOOK_NAMES) {
-		writeFileSync(internal(hook), `#!/usr/bin/env sh\n. "$(dirname "$0")/h"`, { mode: 493 });
+		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",
@@ -581,5 +602,4 @@ function status(dir) {
 		status: hooksStatus
 	};
 }
-//#endregion
-export { install as a, resolveHooksLocation as c, findUnsafeHookInstallPath as i, status as l, disable as n, isGitHooksEnvDisabled as o, enable as r, isHooksUserDisabled as s, SUPPORTED_GIT_HOOK_NAMES as t };
+export { findUnsafeHookInstallPath as a, isGitHooksEnvDisabled as c, status as d, enable as i, isHooksUserDisabled as l, SUPPORTED_GIT_HOOK_NAMES as n, hookScript as o, disable as r, install as s, HOOK_STUB_SCRIPT as t, resolveHooksLocation as u };

package/dist/index.cjs

@@ -1,8 +1,8 @@
-const require_define_config = require("./define-config-BxDc_9BK.cjs");
-//#region src/index.cts
+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,6 +12,6 @@ module.exports = {
 	defaultInclude,
 	defineProject,
 	defineConfig,
-	lazyPlugins
+	lazyPlugins,
+	resolveConfigFromFile
 };
-//#endregion

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { a as defineConfig, c as lazyPlugins, o as defineProject } from "./define-config-Bexdd6RZ.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-CvE5pHqB.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/{json-JP24qHUF.js → json-kl84kDyH.js}

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-//#region ../../node_modules/.pnpm/detect-indent@7.0.2/node_modules/detect-indent/index.js
+// ../../node_modules/.pnpm/detect-indent@7.0.2/node_modules/detect-indent/index.js
 const INDENT_REGEX = /^(?:( )+|\t+)/;
 const INDENT_TYPE_SPACE = "space";
 const INDENT_TYPE_TAB = "tab";
@@ -96,8 +96,7 @@ function detectIndent(string) {
 		indent
 	};
 }
-//#endregion
-//#region ../../node_modules/.pnpm/detect-newline@4.0.1/node_modules/detect-newline/index.js
+// ../../node_modules/.pnpm/detect-newline@4.0.1/node_modules/detect-newline/index.js
 function detectNewline(string) {
 	if (typeof string !== "string") throw new TypeError("Expected a string");
 	const newlines = string.match(/(?:\r?\n)/g) || [];
@@ -105,8 +104,7 @@ function detectNewline(string) {
 	const crlf = newlines.filter((newline) => newline === "\r\n").length;
 	return crlf > newlines.length - crlf ? "\r\n" : "\n";
 }
-//#endregion
-//#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
+// ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
 /**
 * Creates a JSON scanner on the given text.
 * If ignoreTrivia is set, whitespaces or comments are ignored.
@@ -485,8 +483,7 @@ var CharacterCodes;
 	CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
 	CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
 })(CharacterCodes || (CharacterCodes = {}));
-//#endregion
-//#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/string-intern.js
+// ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/string-intern.js
 const cachedSpaces = new Array(20).fill(0).map((_, index) => {
 	return " ".repeat(index);
 });
@@ -520,8 +517,7 @@ const supportedEols = [
 	"\r",
 	"\r\n"
 ];
-//#endregion
-//#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/format.js
+// ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/format.js
 function format(documentText, range, options) {
 	let initialIndentLevel;
 	let formatText;
@@ -689,8 +685,7 @@ function getEOL(options, text) {
 function isEOL(text, offset) {
 	return "\r\n".indexOf(text.charAt(offset)) !== -1;
 }
-//#endregion
-//#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/parser.js
+// ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/parser.js
 var ParseOptions;
 (function(ParseOptions) {
 	ParseOptions.DEFAULT = { allowTrailingComma: false };
@@ -1065,8 +1060,7 @@ function getNodeType(value) {
 		default: return "null";
 	}
 }
-//#endregion
-//#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/edit.js
+// ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/edit.js
 function setProperty(text, originalPath, value, options) {
 	const path = originalPath.slice();
 	const root = parseTree$1(text, []);
@@ -1239,8 +1233,7 @@ function withFormatting(text, edit, options) {
 function applyEdit(text, edit) {
 	return text.substring(0, edit.offset) + edit.content + text.substring(edit.offset + edit.length);
 }
-//#endregion
-//#region ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/main.js
+// ../../node_modules/.pnpm/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/main.js
 var ScanError;
 (function(ScanError) {
 	ScanError[ScanError["None"] = 0] = "None";
@@ -1340,8 +1333,7 @@ function applyEdits(text, edits) {
 	}
 	return text;
 }
-//#endregion
-//#region src/utils/json.ts
+// src/utils/json.ts
 /**
 * Derive `jsonc-parser` formatting options from existing file text so inserted
 * fragments match the file's indentation and newline style.
@@ -1380,5 +1372,4 @@ function isJsonFile(file) {
 		return false;
 	}
 }
-//#endregion
 export { writeJsonFile as a, modify as c, readJsonFile as i, parse as l, editJsonFile as n, applyEdits as o, isJsonFile as r, findNodeAtLocation as s, detectFormattingOptions as t, parseTree as u };

package/dist/lint-plugins.cjs

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