vite-plus 1.4.0 → 1.5.0

package/dist/migration/compat/worker.js

@@ -1,4 +1,4 @@
-import { n as addMigrationWarning, r as createMigrationReport } from "../../report-DLHO30yZ.js";
+import { n as addMigrationWarning, r as createMigrationReport } from "../../report-BEdpIQvC.js";
 import { t as ROLLDOWN_COMPAT_RESULT_PREFIX } from "../../protocol-CkNmY-Mr.js";
 import { writeSync } from "node:fs";
 // src/migration/compat/manual-chunks.ts

package/dist/{oxlint-plugin-config-BVpqYdcC.js → oxlint-plugin-config-CHsI_zKo.js}

@@ -1,4 +1,4 @@
-import { u as VITE_PLUS_NAME } from "./constants-DRUnJ_Dz.js";
+import { u as VITE_PLUS_NAME } from "./constants-D2P2aVKb.js";
 // 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.js

@@ -1,5 +1,5 @@
-import { v as exports } from "./constants-DRUnJ_Dz.js";
-import { n as PREFER_VITE_PLUS_IMPORTS_RULE_NAME, r as VITE_PLUS_OXLINT_PLUGIN_NAME } from "./oxlint-plugin-config-BVpqYdcC.js";
+import { v as exports } from "./constants-D2P2aVKb.js";
+import { n as PREFER_VITE_PLUS_IMPORTS_RULE_NAME, r as VITE_PLUS_OXLINT_PLUGIN_NAME } from "./oxlint-plugin-config-CHsI_zKo.js";
 import { t as vitest_v5_entry_points_default } from "./vitest-v5-entry-points-NyJsFeux.js";
 import path from "node:path";
 import fs from "node:fs";
@@ -93,9 +93,14 @@ function quoteSpecifier(literal, replacement) {
 }
 const nuxtTestUtilsPackageCache = /* @__PURE__ */ new Map();
 const oxlintOwnerPackageCache = /* @__PURE__ */ new Map();
+const viteKeeperPackageCache = /* @__PURE__ */ new Map();
+const vitestKeeperPackageCache = /* @__PURE__ */ new Map();
 function isUpstreamVitestSpecifier(specifier) {
 	return specifier === "vitest" || specifier.startsWith("vitest/");
 }
+function isVitestFamilySpecifier(specifier) {
+	return isUpstreamVitestSpecifier(specifier) || specifier.startsWith("@vitest/") || specifier in vitest_v5_entry_points_default;
+}
 function nearestPackageMatches(filename, cache, matchesPackage) {
 	if (!path.isAbsolute(filename)) return false;
 	let directory = path.dirname(filename);
@@ -130,6 +135,20 @@ function nearestPackageUsesNuxtTestUtils(filename) {
 		pkg.optionalDependencies
 	].some((dependencies) => dependencies?.["@nuxt/test-utils"] !== void 0));
 }
+function dependsOnAtRuntime(pkg, name) {
+	return [pkg.dependencies, pkg.peerDependencies].some((dependencies) => dependencies?.[name] !== void 0);
+}
+function isPublishedVitePluginName(name) {
+	if (name === void 0) return false;
+	const unscoped = name.startsWith("@") ? name.split("/")[1] : name;
+	return unscoped !== void 0 && /^(vite-plugin|unplugin)-/.test(unscoped);
+}
+function nearestPackageKeepsVite(filename) {
+	return nearestPackageMatches(filename, viteKeeperPackageCache, (pkg) => dependsOnAtRuntime(pkg, "vite") || isPublishedVitePluginName(pkg.name));
+}
+function nearestPackageKeepsVitest(filename) {
+	return nearestPackageMatches(filename, vitestKeeperPackageCache, (pkg) => dependsOnAtRuntime(pkg, "vitest"));
+}
 function nearestPackageOwnsOxlintApi(filename) {
 	return nearestPackageMatches(filename, oxlintOwnerPackageCache, (pkg) => pkg.optionalDependencies?.[OXLINT_PLUGINS_PACKAGE] !== void 0 || [pkg.dependencies, pkg.peerDependencies].some((dependencies) => dependencies?.[OXLINT_PACKAGE] !== void 0 || dependencies?.[OXLINT_PLUGINS_PACKAGE] !== void 0));
 }
@@ -149,9 +168,11 @@ function reportSpecifier(context, literal, replacement) {
 function isOxlintApiSpecifier(specifier) {
 	return specifier === OXLINT_PLUGINS_PACKAGE || specifier === OXLINT_PLUGINS_DEV_SUBPATH;
 }
-function maybeReportLiteral(context, literal, { preserveUpstreamVitest, fileIsViteConfig, ownsOxlintApi }) {
+function maybeReportLiteral(context, literal, { preserveUpstreamVitest, fileIsViteConfig, ownsOxlintApi, keepsVite, keepsVitest }) {
 	if (!literal || literal.type !== "Literal" || typeof literal.value !== "string") return;
 	if (preserveUpstreamVitest && isUpstreamVitestSpecifier(literal.value)) return;
+	if (keepsVite && isViteSpecifier(literal.value)) return;
+	if (keepsVitest && isVitestFamilySpecifier(literal.value)) return;
 	if (!fileIsViteConfig && isViteSpecifier(literal.value)) return;
 	const replacement = rewriteVitePlusImportSpecifier(literal.value);
 	if (!replacement) return;
@@ -185,13 +206,17 @@ const preferVitePlusImportsRule = defineRule({
 		const options = {
 			preserveUpstreamVitest: false,
 			fileIsViteConfig: false,
-			ownsOxlintApi: false
+			ownsOxlintApi: false,
+			keepsVite: false,
+			keepsVitest: false
 		};
 		return {
 			Program() {
 				options.preserveUpstreamVitest = nearestPackageUsesNuxtTestUtils(context.filename);
 				options.fileIsViteConfig = isViteConfigFile(context.filename);
 				options.ownsOxlintApi = nearestPackageOwnsOxlintApi(context.filename);
+				options.keepsVite = nearestPackageKeepsVite(context.filename);
+				options.keepsVitest = nearestPackageKeepsVitest(context.filename);
 			},
 			ImportDeclaration(node) {
 				maybeReportLiteral(context, node.source, options);

package/dist/pack-bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { t as cac } from "./dist-CdkMvIiQ.js";
-import { a as resolveViteConfig } from "./resolve-vite-config-Dn5896A4.js";
+import { a as resolveViteConfig } from "./resolve-vite-config-Cx3cnVVI.js";
 import module from "node:module";
 import path from "node:path";
 import { buildWithConfigs, enableDebug, globalLogger, resolveUserConfig } from "vite/pack";
@@ -64,7 +64,7 @@ const DEFAULT_ENV_PREFIXES = ["VITE_PACK_", "TSDOWN_"];
 cli.command("[...files]", "Bundle files", {
 	ignoreOptionDefaultValue: true,
 	allowUnknownOptions: true
-}).option("--config-loader <loader>", "Config loader to use: auto, native, tsx, unrun", { default: "auto" }).option("--no-config", "Disable config file").option("-f, --format <format>", "Bundle format: esm, cjs, iife, umd", { default: "esm" }).option("--clean", "Clean output directory, --no-clean to disable").option("--deps.never-bundle <module>", "Mark dependencies as external").option("--minify", "Minify output").option("--devtools", "Enable devtools integration").option("--debug [feat]", "Show debug logs").option("--target <target>", "Bundle target, e.g \"es2015\", \"esnext\"").option("-l, --logLevel <level>", "Set log level: info, warn, error, silent").option("--fail-on-warn", "Fail on warnings", { default: true }).option("--no-write", "Disable writing files to disk, incompatible with watch mode").option("-d, --out-dir <dir>", "Output directory", { default: "dist" }).option("--treeshake", "Tree-shake bundle", { default: true }).option("--sourcemap", "Generate source map", { default: false }).option("--shims", "Enable cjs and esm shims", { default: false }).option("--platform <platform>", "Target platform", { default: "node" }).option("--dts", "Generate dts files").option("--publint", "Enable publint", { default: false }).option("--attw", "Enable Are the types wrong integration", { default: false }).option("--unused", "Enable unused dependencies check", { default: false }).option("-w, --watch [path]", "Watch mode").option("--ignore-watch <path>", "Ignore custom paths in watch mode").option("--from-vite [vitest]", "Reuse config from Vite or Vitest").option("--report", "Size report", { default: true }).option("--env.* <value>", "Define compile-time env variables").option("--env-file <file>", "Load environment variables from a file, when used together with --env, variables in --env take precedence").option("--env-prefix <prefix>", "Prefix for env variables to inject into the bundle", { default: DEFAULT_ENV_PREFIXES }).option("--on-success <command>", "Command to run on success").option("--copy <dir>", "Copy files to output dir").option("--tsconfig <tsconfig>", "Set tsconfig path").option("--unbundle", "Unbundle mode").option("--root <dir>", "Root directory of input files").option("--exe", "Bundle as executable").option("-W, --workspace [dir]", "Enable workspace mode").option("--concurrency <count>", "Maximum number of Rolldown builds to run in parallel").option("-F, --filter <pattern>", "Filter configs (cwd or name), e.g. /pkg-name$/ or pkg-name").option("--exports", "Generate export-related metadata for package.json (experimental)").action(async (input, flags) => {
+}).option("--config-loader <loader>", "Config loader to use: auto, native, tsx, unrun", { default: "auto" }).option("--no-config", "Disable config file").option("-f, --format <format>", "Bundle format: esm, cjs, iife, umd", { default: "esm" }).option("--clean", "Clean output directory, --no-clean to disable").option("--deps.never-bundle <module>", "Mark dependencies as external").option("--minify", "Minify output").option("--devtools", "Enable devtools integration").option("--debug [feat]", "Show debug logs").option("--target <target>", "Bundle target, e.g \"es2015\", \"esnext\"").option("-l, --logLevel <level>", "Set log level: info, warn, error, silent").option("--fail-on-warn", "Fail on warnings", { default: true }).option("--no-write", "Disable writing files to disk, incompatible with watch mode").option("-d, --out-dir <dir>", "Output directory", { default: "dist" }).option("--treeshake", "Tree-shake bundle", { default: true }).option("--sourcemap", "Generate source map", { default: false }).option("--shims", "Enable cjs and esm shims", { default: false }).option("--platform <platform>", "Target platform", { default: "node" }).option("--dts", "Generate dts files").option("--publint", "Enable publint", { default: false }).option("--attw", "Enable Are the types wrong integration", { default: false }).option("--unused", "Enable unused dependencies check", { default: false }).option("-w, --watch [path]", "Watch mode").option("--ignore-watch <path>", "Ignore custom paths in watch mode").option("--from-vite [vitest]", "Reuse config from Vite or Vitest").option("--report", "Size report", { default: true }).option("--env.* <value>", "Define compile-time env variables").option("--env-file <file>", "Load environment variables from a file, can be repeated").option("--env-prefix <prefix>", "Prefix for env variables to inject into the bundle", { default: DEFAULT_ENV_PREFIXES }).option("--on-success <command>", "Command to run on success").option("--copy <dir>", "Copy files to output dir").option("--tsconfig <tsconfig>", "Set tsconfig path").option("--unbundle", "Unbundle mode").option("--root <dir>", "Root directory of input files").option("--exe", "Bundle as executable").option("-W, --workspace [dir]", "Enable workspace mode").option("--concurrency <count>", "Maximum number of Rolldown builds to run in parallel").option("-F, --filter <pattern>", "Filter configs (cwd or name), e.g. /pkg-name$/ or pkg-name").option("--exports", "Generate export-related metadata for package.json (experimental)").action(async (input, flags) => {
 	if (input.length > 0) flags.entry = input;
 	if (flags.envPrefix === void 0) flags.envPrefix = DEFAULT_ENV_PREFIXES;
 	async function runBuild() {

package/dist/{package-DzsomcUD.js → package-DfFo6-E-.js}

@@ -1,4 +1,4 @@
-import "./constants-DRUnJ_Dz.js";
+import "./constants-D2P2aVKb.js";
 import { i as readJsonFile } from "./json-kl84kDyH.js";
 import { createRequire } from "node:module";
 import path from "node:path";

package/dist/{prompts-GL1vj0wk.js → prompts-C7DI63WP.js}

@@ -1,10 +1,10 @@
 import { r as __toESM, t as __commonJSMin } from "./rolldown-runtime-DegdyBIC.js";
-import { t as accent } from "./terminal-BcuPUy-j.js";
-import { f as VITE_PLUS_VERSION } from "./constants-DRUnJ_Dz.js";
-import { a as writeJsonFile, i as readJsonFile } from "./json-kl84kDyH.js";
 import { _ as isGreaterThanOrEqual, b as safeRegex, g as formatComparableVersion, l as PRERELEASE, n as COERCE, r as COERCE_FULL, u as PRERELEASE_LOOSE, x as tryParse, y as parse } from "./comparison-CmVirWIW-UlEf2maz.js";
 import { i as runCommandSilently, n as getVpCommand } from "./command-rY79K5NI.js";
+import { a as writeJsonFile, i as readJsonFile } from "./json-kl84kDyH.js";
+import { t as accent } from "./terminal-BcuPUy-j.js";
 import { t as require_dist } from "./dist-Bs0SObNC.js";
+import { f as VITE_PLUS_VERSION } from "./constants-D2P2aVKb.js";
 import path from "node:path";
 import { downloadPackageManager } from "../binding/index.js";
 import { stripVTControlCharacters, styleText } from "node:util";

package/dist/register.d.ts

@@ -0,0 +1 @@
+export {}

package/dist/register.js

@@ -0,0 +1,12 @@
+import { createRequire } from "node:module";
+import * as workerThreads from "node:worker_threads";
+// src/register.ts
+/**
+* Public `node --import vite-plus/register` entry. Reuse the emitted loader files
+* so Node.js caches registration together with the two flags passed by `vpx`.
+*/
+if (!workerThreads.isInternalThread) {
+	createRequire(import.meta.url)("./script-preload.cjs");
+	await import(new URL("./script-register.js", import.meta.url).href);
+}
+export {};

package/dist/{report-DLHO30yZ.js → report-BEdpIQvC.js}

@@ -15,6 +15,8 @@ function createMigrationReport() {
 		eslintMigrated: false,
 		tsupMigrated: false,
 		tsxMigrated: false,
+		oxnodeMigrated: false,
+		tsNodeMigrated: false,
 		prettierMigrated: false,
 		nodeVersionFileMigrated: false,
 		setupVpVersionUpdatedFileCount: 0,

package/dist/{resolve-vite-config-QO6cC0SP.js → resolve-vite-config-33bzSaeT.js}

@@ -1 +1 @@
-export { i as resolveUniversalViteConfig } from "./resolve-vite-config-Dn5896A4.js";
+export { i as resolveUniversalViteConfig } from "./resolve-vite-config-Cx3cnVVI.js";

package/dist/{resolve-vite-config-Dn5896A4.js → resolve-vite-config-Cx3cnVVI.js}

@@ -1,5 +1,5 @@
-import { l as VITE_CONFIG_FILES } from "./constants-DRUnJ_Dz.js";
-import { u as withConfigMetadataResolution } from "./define-config-ChwJcu5e.js";
+import { d as withConfigMetadataResolution } from "./define-config-wR57OZG_.js";
+import { l as VITE_CONFIG_FILES } from "./constants-D2P2aVKb.js";
 import path from "node:path";
 import { findMonorepoRoot } from "../binding/index.js";
 import fs from "node:fs";

package/dist/script-esm-hooks.d.ts

@@ -1,8 +1,11 @@
 import { InitializeHook, LoadHook, ResolveHook } from "node:module";
+import { FrozenTsconfig } from "../binding/index.js";
 import { MessagePort } from "node:worker_threads";
-/** Receives the port `script-register.ts` relays watch reports through. */
+/** Receives the frozen loader settings and watch relay from `script-register.ts`. */
 export declare const initialize: InitializeHook<{
+  tsconfig: FrozenTsconfig;
+  transformDeps: string;
   watchPort?: MessagePort;
-} | undefined>;
+}>;
 export declare const resolve: ResolveHook;
 export declare const load: LoadHook;

package/dist/script-esm-hooks.js

@@ -7,9 +7,11 @@ const resolveHook = (specifier, context, nextResolve) => resolveWithOxcNode(oxcN
 const loadHook = (url, context, nextLoad) => oxcNode.load(url, context, nextLoad, HELPER_MODULE_NAME);
 /** Under watch mode, the hooks wrapped to report what each call read or looked for. */
 let watchHooks;
-/** Receives the port `script-register.ts` relays watch reports through. */
+/** Receives the frozen loader settings and watch relay from `script-register.ts`. */
 const initialize = (data) => {
-	const port = data?.watchPort;
+	oxcNode.initializeLoader(data.tsconfig.path, data.tsconfig.source);
+	oxcNode.setTransformDeps(data.transformDeps);
+	const port = data.watchPort;
 	if (port) {
 		port.unref();
 		const sink = (message) => port.postMessage(message);
@@ -17,6 +19,7 @@ const initialize = (data) => {
 			resolve: withFlush(resolveHook, sink, oxcNode.takeWatchDependencies),
 			load: withFlush(loadHook, sink, oxcNode.takeWatchDependencies)
 		};
+		oxcNode.enableWatchReport();
 	}
 };
 const resolve = (specifier, context, nextResolve) => (watchHooks?.resolve ?? resolveHook)(specifier, context, nextResolve);

package/dist/script-preload.cjs

@@ -292,6 +292,28 @@ function loadOxcNode() {
 	return (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href)("../binding/index.cjs").oxcNode;
 }
 const WATCH_SINK = Symbol.for("vite-plus:script-watch-sink");
+const SCRIPT_CONFIG = Symbol.for("vite-plus:script-config");
+/**
+* Capture this JavaScript thread's configuration before its first resolve. Worker
+* environments can differ from the native process environment, including clearing
+* the parent's variables. Both emitted preload entries share this selection.
+*/
+function threadScriptConfig() {
+	const holder = globalThis;
+	if (holder[SCRIPT_CONFIG] === void 0) {
+		const source = [
+			"VP_SCRIPT_TSCONFIG",
+			"TSX_TSCONFIG_PATH",
+			"TS_NODE_PROJECT",
+			"OXC_TSCONFIG_PATH"
+		].find((name) => process.env[name]);
+		holder[SCRIPT_CONFIG] = {
+			path: source ? process.env[source] : void 0,
+			source: source === "TS_NODE_PROJECT" || source === "OXC_TSCONFIG_PATH" ? source : void 0
+		};
+	}
+	return holder[SCRIPT_CONFIG];
+}
 /**
 * Where this thread reports the files watch mode restarts on, or `null` when nobody is
 * watching (see oxc-node's `watchSink()`). It opens a channel, so it runs once per thread:
@@ -409,7 +431,8 @@ if (node_worker_threads.isMainThread) installSignalAck();
 const oxcNode = loadOxcNode();
 const watch = threadWatchSink();
 if (watch) oxcNode.enableWatchReport();
-oxcNode.setTsconfigPath(process.env.VP_SCRIPT_TSCONFIG);
+const tsconfig = threadScriptConfig();
+oxcNode.initializeLoader(tsconfig.path, tsconfig.source);
 oxcNode.setTransformDeps("typescript");
 (0, node_module.setSourceMapsSupport)(true, {
 	nodeModules: true,

package/dist/script-register.js

@@ -12,10 +12,15 @@ import * as NodeModule from "node:module";
 */
 const { register } = NodeModule;
 if (!canRegisterSyncHooks(process.versions.node)) {
+	const oxcNode = loadOxcNode();
 	const watch = threadWatchSink();
-	const watchPort = watch ? createRelay(watch, loadOxcNode().takeWatchDependencies) : void 0;
+	const watchPort = watch ? createRelay(watch, oxcNode.takeWatchDependencies) : void 0;
 	register(new URL("./script-esm-hooks.js", import.meta.url), {
-		data: { watchPort },
+		data: {
+			tsconfig: oxcNode.freezeTsconfig(process.cwd()),
+			transformDeps: oxcNode.freezeTransformDeps(),
+			watchPort
+		},
 		transferList: watchPort ? [watchPort] : []
 	});
 }

package/dist/script-watch.js

@@ -427,12 +427,18 @@ function childNodeOptions(env, envFiles, read) {
 	}
 	return fromFiles;
 }
-/** The child env for `--tsconfig`: oxc-node reads TS_NODE_PROJECT before OXC_TSCONFIG_PATH. */
+/**
+* The child env for `--tsconfig`. oxc-node reads TS_NODE_PROJECT before OXC_TSCONFIG_PATH,
+* so both name the config: Node.js keeps a variable the environment already has, so an
+* `--env-file` that sets either one cannot override it (issue #876).
+*/
 function tsconfigEnv(tsconfig, cwd) {
-	return tsconfig ? {
-		OXC_TSCONFIG_PATH: resolve(cwd, tsconfig),
-		TS_NODE_PROJECT: void 0
-	} : {};
+	if (!tsconfig) return {};
+	const path = resolve(cwd, tsconfig);
+	return {
+		OXC_TSCONFIG_PATH: path,
+		TS_NODE_PROJECT: path
+	};
 }
 // ../../oxc-node/packages/cli/src/run.ts
 /** The signals oxnode passes on to the app. On Windows it only listens, so it outlives the app. */
@@ -1255,20 +1261,26 @@ function parseProcStat(text) {
 	const close = text.lastIndexOf(")");
 	if (close === -1) return null;
 	const pid = Number.parseInt(text, 10);
-	const ppid = Number(text.slice(close + 1).trim().split(/\s+/)[1]);
-	return Number.isInteger(pid) && Number.isInteger(ppid) ? {
+	const fields = text.slice(close + 1).trim().split(/\s+/);
+	const ppid = Number(fields[1]);
+	if (!Number.isInteger(pid) || !Number.isInteger(ppid)) return null;
+	return {
 		pid,
-		ppid
-	} : null;
+		ppid,
+		zombie: /^[ZXx]/.test(fields[0]) || void 0,
+		start: fields[19]
+	};
 }
-/** The output of `ps -A -o pid=,ppid=`. */
+/** The output of `ps -A -o pid=,ppid=,stat=,lstart=`, or of `ps -A -o pid=,ppid=`. */
 function parsePs(text) {
 	const rows = [];
 	for (const line of text.split("\n")) {
-		const m = /^\s*(\d+)\s+(\d+)\s*$/.exec(line);
+		const m = /^\s*(\d+)\s+(\d+)(?:\s+(\S+)(?:\s+(\S.*?))?)?\s*$/.exec(line);
 		if (m) rows.push({
 			pid: Number(m[1]),
-			ppid: Number(m[2])
+			ppid: Number(m[2]),
+			zombie: m[3]?.startsWith("Z") || void 0,
+			start: m[4]
 		});
 	}
 	return rows;
@@ -1292,35 +1304,82 @@ function descendants(table, pid) {
 	}
 	return out;
 }
+/** The rows of every process below `pid`, parents first. */
+function subtree(table, pid) {
+	const byPid = new Map(table.map((r) => [r.pid, r]));
+	return descendants(table, pid).map((p) => byPid.get(p));
+}
 /** Every process on the machine: `/proc` on Linux, where `ps` may be missing (slim containers), `ps` elsewhere. */
 function processTable() {
-	try {
-		if (process.platform === "linux") {
-			const rows = [];
-			for (const name of readdirSync("/proc")) {
-				if (!/^\d+$/.test(name)) continue;
-				try {
-					const row = parseProcStat(readFileSync(`/proc/${name}/stat`, "utf8"));
-					if (row) rows.push(row);
-				} catch {}
-			}
-			return rows;
+	if (process.platform === "linux") try {
+		const rows = [];
+		for (const name of readdirSync("/proc")) {
+			if (!/^\d+$/.test(name)) continue;
+			try {
+				const row = parseProcStat(readFileSync(`/proc/${name}/stat`, "utf8"));
+				if (row) rows.push(row);
+			} catch {}
 		}
+		return rows;
+	} catch {
+		return [];
+	}
+	for (const columns of ["pid=,ppid=,stat=,lstart=", "pid=,ppid="]) try {
 		return parsePs(execFileSync("ps", [
 			"-A",
 			"-o",
-			"pid=,ppid="
-		], { encoding: "utf8" }));
-	} catch {
-		return [];
+			columns
+		], {
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}));
+	} catch {}
+	return [];
+}
+/**
+* Which of `rows` still run, by `table`, plus what they started since, parents first.
+* Gone: no row, a zombie, or another start (the PID was reused). A failed read (`[]`) means none.
+*/
+function stillRunning(rows, table) {
+	const now = new Map(table.map((r) => [r.pid, r]));
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const r of rows) {
+		const row = now.get(r.pid);
+		if (!row || row.start !== r.start || seen.has(r.pid)) continue;
+		for (const p of [row.pid, ...descendants(table, row.pid)]) {
+			const found = now.get(p);
+			if (seen.has(p) || found.zombie) continue;
+			seen.add(p);
+			out.push(found);
+		}
 	}
+	return out;
 }
-/** SIGKILL the child and everything it started, so a grandchild cannot keep a port busy. */
-function killTree(child) {
-	const pid = child.pid;
-	if (pid === void 0) return;
+/** Send `sig` to each, and keep the ones it reached: ESRCH is gone, EPERM is not ours to wait on. */
+function signalAll(rows, sig) {
+	return rows.filter((r) => {
+		try {
+			process.kill(r.pid, sig);
+			return true;
+		} catch {
+			return false;
+		}
+	});
+}
+/**
+* SIGKILL the child, everything it started, and what is left of `known` with what that
+* started since, so a grandchild cannot keep a port busy. Returns what it reached besides
+* the child.
+*/
+function killTree(child, known = []) {
+	const pid = child?.pid;
 	if (process.platform === "win32") {
-		spawn("taskkill", [
+		if (child && pid !== void 0) spawn("taskkill", [
 			"/pid",
 			String(pid),
 			"/T",
@@ -1329,11 +1388,12 @@ function killTree(child) {
 			stdio: "ignore",
 			windowsHide: true
 		}).on("error", () => child.kill());
-		return;
+		return [];
 	}
-	for (const p of [pid, ...descendants(processTable(), pid)]) try {
-		process.kill(p, "SIGKILL");
-	} catch {}
+	const table = processTable();
+	const rows = stillRunning(pid === void 0 ? known : [...subtree(table, pid), ...known], table);
+	child?.kill("SIGKILL");
+	return signalAll(rows, "SIGKILL");
 }
 // ../../oxc-node/packages/cli/src/watch/log.ts
 let color;
@@ -1623,6 +1683,11 @@ function parseWatchMessage(msg) {
 }
 // ../../oxc-node/packages/cli/src/watch/command.ts
 const isBareReturn = (chunk) => /[\r\n]/.test(chunk) && chunk.replace(/[\r\n]/g, "") === "";
+/** How soon a rerun looks again for what the app left running: fast first, then every 250 ms. */
+const TREE_POLL_MS = 25;
+const TREE_POLL_MAX_MS = 250;
+/** How long after a force kill oxnode waits for what is left: SIGKILL cannot end a process stuck on a hung mount. */
+const FORCE_WAIT_MS = 1e3;
 /**
 * Run the watcher until it stops, and resolve with the exit code. Until then it owns
 * SIGINT, SIGTERM and SIGHUP, stdin (for Return) and the process's IPC channel.
@@ -1697,6 +1762,26 @@ function runWatch(argv, options = {}) {
 		const nodeArgs = [...loaderArgs, ...args.nodeArgs];
 		const timers = /* @__PURE__ */ new Map();
 		let state = { k: "idle" };
+		let tree = [];
+		let forcedAt;
+		let treeTimer;
+		/** Signal what is left of `tree` once, and call `then` when all of it is gone. */
+		const afterTree = (then, tick = 0) => {
+			if (tree.length) {
+				tree = stillRunning(tree, processTable());
+				if (tick === 0 || forcedAt !== void 0) {
+					const sig = forcedAt === void 0 ? cfg.killSignal : "SIGKILL";
+					tree = signalAll(tree, sig);
+				}
+			}
+			if (tree.length && forcedAt !== void 0 && Date.now() - forcedAt >= FORCE_WAIT_MS) {
+				log(`${tree.map((r) => r.pid).join(" ")} did not stop after a force kill, going on`);
+				tree = [];
+			}
+			if (tree.length === 0) return then();
+			if (tick === 0) debug(`waiting for ${tree.map((r) => r.pid).join(" ")}`);
+			treeTimer = setTimeout(() => afterTree(then, tick + 1), Math.min(TREE_POLL_MAX_MS, TREE_POLL_MS * 2 ** tick));
+		};
 		const display = (p) => {
 			const rel = path.relative(cwd, p);
 			return rel && !rel.startsWith("..") && !path.isAbsolute(rel) ? `.${path.sep}${rel}` : p;
@@ -1754,6 +1839,8 @@ function runWatch(argv, options = {}) {
 				}));
 				return;
 			}
+			tree = [];
+			forcedAt = void 0;
 			newRun();
 			const c = spawn(process$1.execPath, nodeArgs, {
 				env,
@@ -1786,11 +1873,11 @@ function runWatch(argv, options = {}) {
 			c.on("exit", (code, signal) => {
 				if (child !== c) return;
 				child = void 0;
-				dispatch({
+				afterTree(() => dispatch({
 					t: "childExit",
 					code,
 					signal
-				});
+				}));
 			});
 			if (c.pid !== void 0) debug(`spawn ${c.pid}`);
 		};
@@ -1800,11 +1887,16 @@ function runWatch(argv, options = {}) {
 					spawnChild();
 					break;
 				case "kill":
-					if (child && process$1.platform === "win32") killTree(child);
-					else child?.kill(e.sig);
+					if (!child) break;
+					if (process$1.platform === "win32") killTree(child);
+					else {
+						if (child.pid !== void 0) tree = subtree(processTable(), child.pid);
+						child.kill(e.sig);
+					}
 					break;
 				case "killTree":
-					if (child) killTree(child);
+					forcedAt ??= Date.now();
+					tree = killTree(child, tree);
 					break;
 				case "clearScreen":
 					process$1.stdout.write("\x1Bc");
@@ -1856,6 +1948,8 @@ function runWatch(argv, options = {}) {
 			process$1.stdin.unref?.();
 		};
 		function finish(code) {
+			clearTimeout(treeTimer);
+			tree = [];
 			for (const t of timers.values()) clearTimeout(t);
 			timers.clear();
 			signals.dispose();

package/dist/staged/bin.js

@@ -1,8 +1,8 @@
 import { r as __toESM } from "../rolldown-runtime-DegdyBIC.js";
-import { i as log, n as errorMsg, o as printHeader } from "../terminal-BcuPUy-j.js";
-import { a as resolveViteConfig } from "../resolve-vite-config-Dn5896A4.js";
 import { t as require_picomatch } from "../picomatch-DEUoj81q.js";
+import { a as resolveViteConfig } from "../resolve-vite-config-Cx3cnVVI.js";
 import { t as unwrapCliParseOutcome } from "../cli-parse-aeUeFDlC.js";
+import { i as log, n as errorMsg, o as printHeader } from "../terminal-BcuPUy-j.js";
 import { createRequire } from "node:module";
 import path, { basename, delimiter, dirname, normalize, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";

package/dist/sync-versions/bin.js

@@ -1,7 +1,7 @@
 import { c as modify, l as parse$1, o as applyEdits, t as detectFormattingOptions } from "../json-kl84kDyH.js";
-import { n as isAlignableVitestEcosystemPackage } from "../vitest-ecosystem-BeEYz-qF.js";
 import { i as normalizeRange, t as extractOverrideTargetName } from "../package-overrides-Ci8GXouY.js";
 import { t as require_dist } from "../dist-Bs0SObNC.js";
+import { n as isAlignableVitestEcosystemPackage } from "../vitest-ecosystem-BeEYz-qF.js";
 import path from "node:path";
 import fsPromises from "node:fs/promises";
 import { Buffer } from "node:buffer";