@bamboocss/vite 1.48.0 → 1.48.2

package/dist/index.cjs

@@ -79,6 +79,31 @@ const createCompilationHost = (options = {}) => {
 	let openSetup;
 	let openSetupStale = false;
 	let cssPass;
+	let changedSourceFiles = /* @__PURE__ */ new Set();
+	let needsInventoryScan = false;
+	let needsConfigReload = false;
+	const recordSourceChange = (filePath, event, options) => {
+		changedSourceFiles.add(filePath);
+		if (event !== "update") needsInventoryScan = true;
+		needsConfigReload ||= options?.needsConfigReload === true;
+		openSetupStale = true;
+	};
+	const takeSourceChanges = () => {
+		const changes = {
+			files: [...changedSourceFiles].sort(),
+			needsInventoryScan,
+			...needsConfigReload ? { needsConfigReload: true } : {}
+		};
+		changedSourceFiles = /* @__PURE__ */ new Set();
+		needsInventoryScan = false;
+		needsConfigReload = false;
+		return changes;
+	};
+	const restoreSourceChanges = (changes) => {
+		for (const file of changes.files) changedSourceFiles.add(file);
+		needsInventoryScan ||= changes.needsInventoryScan === true;
+		needsConfigReload ||= changes.needsConfigReload === true;
+	};
 	const settled = async (attempt) => {
 		try {
 			await attempt;
@@ -95,12 +120,19 @@ const createCompilationHost = (options = {}) => {
 	};
 	const runSetup = async () => {
 		builder ??= await loadBuilder();
-		await builder.setup({
-			configPath,
-			cwd,
-			dev: command === "serve"
-		});
-		return publish();
+		const sourceChanges = takeSourceChanges();
+		try {
+			await builder.setup({
+				configPath,
+				cwd,
+				dev: command === "serve",
+				...command === "serve" ? { sourceChanges } : {}
+			});
+			return publish();
+		} catch (error) {
+			if (command === "serve") restoreSourceChanges(sourceChanges);
+			throw error;
+		}
 	};
 	/**
 	* The setup covering the pass currently open, started at most once.
@@ -153,12 +185,15 @@ const createCompilationHost = (options = {}) => {
 			while (cssPass) await settled(cssPass);
 			return run();
 		},
+		noteSourceChange(filePath, event, options) {
+			if (command === "serve") recordSourceChange(filePath, event, options);
+		},
 		reloadSource(filePath) {
-			openSetupStale = true;
+			recordSourceChange(filePath, "update");
 			builder?.reloadSource(filePath);
 		},
 		removeSource(filePath) {
-			openSetupStale = true;
+			recordSourceChange(filePath, "update");
 			builder?.removeSource(filePath);
 		}
 	};
@@ -290,12 +325,17 @@ const bamboocssCss = (options) => {
 	let command = "build";
 	/** The run's own `build` options, for a bundler with no per-environment config. */
 	let ssrBuildOptions;
-	/** Included owners plus local modules their extraction actually resolved and read. */
+	/** Every source, resolver input and expanded config dependency which can change the sheet. */
 	const extractedSourceFiles = () => {
 		const activeBuilder = builder;
 		const context = activeBuilder?.context;
 		if (!context) return [];
-		return [...new Set([...context.getFiles(), ...activeBuilder.getResolutionReadFiles()].map((file) => context.runtime.path.abs(context.config.cwd, file)))];
+		return [...new Set([
+			...activeBuilder.getSourceFiles(),
+			...activeBuilder.getResolutionReadFiles(),
+			...activeBuilder.getResolutionConfigurationFiles(),
+			...context.explicitDeps
+		].map((file) => context.runtime.path.abs(context.config.cwd, file)))];
 	};
 	/**
 	* Serialised, because both `load` and the watcher can reach it and `Builder` keeps one
@@ -549,23 +589,27 @@ const bamboocssCss = (options) => {
 			* about. Vite 5 has one graph and no `environments`, where the question is exact.
 			*/
 			const clientGraph = devServer.environments?.client?.moduleGraph ?? devServer.moduleGraph;
-			const invalidate = (file) => {
-				const ctx = builder?.context;
+			const invalidate = (file, event) => {
+				const activeBuilder = builder;
+				const ctx = activeBuilder?.context;
 				if (!ctx) return;
 				const absoluteFile = ctx.runtime.path.abs(ctx.config.cwd, file);
-				if (!session.extractedFiles.has(absoluteFile)) return;
+				const wasExtracted = session.extractedFiles.has(absoluteFile);
+				const changesConfigMembership = event !== "update" && activeBuilder.isPotentialConfigDependency(absoluteFile);
+				if (!wasExtracted && (event !== "create" || !activeBuilder.isPotentialSourceFile(absoluteFile) && !changesConfigMembership)) return;
+				host.noteSourceChange(absoluteFile, event, { needsConfigReload: changesConfigMembership });
 				changeGeneration++;
 				prebuilt = void 0;
 				const mod = server?.moduleGraph.getModuleById(RESOLVED_ID);
 				if (!mod) return;
-				if (clientGraph.getModulesByFile(absoluteFile)?.size) return;
+				if (wasExtracted && clientGraph.getModulesByFile(absoluteFile)?.size) return;
 				server?.moduleGraph.invalidateModule(mod);
 				server?.reloadModule(mod);
 				_bamboocss_logger.logger.debug("vite", `styles invalidated by ${absoluteFile}`);
 			};
-			devServer.watcher.on("change", invalidate);
-			devServer.watcher.on("add", invalidate);
-			devServer.watcher.on("unlink", invalidate);
+			devServer.watcher.on("change", (file) => invalidate(file, "update"));
+			devServer.watcher.on("add", (file) => invalidate(file, "create"));
+			devServer.watcher.on("unlink", (file) => invalidate(file, "delete"));
 		},
 		generateBundle: {
 			order: "post",
@@ -1947,10 +1991,11 @@ const bamboocss = (options = {}) => {
 				state.unchangedFolds.clear();
 				state.changedRun = 0;
 			}
-			if (!ctx) return;
-			if (!shouldTransform(id)) return;
 			const [filePath] = id.split("?");
 			if (!filePath) return;
+			if (change.event === "update") host.noteSourceChange(filePath, change.event);
+			if (!ctx) return;
+			if (!shouldTransform(id)) return;
 			for (const state of transformStateByEnvironment.values()) state.recipeConfigCache.clear();
 			if (change.event === "delete") {
 				host.removeSource(filePath);

package/dist/index.mjs

@@ -74,6 +74,31 @@ const createCompilationHost = (options = {}) => {
 	let openSetup;
 	let openSetupStale = false;
 	let cssPass;
+	let changedSourceFiles = /* @__PURE__ */ new Set();
+	let needsInventoryScan = false;
+	let needsConfigReload = false;
+	const recordSourceChange = (filePath, event, options) => {
+		changedSourceFiles.add(filePath);
+		if (event !== "update") needsInventoryScan = true;
+		needsConfigReload ||= options?.needsConfigReload === true;
+		openSetupStale = true;
+	};
+	const takeSourceChanges = () => {
+		const changes = {
+			files: [...changedSourceFiles].sort(),
+			needsInventoryScan,
+			...needsConfigReload ? { needsConfigReload: true } : {}
+		};
+		changedSourceFiles = /* @__PURE__ */ new Set();
+		needsInventoryScan = false;
+		needsConfigReload = false;
+		return changes;
+	};
+	const restoreSourceChanges = (changes) => {
+		for (const file of changes.files) changedSourceFiles.add(file);
+		needsInventoryScan ||= changes.needsInventoryScan === true;
+		needsConfigReload ||= changes.needsConfigReload === true;
+	};
 	const settled = async (attempt) => {
 		try {
 			await attempt;
@@ -90,12 +115,19 @@ const createCompilationHost = (options = {}) => {
 	};
 	const runSetup = async () => {
 		builder ??= await loadBuilder();
-		await builder.setup({
-			configPath,
-			cwd,
-			dev: command === "serve"
-		});
-		return publish();
+		const sourceChanges = takeSourceChanges();
+		try {
+			await builder.setup({
+				configPath,
+				cwd,
+				dev: command === "serve",
+				...command === "serve" ? { sourceChanges } : {}
+			});
+			return publish();
+		} catch (error) {
+			if (command === "serve") restoreSourceChanges(sourceChanges);
+			throw error;
+		}
 	};
 	/**
 	* The setup covering the pass currently open, started at most once.
@@ -148,12 +180,15 @@ const createCompilationHost = (options = {}) => {
 			while (cssPass) await settled(cssPass);
 			return run();
 		},
+		noteSourceChange(filePath, event, options) {
+			if (command === "serve") recordSourceChange(filePath, event, options);
+		},
 		reloadSource(filePath) {
-			openSetupStale = true;
+			recordSourceChange(filePath, "update");
 			builder?.reloadSource(filePath);
 		},
 		removeSource(filePath) {
-			openSetupStale = true;
+			recordSourceChange(filePath, "update");
 			builder?.removeSource(filePath);
 		}
 	};
@@ -285,12 +320,17 @@ const bamboocssCss = (options) => {
 	let command = "build";
 	/** The run's own `build` options, for a bundler with no per-environment config. */
 	let ssrBuildOptions;
-	/** Included owners plus local modules their extraction actually resolved and read. */
+	/** Every source, resolver input and expanded config dependency which can change the sheet. */
 	const extractedSourceFiles = () => {
 		const activeBuilder = builder;
 		const context = activeBuilder?.context;
 		if (!context) return [];
-		return [...new Set([...context.getFiles(), ...activeBuilder.getResolutionReadFiles()].map((file) => context.runtime.path.abs(context.config.cwd, file)))];
+		return [...new Set([
+			...activeBuilder.getSourceFiles(),
+			...activeBuilder.getResolutionReadFiles(),
+			...activeBuilder.getResolutionConfigurationFiles(),
+			...context.explicitDeps
+		].map((file) => context.runtime.path.abs(context.config.cwd, file)))];
 	};
 	/**
 	* Serialised, because both `load` and the watcher can reach it and `Builder` keeps one
@@ -544,23 +584,27 @@ const bamboocssCss = (options) => {
 			* about. Vite 5 has one graph and no `environments`, where the question is exact.
 			*/
 			const clientGraph = devServer.environments?.client?.moduleGraph ?? devServer.moduleGraph;
-			const invalidate = (file) => {
-				const ctx = builder?.context;
+			const invalidate = (file, event) => {
+				const activeBuilder = builder;
+				const ctx = activeBuilder?.context;
 				if (!ctx) return;
 				const absoluteFile = ctx.runtime.path.abs(ctx.config.cwd, file);
-				if (!session.extractedFiles.has(absoluteFile)) return;
+				const wasExtracted = session.extractedFiles.has(absoluteFile);
+				const changesConfigMembership = event !== "update" && activeBuilder.isPotentialConfigDependency(absoluteFile);
+				if (!wasExtracted && (event !== "create" || !activeBuilder.isPotentialSourceFile(absoluteFile) && !changesConfigMembership)) return;
+				host.noteSourceChange(absoluteFile, event, { needsConfigReload: changesConfigMembership });
 				changeGeneration++;
 				prebuilt = void 0;
 				const mod = server?.moduleGraph.getModuleById(RESOLVED_ID);
 				if (!mod) return;
-				if (clientGraph.getModulesByFile(absoluteFile)?.size) return;
+				if (wasExtracted && clientGraph.getModulesByFile(absoluteFile)?.size) return;
 				server?.moduleGraph.invalidateModule(mod);
 				server?.reloadModule(mod);
 				logger.debug("vite", `styles invalidated by ${absoluteFile}`);
 			};
-			devServer.watcher.on("change", invalidate);
-			devServer.watcher.on("add", invalidate);
-			devServer.watcher.on("unlink", invalidate);
+			devServer.watcher.on("change", (file) => invalidate(file, "update"));
+			devServer.watcher.on("add", (file) => invalidate(file, "create"));
+			devServer.watcher.on("unlink", (file) => invalidate(file, "delete"));
 		},
 		generateBundle: {
 			order: "post",
@@ -1942,10 +1986,11 @@ const bamboocss = (options = {}) => {
 				state.unchangedFolds.clear();
 				state.changedRun = 0;
 			}
-			if (!ctx) return;
-			if (!shouldTransform(id)) return;
 			const [filePath] = id.split("?");
 			if (!filePath) return;
+			if (change.event === "update") host.noteSourceChange(filePath, change.event);
+			if (!ctx) return;
+			if (!shouldTransform(id)) return;
 			for (const state of transformStateByEnvironment.values()) state.recipeConfigCache.clear();
 			if (change.event === "delete") {
 				host.removeSource(filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/vite",
-  "version": "1.48.0",
+  "version": "1.48.2",
   "description": "Vite integration for Bamboo CSS",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -42,18 +42,18 @@
     "postcss": "8.5.26",
     "postcss-selector-parser": "7.1.5",
     "ts-morph": "28.0.0",
-    "@bamboocss/logger": "1.48.0",
-    "@bamboocss/config": "1.48.0",
-    "@bamboocss/core": "1.48.0",
-    "@bamboocss/node": "1.48.0",
-    "@bamboocss/extractor": "1.48.0",
-    "@bamboocss/shared": "1.48.0",
-    "@bamboocss/types": "1.48.0"
+    "@bamboocss/config": "1.48.2",
+    "@bamboocss/core": "1.48.2",
+    "@bamboocss/logger": "1.48.2",
+    "@bamboocss/extractor": "1.48.2",
+    "@bamboocss/node": "1.48.2",
+    "@bamboocss/types": "1.48.2",
+    "@bamboocss/shared": "1.48.2"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
     "vite": "7.2.6",
-    "@bamboocss/fixture": "1.48.0"
+    "@bamboocss/fixture": "1.48.2"
   },
   "peerDependencies": {
     "vite": ">=5"