@weapp-tailwindcss/postcss 3.3.3 → 3.3.4

package/dist/index.cjs

@@ -29,11 +29,11 @@ let node_fs_promises = require("node:fs/promises");
 let micromatch = require("micromatch");
 micromatch = require_rolldown_runtime.__toESM(micromatch, 1);
 let tailwindcss_config = require("tailwindcss-config");
+let node_perf_hooks = require("node:perf_hooks");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let lru_cache = require("lru-cache");
 let autoprefixer = require("autoprefixer");
 autoprefixer = require_rolldown_runtime.__toESM(autoprefixer, 1);
-let es_toolkit = require("es-toolkit");
 let postcss_pxtrans = require("postcss-pxtrans");
 postcss_pxtrans = require_rolldown_runtime.__toESM(postcss_pxtrans, 1);
 let postcss_rem_to_responsive_pixel = require("postcss-rem-to-responsive-pixel");
@@ -5333,8 +5333,20 @@ function getCalcDuplicateCleaner(options) {
 const EMPTY_CALC_OPTIONS = {};
 function getCalcPlugin(options) {
 	if (!options.cssCalc) return null;
-	if (options.cssCalc === true || Array.isArray(options.cssCalc)) return (0, _weapp_tailwindcss_postcss_calc.default)(EMPTY_CALC_OPTIONS);
-	return (0, _weapp_tailwindcss_postcss_calc.default)((0, es_toolkit.omit)(options.cssCalc, ["includeCustomProperties"]));
+	if (options.cssCalc === true || Array.isArray(options.cssCalc)) {
+		const calcOptions = Array.isArray(options.cssCalc) ? {
+			includeCustomProperties: options.cssCalc,
+			...options.customPropertyValues ? { customPropertyValues: options.customPropertyValues } : {}
+		} : options.customPropertyValues ? {
+			customPropertyValues: options.customPropertyValues,
+			includeCustomProperties: [...options.customPropertyValues.keys()]
+		} : EMPTY_CALC_OPTIONS;
+		return (0, _weapp_tailwindcss_postcss_calc.default)(calcOptions);
+	}
+	return (0, _weapp_tailwindcss_postcss_calc.default)({
+		...options.cssCalc,
+		...options.customPropertyValues ? { customPropertyValues: options.customPropertyValues } : {}
+	});
 }
 //#endregion
 //#region src/plugins/getCustomPropertyCleaner.ts
@@ -7235,10 +7247,21 @@ function createStyleHandler(options) {
 		}
 		const cacheKey = `${getOptionsFingerprint(resolvedOptions)}|${signal ? signalToCacheKey(signal) : ""}|${simpleHash(source)}`;
 		const cachedResult = resultCache.get(cacheKey);
-		if (cachedResult) return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		if (cachedResult) {
+			resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: 0,
+				cache: {
+					hit: true,
+					key: cacheKey
+				}
+			});
+			return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		}
 		const processor = processorCache.getProcessor(resolvedOptions, signal);
 		const processOptions = processorCache.getProcessOptions(resolvedOptions);
-		return processor.process(processInput, processOptions).async().then((result) => {
+		const startedAt = node_perf_hooks.performance.now();
+		return processor.process(processInput, processOptions).async().then(async (result) => {
 			let finalResult = resolvePostcssFrameworkProfile(resolvedOptions).postprocess(result, resolvedOptions);
 			if (resolvedOptions.isMainChunk !== false && finalResult.root) {
 				let removed = 0;
@@ -7267,7 +7290,29 @@ function createStyleHandler(options) {
 				if (splitUnresolvedAuthorVariableFallbacks(finalResult.root, /* @__PURE__ */ new Map())) finalResult.css = finalResult.root.toString();
 			}
 			resultCache.set(cacheKey, finalResult);
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: node_perf_hooks.performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				}
+			});
 			return cloneOutput ? cloneResult(finalResult) : finalResult;
+		}).catch(async (error) => {
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: node_perf_hooks.performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				},
+				error: {
+					name: error instanceof Error ? error.name : void 0,
+					message: error instanceof Error ? error.message : String(error)
+				}
+			});
+			throw error;
 		});
 	}
 	const handler = ((rawSource, opt) => {

package/dist/index.js

@@ -18,10 +18,10 @@ import { realpathSync } from "node:fs";
 import { readFile, stat } from "node:fs/promises";
 import micromatch from "micromatch";
 import { loadConfig } from "tailwindcss-config";
+import { performance } from "node:perf_hooks";
 import { defu, defuOverrideArray, regExpTest } from "@weapp-tailwindcss/shared";
 import { LRUCache } from "lru-cache";
 import autoprefixerPlugin from "autoprefixer";
-import { omit } from "es-toolkit";
 import postcssPxtrans from "postcss-pxtrans";
 import postcssRem2rpx from "postcss-rem-to-responsive-pixel";
 import postcssUnitConverter, { composeRules as unitConversionComposeRules, presets, presets as unitConversionPresets } from "postcss-rule-unit-converter";
@@ -5317,8 +5317,20 @@ function getCalcDuplicateCleaner(options) {
 const EMPTY_CALC_OPTIONS = {};
 function getCalcPlugin(options) {
 	if (!options.cssCalc) return null;
-	if (options.cssCalc === true || Array.isArray(options.cssCalc)) return postcssCalc(EMPTY_CALC_OPTIONS);
-	return postcssCalc(omit(options.cssCalc, ["includeCustomProperties"]));
+	if (options.cssCalc === true || Array.isArray(options.cssCalc)) {
+		const calcOptions = Array.isArray(options.cssCalc) ? {
+			includeCustomProperties: options.cssCalc,
+			...options.customPropertyValues ? { customPropertyValues: options.customPropertyValues } : {}
+		} : options.customPropertyValues ? {
+			customPropertyValues: options.customPropertyValues,
+			includeCustomProperties: [...options.customPropertyValues.keys()]
+		} : EMPTY_CALC_OPTIONS;
+		return postcssCalc(calcOptions);
+	}
+	return postcssCalc({
+		...options.cssCalc,
+		...options.customPropertyValues ? { customPropertyValues: options.customPropertyValues } : {}
+	});
 }
 //#endregion
 //#region src/plugins/getCustomPropertyCleaner.ts
@@ -7219,10 +7231,21 @@ function createStyleHandler(options) {
 		}
 		const cacheKey = `${getOptionsFingerprint(resolvedOptions)}|${signal ? signalToCacheKey(signal) : ""}|${simpleHash(source)}`;
 		const cachedResult = resultCache.get(cacheKey);
-		if (cachedResult) return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		if (cachedResult) {
+			resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: 0,
+				cache: {
+					hit: true,
+					key: cacheKey
+				}
+			});
+			return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		}
 		const processor = processorCache.getProcessor(resolvedOptions, signal);
 		const processOptions = processorCache.getProcessOptions(resolvedOptions);
-		return processor.process(processInput, processOptions).async().then((result) => {
+		const startedAt = performance.now();
+		return processor.process(processInput, processOptions).async().then(async (result) => {
 			let finalResult = resolvePostcssFrameworkProfile(resolvedOptions).postprocess(result, resolvedOptions);
 			if (resolvedOptions.isMainChunk !== false && finalResult.root) {
 				let removed = 0;
@@ -7251,7 +7274,29 @@ function createStyleHandler(options) {
 				if (splitUnresolvedAuthorVariableFallbacks(finalResult.root, /* @__PURE__ */ new Map())) finalResult.css = finalResult.root.toString();
 			}
 			resultCache.set(cacheKey, finalResult);
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				}
+			});
 			return cloneOutput ? cloneResult(finalResult) : finalResult;
+		}).catch(async (error) => {
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				},
+				error: {
+					name: error instanceof Error ? error.name : void 0,
+					message: error instanceof Error ? error.message : String(error)
+				}
+			});
+			throw error;
 		});
 	}
 	const handler = ((rawSource, opt) => {

package/dist/types.d.ts

@@ -140,6 +140,19 @@ export interface CssOptions {
     tailwindcssV4GradientFallback?: boolean | undefined;
 }
 export type IStyleHandlerOptions = {
+    /** 编译诊断回调；由上层 bundler 注入，保持 PostCSS 包与 compiler 解耦。 */
+    onDiagnostic?: (event: {
+        phase: 'postcss';
+        durationMs: number;
+        cache?: {
+            hit: boolean;
+            key?: string;
+        };
+        error?: {
+            name?: string;
+            message: string;
+        };
+    }) => void | Promise<void>;
     appType?: PostcssAppType | undefined;
     ctx?: PostcssContext | undefined;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/postcss",
   "type": "module",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "description": "PostCSS transforms that bring Tailwind CSS compatibility to every platform. 将 Tailwind CSS 兼容能力带到全端的 PostCSS 转换工具。",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -71,15 +71,15 @@
     "@csstools/css-tokenizer": "^4.0.0",
     "@tailwindcss-mangle/engine": "0.2.0",
     "@weapp-core/escape": "~8.0.0",
-    "@weapp-tailwindcss/postcss-calc": "1.0.6",
+    "@weapp-tailwindcss/postcss-calc": "1.0.7",
     "@weapp-tailwindcss/shared": "2.0.3",
-    "autoprefixer": "^10.5.5",
+    "autoprefixer": "^10.5.6",
     "es-toolkit": "^1.52.0",
     "lru-cache": "11.5.2",
     "micromatch": "^4.0.8",
     "postcss": "^8.5.28",
     "postcss-load-config": "^6.0.1",
-    "postcss-preset-env": "^11.5.1",
+    "postcss-preset-env": "^11.5.2",
     "postcss-pxtrans": "^1.0.4",
     "postcss-rem-to-responsive-pixel": "^7.0.5",
     "postcss-rule-unit-converter": "^0.2.3",
@@ -90,8 +90,7 @@
   },
   "devDependencies": {
     "@csstools/postcss-is-pseudo-class": "^6.0.0",
-    "fast-check": "^4.9.0",
-    "postcss-calc": "link:../postcss-calc",
+    "fast-check": "^4.10.0",
     "postcss-custom-properties": "^15.0.1"
   },
   "scripts": {