@kanso-labs/unplugin-style-dictionary 0.10.5 → 0.10.7

package/dist/index.js

@@ -1,50 +1,22 @@
-import { matchesWatchedFile } from "./watch-filter.js";
-import JSON5 from "json5";
+import { colourAllowed, paint } from "./colour.js";
+import { asError, errorMessage } from "./errors.js";
+import { resolveConfigOption } from "./config.js";
+import { expandPatterns, watchPatternsOf } from "./patterns.js";
+import { runBuilds } from "./compile.js";
+import { createScheduler } from "./scheduler.js";
+import { isWatchedSource } from "./watch-filter.js";
 import fs from "node:fs";
 import path from "node:path";
-import { pathToFileURL } from "node:url";
-import zlib from "node:zlib";
-import StyleDictionary from "style-dictionary";
-import { glob } from "tinyglobby";
 import { createUnplugin } from "unplugin";
 //#region src/index.ts
-function asError(error) {
-	return error instanceof Error ? error : new Error(errorMessage(error));
-}
-function colourAllowed(stream) {
-	if (process.env.NO_COLOR) return false;
-	const forced = process.env.FORCE_COLOR;
-	if (forced === "0") return false;
-	if (forced !== void 0 && forced !== "") return true;
-	if (process.env.TERM === "dumb") return false;
-	return stream.isTTY === true;
-}
 function discardTemporaryFile(temporary) {
 	try {
 		fs.rmSync(temporary, { force: true });
 	} catch {}
 }
-function errorMessage(error) {
-	return error instanceof Error ? error.message : String(error);
-}
-function isConfig(value) {
-	return typeof value === "object" && value !== null;
-}
 function isMessageChannel(value) {
 	return typeof value === "function";
 }
-function isThenable(value) {
-	return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
-}
-function looksLikeConfig(value) {
-	if (typeof value !== "object" || value === null) return false;
-	return [
-		"include",
-		"platforms",
-		"source",
-		"tokens"
-	].some((key) => key in value);
-}
 function nodeModulesNegations(paths) {
 	const negations = /* @__PURE__ */ new Set();
 	for (const file of paths) {
@@ -62,25 +34,6 @@ function nodeModulesWatchDirectories(paths) {
 	}
 	return Array.from(directories);
 }
-function paint(code, value, allowed) {
-	return allowed ? `\u001B[${code}m${value}\u001B[0m` : value;
-}
-async function patternsMatchingNothing(patterns) {
-	const barren = [];
-	for (const pattern of patterns) {
-		if (!GLOB_CHARACTERS.test(pattern)) {
-			if (!fs.existsSync(pattern)) barren.push(pattern);
-			continue;
-		}
-		try {
-			if ((await glob([pattern], { absolute: true })).length === 0) barren.push(pattern);
-		} catch {}
-	}
-	return barren;
-}
-function unwrapDefault(value) {
-	return typeof value === "object" && value !== null && "default" in value ? value.default ?? value : value;
-}
 let temporaryFileCounter = 0;
 async function rendersWhatIsAlreadyThere(temporary, destination) {
 	try {
@@ -188,23 +141,6 @@ const atomicVolume = Object.create(fs, {
 	promises: { value: Object.create(fs.promises, { writeFile: { value: writeFileAtomic } }) },
 	writeFileSync: { value: writeFileSyncAtomic }
 });
-const GLOB_CHARACTERS = /[!*?[\]{}]/;
-const IMPORTED_CONFIG_EXTENSIONS = [
-	".js",
-	".mjs",
-	".ts"
-];
-function describeConfig(item, index) {
-	return item.file ? `The configuration ${item.file}` : `The configuration at position ${index + 1}`;
-}
-function isImportedConfig(file) {
-	return IMPORTED_CONFIG_EXTENSIONS.some((extension) => file.endsWith(extension));
-}
-function staticParentOf(pattern) {
-	const segments = pattern.split("/");
-	const firstGlob = segments.findIndex((segment) => GLOB_CHARACTERS.test(segment));
-	return firstGlob === -1 ? path.posix.dirname(pattern) : segments.slice(0, firstGlob).join("/");
-}
 const compiledFingerprints = /* @__PURE__ */ new Set();
 const compilesInFlight = /* @__PURE__ */ new Map();
 function buildKey(root, resolved) {
@@ -214,34 +150,12 @@ function buildKey(root, resolved) {
 		return null;
 	}
 }
-function sourcePatternsOf(configObj) {
-	const patterns = [];
-	const add = (pattern) => {
-		if (typeof pattern === "string") patterns.push((path.isAbsolute(pattern) ? pattern : path.resolve(process.cwd(), pattern)).replace(/\\/g, "/"));
-	};
-	for (const value of [configObj.source, configObj.include]) if (Array.isArray(value)) value.forEach(add);
-	else add(value);
-	return patterns;
-}
-function statOrNull(file) {
-	try {
-		return fs.statSync(file);
-	} catch {
-		return null;
-	}
-}
 const unpluginFactory = (options = {}, meta) => {
 	const isWebpack = meta.framework === "webpack" || meta.framework === "rspack";
 	const { cache = true, errorOverlay = true, failOnError = "build", logLevel, onBuildEnd, onBuildError, onBuildStart, platforms: platformsOption, report = true, root: rootOption, silent = false } = options;
 	const level = logLevel ?? (silent ? "silent" : void 0);
 	const quiet = level === "silent" || level === "warn";
 	const verbosity = level === void 0 ? void 0 : level === "verbose" ? "verbose" : level === "silent" ? "silent" : "default";
-	const platformsFor = (context) => {
-		if (platformsOption === void 0) return void 0;
-		if (Array.isArray(platformsOption)) return platformsOption;
-		return context === void 0 ? platformsOption.build : platformsOption.watch;
-	};
-	const failsTheBuild = (context) => failOnError === true || (context === void 0 ? failOnError === "build" : failOnError === "serve");
 	let hostCommand = "build";
 	let hostMode;
 	let isWatching = false;
@@ -262,22 +176,6 @@ const unpluginFactory = (options = {}, meta) => {
 	let watchRebuild = false;
 	let hasCompiled = false;
 	let hostClosed = false;
-	const expandPatterns = async (patterns) => {
-		const paths = /* @__PURE__ */ new Set();
-		const globs = [];
-		for (const pattern of patterns) if (GLOB_CHARACTERS.test(pattern)) {
-			globs.push(pattern);
-			const parent = staticParentOf(pattern);
-			if (parent && fs.existsSync(parent)) paths.add(parent);
-		} else paths.add(pattern);
-		if (globs.length > 0) try {
-			for (const match of await glob(globs, { absolute: true })) paths.add(match.replace(/\\/g, "/"));
-		} catch (err) {
-			log(`Failed to expand watch patterns: ${errorMessage(err)}`, "error");
-		}
-		return Array.from(paths);
-	};
-	const isWatchedSource = (file, patterns) => !generatedDestinations.has(file.replace(/\\/g, "/")) && matchesWatchedFile(file, patterns);
 	const stdoutColour = colourAllowed(process.stdout);
 	const stderrColour = colourAllowed(process.stderr);
 	let host;
@@ -312,292 +210,50 @@ const unpluginFactory = (options = {}, meta) => {
 		}
 		console.log(paint(type === "success" ? "32" : "36", `${prefix} ${message}`, stdoutColour));
 	};
-	const callHook = (name, hook, ...args) => {
-		let result;
-		try {
-			result = hook(...args);
-		} catch (err) {
-			log(`The ${name} hook threw: ${errorMessage(err)}`, "error");
-			return;
-		}
-		if (!isThenable(result)) return;
-		Promise.resolve(result).catch((err) => {
-			log(`The ${name} hook rejected: ${errorMessage(err)}`, "error");
-		});
-	};
-	const resolveConfigs = async () => {
-		let rawConfig = options.config;
-		if (rawConfig === false) return [];
-		if (!rawConfig) {
-			const defaults = [
-				"sd.config.json",
-				"config.json",
-				"sd.config.js",
-				"sd.config.mjs"
-			];
-			const rejected = [];
-			for (const file of defaults) {
-				const fullPath = path.resolve(root, file);
-				if (!fs.existsSync(fullPath)) continue;
-				if (!looksLikeConfig(await readConfigObject({
-					config: fullPath,
-					file: fullPath
-				}, false))) {
-					rejected.push(file);
-					continue;
-				}
-				if (!announcedDiscovery) {
-					announcedDiscovery = true;
-					log(`Using the configuration it found at ${fullPath}`, "info");
-				}
-				rawConfig = file;
-				break;
-			}
-			if (rejected.length > 0) log(`Ignored ${rejected.join(", ")} in ${root}: nothing there declares platforms, source, include or tokens, so it does not look like a Style Dictionary configuration. Name it with the config option if it is one, or set config to false to stop looking.`, "error");
-		}
-		if (!rawConfig) {
-			log("No configuration specified and no default config file found. Style Dictionary will not compile.", "error");
-			return [];
-		}
-		if (typeof rawConfig === "function") rawConfig = await rawConfig(configContext());
-		return (Array.isArray(rawConfig) ? rawConfig : [rawConfig]).map((conf) => {
-			if (typeof conf === "string") {
-				const fullPath = path.resolve(root, conf);
-				return {
-					config: fullPath,
-					file: fullPath
-				};
-			} else return { config: conf };
-		});
-	};
-	const importConfigModule = async (file) => {
-		let version;
-		try {
-			version = fs.statSync(file).mtimeMs;
-		} catch {
-			version = Date.now();
-		}
-		const key = String(version).replace(".", "_");
-		return unwrapDefault(await import(`${pathToFileURL(file).href}?t=${key}`));
-	};
-	const readConfigObject = async (item, reportErrors) => {
-		if (typeof item.config !== "string") return item.config;
-		try {
-			const loaded = isImportedConfig(item.config) ? await importConfigModule(item.config) : JSON5.parse(fs.readFileSync(item.config, "utf-8"));
-			if (isConfig(loaded)) return loaded;
-			if (reportErrors) log(`Config file did not resolve to a configuration object: ${item.config}`, "error");
-		} catch (err) {
-			if (reportErrors) log(`Failed to parse config file: ${item.config}. Error: ${errorMessage(err)}`, "error");
-		}
-		return null;
-	};
+	const resolveConfigs = async () => resolveConfigOption({
+		config: options.config,
+		configContext,
+		discovery,
+		log,
+		root
+	});
 	const getWatchTargets = async (resolvedConfigs) => {
-		const filesToWatch = /* @__PURE__ */ new Set();
-		for (const item of resolvedConfigs) {
-			if (item.file) filesToWatch.add(item.file.replace(/\\/g, "/"));
-			const configObj = await readConfigObject(item, true);
-			if (configObj) {
-				const addPattern = (pattern) => {
-					if (typeof pattern === "string") {
-						const normalized = (path.isAbsolute(pattern) ? pattern : path.resolve(process.cwd(), pattern)).replace(/\\/g, "/");
-						filesToWatch.add(normalized);
-					}
-				};
-				if (configObj.source) {
-					if (Array.isArray(configObj.source)) configObj.source.forEach(addPattern);
-					else addPattern(configObj.source);
-				}
-				if (configObj.include) {
-					if (Array.isArray(configObj.include)) configObj.include.forEach(addPattern);
-					else addPattern(configObj.include);
-				}
-			}
-		}
-		if (options.watch) {
-			const extraWatches = Array.isArray(options.watch) ? options.watch : [options.watch];
-			for (const pattern of extraWatches) {
-				const absolutePattern = path.isAbsolute(pattern) ? pattern : path.resolve(root, pattern);
-				filesToWatch.add(absolutePattern.replace(/\\/g, "/"));
-			}
-		}
-		const patterns = Array.from(filesToWatch);
+		const patterns = await watchPatternsOf({
+			log,
+			root,
+			watch: options.watch
+		}, resolvedConfigs);
 		cachedPatterns = patterns;
 		return {
-			paths: await expandPatterns(patterns),
+			paths: await expandPatterns(patterns, log),
 			patterns
 		};
 	};
-	const configForBuild = async (item) => {
-		const { config } = item;
-		if (typeof config !== "string" || !isImportedConfig(config)) return config;
-		const loaded = await readConfigObject(item, false);
-		if (!loaded) return item.config;
-		try {
-			return structuredClone(loaded);
-		} catch {
-			return loaded;
-		}
-	};
-	const declaredDestinations = (configObj, only) => {
-		const destinations = [];
-		const entries = Object.entries(configObj.platforms ?? {});
-		const selected = only ? entries.filter(([name]) => only.includes(name)) : entries;
-		for (const [, platform] of selected) {
-			const buildPath = platform.buildPath ?? "";
-			const absoluteBuildPath = path.isAbsolute(buildPath) ? buildPath : path.resolve(root, buildPath);
-			for (const file of platform.files ?? []) if (file.destination) destinations.push(path.isAbsolute(file.destination) ? file.destination : path.resolve(absoluteBuildPath, file.destination));
-		}
-		return destinations;
-	};
-	const configFingerprint = (item) => {
-		try {
-			return JSON.stringify([root, item.file ?? item.config], (_key, value) => typeof value === "function" ? `[fn]${String(value)}` : value);
-		} catch {
-			return null;
-		}
-	};
-	const isUpToDate = async (item, configObj, only) => {
-		if (Object.values(configObj.platforms ?? {}).some((platform) => (platform.actions?.length ?? 0) > 0)) return false;
-		const destinations = declaredDestinations(configObj, only);
-		if (destinations.length === 0) return false;
-		const extraWatches = options.watch ? Array.isArray(options.watch) ? options.watch : [options.watch] : [];
-		const sources = await expandPatterns([...sourcePatternsOf(configObj), ...extraWatches.map((pattern) => (path.isAbsolute(pattern) ? pattern : path.resolve(root, pattern)).replace(/\\/g, "/"))]);
-		if (item.file) sources.push(item.file.replace(/\\/g, "/"));
-		if (sources.length === 0) return false;
-		let newestSource = -Infinity;
-		let sawFile = false;
-		for (const source of sources) {
-			const stats = statOrNull(source);
-			if (!stats) return false;
-			if (stats.isDirectory()) continue;
-			sawFile = true;
-			newestSource = Math.max(newestSource, stats.mtimeMs);
-		}
-		if (!sawFile) return false;
-		let oldestDestination = Infinity;
-		for (const destination of destinations) {
-			const stats = statOrNull(destination);
-			if (!stats) return false;
-			oldestDestination = Math.min(oldestDestination, stats.mtimeMs);
-		}
-		if (oldestDestination <= newestSource) return false;
-		if (item.file) return true;
-		const fingerprint = configFingerprint(item);
-		return fingerprint !== null && compiledFingerprints.has(fingerprint);
-	};
-	const reportSizes = (generatedFiles) => {
-		const fileInfos = [];
-		for (const filePath of generatedFiles) if (fs.existsSync(filePath)) {
-			const displayPath = path.relative(root, filePath).replace(/\\/g, "/");
-			const dir = path.dirname(displayPath);
-			const base = path.basename(displayPath);
-			const coloredPath = dir === "." ? paint("32", base, stdoutColour) : paint("90", `${dir}/`, stdoutColour) + paint("32", base, stdoutColour);
-			try {
-				const sizeStr = `${(fs.statSync(filePath).size / 1024).toFixed(2)} kB`;
-				const content = fs.readFileSync(filePath);
-				const gzipSizeStr = `${(zlib.gzipSync(content).length / 1024).toFixed(2)} kB`;
-				fileInfos.push({
-					coloredPath,
-					gzipSizeStr,
-					relativeDisplayPath: displayPath,
-					sizeStr
-				});
-			} catch {}
-		}
-		if (fileInfos.length > 0) {
-			const longestPathLength = Math.max(...fileInfos.map((f) => f.relativeDisplayPath.length), 0);
-			const longestSizeLength = Math.max(...fileInfos.map((f) => f.sizeStr.length), 0);
-			for (const info of fileInfos) {
-				const pathPadding = " ".repeat(Math.max(2, longestPathLength - info.relativeDisplayPath.length + 2));
-				const sizePadded = info.sizeStr.padStart(longestSizeLength);
-				console.log(info.coloredPath + pathPadding + paint("90", `${sizePadded} │ gzip: ${info.gzipSizeStr}`, stdoutColour));
-			}
-		}
-	};
-	const runBuilds = async (resolvedConfigs, context) => {
-		const startTime = Date.now();
-		const generatedFiles = /* @__PURE__ */ new Set();
-		let skipped = 0;
-		try {
-			if (!context) log("Compiling design tokens...", "info");
-			if (onBuildStart) callHook("onBuildStart", onBuildStart);
-			for (const [index, item] of resolvedConfigs.entries()) {
-				const declared = cache ? await readConfigObject(item, false) : null;
-				const selectedPlatforms = platformsFor(context);
-				if (declared && await isUpToDate(item, declared, selectedPlatforms)) {
-					for (const destination of declaredDestinations(declared)) generatedFiles.add(destination);
-					skipped++;
-					continue;
-				}
-				const sd = new StyleDictionary(await configForBuild(item), { init: false });
-				await sd.extend(void 0, {
-					mutateOriginal: true,
-					verbosity
-				});
-				if (sd.allTokens.length === 0) {
-					const asObject = await readConfigObject(item, false);
-					const barren = asObject ? await patternsMatchingNothing(sourcePatternsOf(asObject)) : [];
-					throw new Error([
-						`${describeConfig(item, index)} resolved no tokens, so its output would be emptied.`,
-						barren.length > 0 ? `These patterns matched no files: ${barren.join(", ")}` : `It declares no source or include patterns that matched anything.`,
-						`Nothing was written. Set failOnError to false to build anyway.`
-					].join(" "));
-				}
-				sd.volume = atomicVolume;
-				if (selectedPlatforms === void 0) await sd.buildAllPlatforms();
-				else {
-					const defined = Object.keys(sd.platforms);
-					const unknown = selectedPlatforms.filter((name) => !defined.includes(name));
-					if (unknown.length > 0) throw new Error(`${describeConfig(item, index)} does not define the platform(s) ${unknown.join(", ")}. It defines ${defined.join(", ")}.`);
-					for (const name of selectedPlatforms) await sd.buildPlatform(name);
-				}
-				for (const platform of Object.values(sd.platforms)) {
-					const buildPath = platform.buildPath ?? "";
-					for (const file of platform.files ?? []) if (file.destination) {
-						const absoluteBuildPath = path.isAbsolute(buildPath) ? buildPath : path.resolve(root, buildPath);
-						const absoluteDestination = path.isAbsolute(file.destination) ? file.destination : path.resolve(absoluteBuildPath, file.destination);
-						generatedFiles.add(absoluteDestination);
-					}
-				}
-				const fingerprint = configFingerprint(item);
-				if (fingerprint !== null) compiledFingerprints.add(fingerprint);
-			}
-			generatedDestinations.clear();
-			for (const destination of generatedFiles) generatedDestinations.add(destination.replace(/\\/g, "/"));
-		} catch (err) {
-			const duration = Date.now() - startTime;
-			log(`Compilation failed after ${duration}ms: ${errorMessage(err)}`, "error");
-			notifyBuildOutcome?.(asError(err));
-			if (onBuildError) callHook("onBuildError", onBuildError, err);
-			if (failsTheBuild(context)) throw err;
-			return;
-		}
-		notifyBuildOutcome?.(null);
-		const duration = Date.now() - startTime;
-		if (onBuildEnd) {
-			const files = Array.from(generatedFiles).sort((left, right) => left.localeCompare(right));
-			callHook("onBuildEnd", onBuildEnd, files, duration);
-		}
-		const everythingSkipped = skipped === resolvedConfigs.length;
-		if (context) {
-			log(everythingSkipped ? `Design tokens already up to date after change in ${context} (${duration}ms)` : `Rebuilt design tokens due to change in ${context} (${duration}ms)`, "success");
-			return;
-		}
-		if (report && !quiet && !everythingSkipped && generatedFiles.size > 0) try {
-			reportSizes(generatedFiles);
-		} catch (err) {
-			log(`Failed to report generated file sizes: ${errorMessage(err)}`, "error");
-		}
-		if (everythingSkipped) {
-			log(`Design tokens are already up to date (${duration}ms)`, "success");
-			return;
-		}
-		log(skipped > 0 ? `Compiled successfully! (${duration}ms, ${skipped} already up to date)` : `Compiled successfully! (${duration}ms)`, "success");
+	const instance = {
+		cache,
+		compiledFingerprints,
+		failOnError,
+		generatedDestinations,
+		log,
+		notifyBuildOutcome: (error) => {
+			notifyBuildOutcome?.(error);
+		},
+		onBuildEnd,
+		onBuildError,
+		onBuildStart,
+		platformsOption,
+		quiet,
+		report,
+		root: () => root,
+		stdoutColour,
+		verbosity,
+		volume: atomicVolume,
+		watch: options.watch
 	};
 	const compileOnceAcrossInstances = async (resolvedConfigs) => {
 		const key = buildKey(root, resolvedConfigs);
 		if (key === null) {
-			await runBuilds(resolvedConfigs);
+			await runBuilds(instance, resolvedConfigs);
 			return;
 		}
 		const running = compilesInFlight.get(key);
@@ -605,7 +261,7 @@ const unpluginFactory = (options = {}, meta) => {
 			await running;
 			return;
 		}
-		const compile = runBuilds(resolvedConfigs);
+		const compile = runBuilds(instance, resolvedConfigs);
 		compilesInFlight.set(key, compile);
 		try {
 			await compile;
@@ -613,59 +269,35 @@ const unpluginFactory = (options = {}, meta) => {
 			compilesInFlight.delete(key);
 		}
 	};
-	const REBUILD_DEBOUNCE_MS = 50;
-	let debounceTimer;
-	let pendingReason;
-	let inFlight;
-	let waiting = [];
 	let refreshServerWatchList;
-	let announcedDiscovery = false;
+	let closeOwnWatchers;
+	const discovery = { announced: false };
 	let startupResolved;
 	let notifyBuildOutcome;
-	const drain = async () => {
-		while (pendingReason !== void 0) {
-			const reason = pendingReason;
-			pendingReason = void 0;
-			const resolvers = waiting;
-			waiting = [];
-			let failure;
-			let compiling = false;
-			try {
-				const resolved = await resolveConfigs();
-				if (resolved.length > 0) {
-					compiling = true;
-					await runBuilds(resolved, reason);
-					compiling = false;
-					hasCompiled = true;
-					await refreshServerWatchList?.(resolved);
-				}
-			} catch (err) {
-				failure = { error: err };
-				if (!compiling) {
-					log(`Rebuild failed: ${errorMessage(err)}`, "error");
-					notifyBuildOutcome?.(asError(err));
-				}
+	const rebuild = async (reason) => {
+		let compiling = false;
+		try {
+			const resolved = await resolveConfigs();
+			if (resolved.length > 0) {
+				compiling = true;
+				await runBuilds(instance, resolved, reason);
+				compiling = false;
+				hasCompiled = true;
+				await refreshServerWatchList?.(resolved);
+			}
+		} catch (err) {
+			if (!compiling) {
+				log(`Rebuild failed: ${errorMessage(err)}`, "error");
+				notifyBuildOutcome?.(asError(err));
 			}
-			for (const settle of resolvers) settle(failure);
+			throw err;
 		}
 	};
-	const schedule = async (reason) => {
-		if (hostClosed) return;
-		pendingReason = reason;
-		const covered = new Promise((resolve, reject) => {
-			waiting.push((failure) => {
-				if (failure) reject(asError(failure.error));
-				else resolve();
-			});
-		});
-		if (debounceTimer) clearTimeout(debounceTimer);
-		debounceTimer = setTimeout(() => {
-			debounceTimer = void 0;
-			inFlight = (inFlight ?? Promise.resolve()).then(drain);
-		}, REBUILD_DEBOUNCE_MS);
-		debounceTimer.unref();
-		return covered;
-	};
+	const schedule = createScheduler({
+		debounceMs: 50,
+		isClosed: () => hostClosed,
+		run: rebuild
+	});
 	const closeWatcher = () => {
 		hostClosed = true;
 	};
@@ -719,6 +351,9 @@ const unpluginFactory = (options = {}, meta) => {
 		rollup: { closeWatcher },
 		rspack: adoptCompiler,
 		vite: {
+			buildEnd() {
+				closeOwnWatchers?.();
+			},
 			closeWatcher,
 			async configResolved(config) {
 				if (rootOption === void 0) root = config.root || process.cwd();
@@ -771,7 +406,7 @@ const unpluginFactory = (options = {}, meta) => {
 							const watcher = fs.watch(directory, (_event, filename) => {
 								if (filename === null) return;
 								const changed = path.posix.join(directory, filename);
-								if (!isWatchedSource(changed, targets.patterns)) return;
+								if (!isWatchedSource(changed, targets.patterns, generatedDestinations)) return;
 								schedule(path.basename(changed)).catch(() => {});
 							});
 							watcher.unref();
@@ -780,10 +415,10 @@ const unpluginFactory = (options = {}, meta) => {
 					}
 				};
 				watchNodeModules(targets.paths);
-				server.httpServer?.once("close", () => {
+				closeOwnWatchers = () => {
 					for (const watcher of ownWatchers.values()) watcher.close();
 					ownWatchers.clear();
-				});
+				};
 				refreshServerWatchList = async (rebuilt) => {
 					targets = await getWatchTargets(rebuilt);
 					server.watcher.add(targets.paths);
@@ -813,7 +448,7 @@ const unpluginFactory = (options = {}, meta) => {
 					};
 				}
 				server.watcher.on("all", (_event, file) => {
-					if (!isWatchedSource(file, targets.patterns)) return;
+					if (!isWatchedSource(file, targets.patterns, generatedDestinations)) return;
 					schedule(path.basename(file)).catch(() => {});
 				});
 			}
@@ -823,13 +458,13 @@ const unpluginFactory = (options = {}, meta) => {
 			adoptWatchMode(this);
 			if (hostClosed) return;
 			watchRebuild = true;
-			if (cachedPatterns && !isWatchedSource(id, cachedPatterns)) return;
+			if (cachedPatterns && !isWatchedSource(id, cachedPatterns, generatedDestinations)) return;
 			const resolved = await resolveConfigs();
 			if (resolved.length === 0) return;
 			const { patterns } = await getWatchTargets(resolved);
-			if (!isWatchedSource(id, patterns)) return;
+			if (!isWatchedSource(id, patterns, generatedDestinations)) return;
 			if (!isWebpack) await schedule(path.basename(id));
-			for (const file of await expandPatterns(patterns)) this.addWatchFile(file);
+			for (const file of await expandPatterns(patterns, log)) this.addWatchFile(file);
 		},
 		webpack: adoptCompiler
 	};