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

package/dist/cjs/index.js

@@ -96,8 +96,8 @@ var Store = class {
 };
 const store = new Store();
 const __dirname$1 = (0, node_path.dirname)((0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href));
-const getUserTheme = async () => {
-	if (store.getUserTheme()) return store.getUserTheme();
+const getUserTheme = async (options) => {
+	if (store.getUserTheme() && !options?.ignoreCache) return store.getUserTheme();
 	try {
 		let userThemeFilePath = path.default.resolve(process.cwd(), "flair.theme.ts");
 		if (!(0, fs.existsSync)(userThemeFilePath)) userThemeFilePath = path.default.resolve(process.cwd(), "flair.theme.js");
@@ -155,38 +155,26 @@ const setupGeneratedCssDir = async (options) => {
 	}
 	return flairGeneratedCssDir;
 };
-const setupUserThemeFile = async ({ buildThemeFile }) => {
+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();
 			store.setLastThemeUpdate(Date.now());
 			if (!userTheme) return;
 			const themeCSS$1 = buildThemeCSS(userTheme.theme);
+			onThemeFileChange?.();
 			await (0, node_fs_promises.writeFile)(flairThemeFile, themeCSS$1, "utf-8");
 		});
 	}
 	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/**"]);
@@ -252,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();
@@ -264,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,
@@ -272,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";
@@ -62,8 +63,8 @@ var Store = class {
 };
 const store = new Store();
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const getUserTheme = async () => {
-	if (store.getUserTheme()) return store.getUserTheme();
+const getUserTheme = async (options) => {
+	if (store.getUserTheme() && !options?.ignoreCache) return store.getUserTheme();
 	try {
 		let userThemeFilePath = path$1.resolve(process.cwd(), "flair.theme.ts");
 		if (!existsSync$1(userThemeFilePath)) userThemeFilePath = path$1.resolve(process.cwd(), "flair.theme.js");
@@ -121,38 +122,26 @@ const setupGeneratedCssDir = async (options) => {
 	}
 	return flairGeneratedCssDir;
 };
-const setupUserThemeFile = async ({ buildThemeFile }) => {
+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();
 			store.setLastThemeUpdate(Date.now());
 			if (!userTheme) return;
 			const themeCSS$1 = buildThemeCSS(userTheme.theme);
+			onThemeFileChange?.();
 			await writeFile(flairThemeFile, themeCSS$1, "utf-8");
 		});
 	}
 	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/**"]);
@@ -218,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();
@@ -230,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,
@@ -238,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/dist/types/index.d.ts

@@ -1,6 +1,33 @@
-import { SharedPluginOptions } from "@flairjs/bundler-shared";
-import { LoaderContext } from "webpack";
-interface FlairJsWebpackLoaderOptions extends SharedPluginOptions {
-}
-export default function flairJsLoader(this: LoaderContext<FlairJsWebpackLoaderOptions>, source: string, sourceMap: string): Promise<void>;
-export {};
+import { FlairThemeConfig } from '@flairjs/client';
+import { LoaderContext } from 'webpack';
+
+declare function flairJsLoader(this: LoaderContext<FlairJsWebpackLoaderOptions>, source: string, sourceMap: string): Promise<void>;
+export default flairJsLoader;
+
+declare interface FlairJsWebpackLoaderOptions extends SharedPluginOptions {
+}
+
+declare interface SharedPluginOptions {
+    /**
+     * Preprocess the extracted CSS before it is passed to lightningcss
+     * @experimental
+     * @param css the extracted css
+     * @param id the id of the file being processed
+     * @returns the processed css
+     */
+    cssPreprocessor?: (css: string, id: string) => string;
+    include?: string | string[];
+    exclude?: string | string[];
+    /**
+     * Override the default theme file content based on the user theme
+     * @param theme the user theme
+     * @returns the theme file content
+     */
+    buildThemeFile?: (theme: FlairThemeConfig) => string;
+    /**
+     * List of class names used in the project. Supports regex.
+     */
+    classNameList?: string[];
+}
+
+export { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flairjs/webpack-loader",
-  "version": "0.0.1-beta.6",
+  "version": "0.0.1-beta.8",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
@@ -13,24 +13,25 @@
   },
   "peerDependencies": {
     "webpack": ">=5.0.0",
-    "@flairjs/core": "0.0.1-beta.5"
+    "@flairjs/core": "0.0.1-beta.7"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
-    "@rollup/plugin-typescript": "^12.1.4",
+    "@biomejs/biome": "^2.2.4",
+    "@microsoft/api-extractor": "^7.52.13",
     "@types/node": "^22.8.1",
+    "rimraf": "^6.0.1",
     "rolldown": "1.0.0-beta.37",
     "typescript": "^5.8.2",
     "webpack": "^5.101.0",
-    "@flairjs/bundler-shared": "0.0.1-beta.9",
-    "@flairjs/core": "0.0.1-beta.5"
+    "@flairjs/bundler-shared": "0.0.1-beta.11",
+    "@flairjs/core": "0.0.1-beta.7"
   },
   "dependencies": {
     "esbuild": "^0.25.10",
     "picomatch": "^4.0.3"
   },
   "scripts": {
-    "build": "tsc && rolldown -c",
+    "build": "rimraf dist && tsc && api-extractor run --local && rolldown -c && rimraf dist/types-temp",
     "check": "biome check --write",
     "dev": "rolldown -w -c",
     "format": "biome format --write"