@flairjs/webpack-loader 0.0.1-beta.7 → 0.0.1-beta.8

package/dist/cjs/index.js

@@ -155,13 +155,14 @@ const setupGeneratedCssDir = async (options) => {
 	}
 	return flairGeneratedCssDir;
 };
-const setupUserThemeFile = async ({ buildThemeFile, onThemeFileChange }) => {
+const setupUserThemeFile = async ({ buildThemeFile, onThemeFileChange, deleteBeforeWrite = false }) => {
 	const flairThemeFile = require$1.resolve("@flairjs/client/theme.css");
 	let userTheme = await getUserTheme();
 	const buildThemeCSS = buildThemeFile ?? buildThemeTokens;
 	if (userTheme) {
 		const themeCSS = buildThemeCSS(userTheme.theme);
 		store.setLastThemeUpdate(Date.now());
+		if (deleteBeforeWrite) await (0, node_fs_promises.rm)(flairThemeFile, { force: true });
 		await (0, node_fs_promises.writeFile)(flairThemeFile, themeCSS, "utf-8");
 		(0, node_fs.watch)(userTheme.originalPath, async () => {
 			userTheme = await getUserTheme();
@@ -174,20 +175,6 @@ const setupUserThemeFile = async ({ buildThemeFile, onThemeFileChange }) => {
 	}
 	return userTheme;
 };
-const removeOutdatedCssFiles = async (sourceFilePath, cssFilePath, { flairGeneratedCssDir, clearInstantly = false }) => {
-	const previousGeneratedCssName = store.getGeneratedCssName(sourceFilePath);
-	if (previousGeneratedCssName && previousGeneratedCssName !== cssFilePath) {
-		if (clearInstantly) {
-			await (0, node_fs_promises.rm)(node_path.default.join(flairGeneratedCssDir, previousGeneratedCssName), { force: true });
-			store.setFileNameToGeneratedCssNameMap(sourceFilePath, cssFilePath);
-			return;
-		}
-		setTimeout(() => {
-			(0, node_fs_promises.rm)(node_path.default.join(flairGeneratedCssDir, previousGeneratedCssName), { force: true });
-		}, 2e3);
-	}
-	store.setFileNameToGeneratedCssNameMap(sourceFilePath, cssFilePath);
-};
 function shouldProcessFile(id, include, exclude) {
 	const isIncluded = (0, picomatch.default)(include ?? ["**/*.{js,ts,jsx,tsx}"]);
 	const isExcluded = (0, picomatch.default)(exclude ?? ["**/node_modules/**"]);
@@ -253,7 +240,10 @@ async function flairJsLoader(source, sourceMap) {
 	let userTheme = null;
 	if (!initialized) {
 		cssGeneratedDir = await setupGeneratedCssDir();
-		userTheme = await setupUserThemeFile({ buildThemeFile: options.buildThemeFile });
+		userTheme = await setupUserThemeFile({
+			buildThemeFile: options.buildThemeFile,
+			deleteBeforeWrite: true
+		});
 		initialized = true;
 	} else {
 		cssGeneratedDir = getGeneratedCssDir();
@@ -265,7 +255,7 @@ async function flairJsLoader(source, sourceMap) {
 	}
 	try {
 		const result = transformCode(source, fileName, {
-			appendTimestampToCssFile: true,
+			appendTimestampToCssFile: false,
 			classNameList: options?.classNameList,
 			cssPreprocessor: options?.cssPreprocessor ? (css) => options.cssPreprocessor(css, fileName) : void 0,
 			theme: userTheme?.theme,
@@ -273,7 +263,8 @@ async function flairJsLoader(source, sourceMap) {
 			cssOutDir: cssGeneratedDir
 		});
 		if (!result) return callback(null, source, sourceMap);
-		if (result.generatedCssName) removeOutdatedCssFiles(fileName, result.generatedCssName, { flairGeneratedCssDir: cssGeneratedDir });
+		if (!result.generatedCssName) return callback(null, source, sourceMap);
+		this.addDependency(path.resolve(result.generatedCssName));
 		callback(null, result.code, result.sourcemap ? JSON.parse(result.sourcemap ?? "{}") : sourceMap);
 	} catch (error) {
 		console.error("[@flairjs/webpack-loader]", error);

package/dist/esm/index.js

@@ -5,6 +5,7 @@ import path, { dirname } from "node:path";
 import * as esbuild from "esbuild";
 import { existsSync as existsSync$1 } from "fs";
 import { fileURLToPath } from "node:url";
+import * as path$2 from "path";
 import path$1 from "path";
 import { pathToFileURL } from "url";
 import picomatch from "picomatch";
@@ -121,13 +122,14 @@ const setupGeneratedCssDir = async (options) => {
 	}
 	return flairGeneratedCssDir;
 };
-const setupUserThemeFile = async ({ buildThemeFile, onThemeFileChange }) => {
+const setupUserThemeFile = async ({ buildThemeFile, onThemeFileChange, deleteBeforeWrite = false }) => {
 	const flairThemeFile = require.resolve("@flairjs/client/theme.css");
 	let userTheme = await getUserTheme();
 	const buildThemeCSS = buildThemeFile ?? buildThemeTokens;
 	if (userTheme) {
 		const themeCSS = buildThemeCSS(userTheme.theme);
 		store.setLastThemeUpdate(Date.now());
+		if (deleteBeforeWrite) await rm(flairThemeFile, { force: true });
 		await writeFile(flairThemeFile, themeCSS, "utf-8");
 		watch(userTheme.originalPath, async () => {
 			userTheme = await getUserTheme();
@@ -140,20 +142,6 @@ const setupUserThemeFile = async ({ buildThemeFile, onThemeFileChange }) => {
 	}
 	return userTheme;
 };
-const removeOutdatedCssFiles = async (sourceFilePath, cssFilePath, { flairGeneratedCssDir, clearInstantly = false }) => {
-	const previousGeneratedCssName = store.getGeneratedCssName(sourceFilePath);
-	if (previousGeneratedCssName && previousGeneratedCssName !== cssFilePath) {
-		if (clearInstantly) {
-			await rm(path.join(flairGeneratedCssDir, previousGeneratedCssName), { force: true });
-			store.setFileNameToGeneratedCssNameMap(sourceFilePath, cssFilePath);
-			return;
-		}
-		setTimeout(() => {
-			rm(path.join(flairGeneratedCssDir, previousGeneratedCssName), { force: true });
-		}, 2e3);
-	}
-	store.setFileNameToGeneratedCssNameMap(sourceFilePath, cssFilePath);
-};
 function shouldProcessFile(id, include, exclude) {
 	const isIncluded = picomatch(include ?? ["**/*.{js,ts,jsx,tsx}"]);
 	const isExcluded = picomatch(exclude ?? ["**/node_modules/**"]);
@@ -219,7 +207,10 @@ async function flairJsLoader(source, sourceMap) {
 	let userTheme = null;
 	if (!initialized) {
 		cssGeneratedDir = await setupGeneratedCssDir();
-		userTheme = await setupUserThemeFile({ buildThemeFile: options.buildThemeFile });
+		userTheme = await setupUserThemeFile({
+			buildThemeFile: options.buildThemeFile,
+			deleteBeforeWrite: true
+		});
 		initialized = true;
 	} else {
 		cssGeneratedDir = getGeneratedCssDir();
@@ -231,7 +222,7 @@ async function flairJsLoader(source, sourceMap) {
 	}
 	try {
 		const result = transformCode$1(source, fileName, {
-			appendTimestampToCssFile: true,
+			appendTimestampToCssFile: false,
 			classNameList: options?.classNameList,
 			cssPreprocessor: options?.cssPreprocessor ? (css) => options.cssPreprocessor(css, fileName) : void 0,
 			theme: userTheme?.theme,
@@ -239,7 +230,8 @@ async function flairJsLoader(source, sourceMap) {
 			cssOutDir: cssGeneratedDir
 		});
 		if (!result) return callback(null, source, sourceMap);
-		if (result.generatedCssName) removeOutdatedCssFiles(fileName, result.generatedCssName, { flairGeneratedCssDir: cssGeneratedDir });
+		if (!result.generatedCssName) return callback(null, source, sourceMap);
+		this.addDependency(path$2.resolve(result.generatedCssName));
 		callback(null, result.code, result.sourcemap ? JSON.parse(result.sourcemap ?? "{}") : sourceMap);
 	} catch (error) {
 		console.error("[@flairjs/webpack-loader]", error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flairjs/webpack-loader",
-  "version": "0.0.1-beta.7",
+  "version": "0.0.1-beta.8",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -13,7 +13,7 @@
   },
   "peerDependencies": {
     "webpack": ">=5.0.0",
-    "@flairjs/core": "0.0.1-beta.6"
+    "@flairjs/core": "0.0.1-beta.7"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.2.4",
@@ -23,8 +23,8 @@
     "rolldown": "1.0.0-beta.37",
     "typescript": "^5.8.2",
     "webpack": "^5.101.0",
-    "@flairjs/bundler-shared": "0.0.1-beta.10",
-    "@flairjs/core": "0.0.1-beta.6"
+    "@flairjs/bundler-shared": "0.0.1-beta.11",
+    "@flairjs/core": "0.0.1-beta.7"
   },
   "dependencies": {
     "esbuild": "^0.25.10",