weapp-tailwindcss 5.1.12 → 5.1.13

package/dist/index.js

@@ -3,7 +3,7 @@ const require_framework = require("./framework.js");
 const require_generator = require("./generator-CS10c9g1.js");
 const require_gulp = require("./gulp-DNZZvUMq.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-VGfkFQkC.js");
+const require_vite = require("./vite-DnkObu2L.js");
 const require_webpack = require("./webpack-CzXjfvYS.js");
 require("./webpack.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMp
 import { t as createWeappTailwindcssGenerator } from "./generator-BvPcmqxU.mjs";
 import { t as createPlugins } from "./gulp-BEOzXrbp.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-DF1gE6a5.mjs";
+import { t as WeappTailwindcss } from "./vite-Tpgi77vE.mjs";
 import { n as weappTailwindcssPackageDir } from "./webpack-CTYm19zA.mjs";
 import "./webpack.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";

package/dist/{vite-VGfkFQkC.js → vite-DnkObu2L.js}

@@ -7129,7 +7129,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 	let pendingHmrCandidateChange;
 	let pendingHmrCssTargetFiles;
 	let pendingFullHmrCssRegeneration = false;
-	const normalizeHmrCssTargetFile = (file) => normalizeVitePersistentCacheKey((0, _weapp_tailwindcss_shared.cleanUrl)(file));
+	const normalizeGeneratedCssCacheFile = (file) => normalizeVitePersistentCacheKey((0, _weapp_tailwindcss_shared.cleanUrl)(file));
+	const normalizeHmrCssTargetFile = normalizeGeneratedCssCacheFile;
 	const collectPendingHmrCssTargetFiles = (cssModules, fallbackCssIds) => {
 		const targets = /* @__PURE__ */ new Set();
 		const addTarget = (file) => {
@@ -7202,7 +7203,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		return change;
 	};
 	const resolvePendingHmrCandidateChange = (generatorCode, file) => {
-		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && require_generator.hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(file) || !generatedClassSetByFile.has(file) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(normalizeHmrCssTargetFile(file))) return;
+		const fileKey = normalizeGeneratedCssCacheFile(file);
+		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && require_generator.hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(fileKey) || !generatedClassSetByFile.has(fileKey) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(fileKey)) return;
 		return pendingHmrCandidateChange;
 	};
 	const finishPendingHmrCssTargetFile = (file) => {
@@ -7456,12 +7458,13 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		const sourceRoot = resolveWeappViteSourceRoot(resolvedConfig, opts.appType);
 		const outputFile = resolveViteCssPipelineOutputFile(requestFile, opts, rootDir, currentGeneratorBranch.isWeb, shouldPreserveStyleOutputExtension, sourceRoot);
 		const generatorTransformCode = currentGeneratorBranch.isWeb ? generatorCode : require_hmr_timing.normalizeMiniProgramGeneratorCssSource(generatorCode, outputFile);
+		const fileKey = normalizeGeneratedCssCacheFile(file);
 		const fullRuntime = getSourceCandidates() ?? getRecordedGeneratorCandidates() ?? await ensureRuntimeClassSet();
 		const pendingHmrChange = resolvePendingHmrCandidateChange(generatorCode, file);
 		const forceFullHmrCssRegeneration = pendingFullHmrCssRegeneration || resolvedConfig?.command === "serve" && pendingHmrCandidateChange !== void 0 && pendingHmrChange === void 0;
 		const runtime = fullRuntime;
 		if (pendingHmrChange && currentGeneratorOptions.target === "weapp" && require_generator.filterUnsupportedMiniProgramTailwindV4Candidates(pendingHmrChange.addedCandidates).size === 0) {
-			const previousTracedCss = tracedGeneratedCssByFile.get(file);
+			const previousTracedCss = tracedGeneratedCssByFile.get(fileKey);
 			if (previousTracedCss !== void 0) {
 				finishPendingHmrCssTargetFile(file);
 				return `${require_source_candidate_scan_signature.createBundlerGeneratedCssMarker("vite", normalizeViteProcessedCssFile(file))}\n${previousTracedCss}`;
@@ -7503,7 +7506,7 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		}), {
 			file,
 			memoryDebug: {
-				cleanCacheHit: cleanGeneratedCssByFile.has(file),
+				cleanCacheHit: cleanGeneratedCssByFile.has(fileKey),
 				forceFullHmrCssRegeneration,
 				pendingAddedCandidates: pendingHmrCandidateChange?.addedCandidates.size ?? 0,
 				pendingCssTargets: pendingHmrCssTargetFiles?.size ?? 0,
@@ -7530,9 +7533,9 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			tokenSources: require_hmr_timing.createCssTokenSourceMap(getSourceCandidateSourcesForEntries(void 0), opts)
 		});
 		for (const dependency of generated.dependencies) hookContext?.addWatchFile?.(dependency);
-		cleanGeneratedCssByFile.set(file, outputCss);
-		tracedGeneratedCssByFile.set(file, tracedCss);
-		generatedClassSetByFile.set(file, new Set(generated.classSet));
+		cleanGeneratedCssByFile.set(fileKey, outputCss);
+		tracedGeneratedCssByFile.set(fileKey, tracedCss);
+		generatedClassSetByFile.set(fileKey, new Set(generated.classSet));
 		const shouldInjectGeneratedCssIntoMain = mainCssChunkMatcher(outputFile, opts.appType) || require_generator.hasTailwindRootDirectives(generatorTransformCode, { importFallback: currentGeneratorOptions.importFallback }) && !require_source_candidate_scan_signature.normalizeOutputPathKey(outputFile).includes("/");
 		recordViteProcessedCssAssetResult(file, tracedCss, {
 			injectIntoMain: shouldInjectGeneratedCssIntoMain,

package/dist/{vite-DF1gE6a5.mjs → vite-Tpgi77vE.mjs}

@@ -7123,7 +7123,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 	let pendingHmrCandidateChange;
 	let pendingHmrCssTargetFiles;
 	let pendingFullHmrCssRegeneration = false;
-	const normalizeHmrCssTargetFile = (file) => normalizeVitePersistentCacheKey(cleanUrl(file));
+	const normalizeGeneratedCssCacheFile = (file) => normalizeVitePersistentCacheKey(cleanUrl(file));
+	const normalizeHmrCssTargetFile = normalizeGeneratedCssCacheFile;
 	const collectPendingHmrCssTargetFiles = (cssModules, fallbackCssIds) => {
 		const targets = /* @__PURE__ */ new Set();
 		const addTarget = (file) => {
@@ -7196,7 +7197,8 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		return change;
 	};
 	const resolvePendingHmrCandidateChange = (generatorCode, file) => {
-		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(file) || !generatedClassSetByFile.has(file) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(normalizeHmrCssTargetFile(file))) return;
+		const fileKey = normalizeGeneratedCssCacheFile(file);
+		if (resolvedConfig?.command !== "serve" || !pendingHmrCandidateChange || pendingHmrCandidateChange.runtimeAffecting || pendingHmrCandidateChange.addedCandidates.size === 0 || resolveCurrentGeneratorOptions().target === "weapp" && hasUserCssLayerBlocks(generatorCode) || !cleanGeneratedCssByFile.has(fileKey) || !generatedClassSetByFile.has(fileKey) || pendingHmrCssTargetFiles !== void 0 && !pendingHmrCssTargetFiles.has(fileKey)) return;
 		return pendingHmrCandidateChange;
 	};
 	const finishPendingHmrCssTargetFile = (file) => {
@@ -7450,12 +7452,13 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		const sourceRoot = resolveWeappViteSourceRoot(resolvedConfig, opts.appType);
 		const outputFile = resolveViteCssPipelineOutputFile(requestFile, opts, rootDir, currentGeneratorBranch.isWeb, shouldPreserveStyleOutputExtension, sourceRoot);
 		const generatorTransformCode = currentGeneratorBranch.isWeb ? generatorCode : normalizeMiniProgramGeneratorCssSource(generatorCode, outputFile);
+		const fileKey = normalizeGeneratedCssCacheFile(file);
 		const fullRuntime = getSourceCandidates() ?? getRecordedGeneratorCandidates() ?? await ensureRuntimeClassSet();
 		const pendingHmrChange = resolvePendingHmrCandidateChange(generatorCode, file);
 		const forceFullHmrCssRegeneration = pendingFullHmrCssRegeneration || resolvedConfig?.command === "serve" && pendingHmrCandidateChange !== void 0 && pendingHmrChange === void 0;
 		const runtime = fullRuntime;
 		if (pendingHmrChange && currentGeneratorOptions.target === "weapp" && filterUnsupportedMiniProgramTailwindV4Candidates(pendingHmrChange.addedCandidates).size === 0) {
-			const previousTracedCss = tracedGeneratedCssByFile.get(file);
+			const previousTracedCss = tracedGeneratedCssByFile.get(fileKey);
 			if (previousTracedCss !== void 0) {
 				finishPendingHmrCssTargetFile(file);
 				return `${createBundlerGeneratedCssMarker("vite", normalizeViteProcessedCssFile(file))}\n${previousTracedCss}`;
@@ -7497,7 +7500,7 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 		}), {
 			file,
 			memoryDebug: {
-				cleanCacheHit: cleanGeneratedCssByFile.has(file),
+				cleanCacheHit: cleanGeneratedCssByFile.has(fileKey),
 				forceFullHmrCssRegeneration,
 				pendingAddedCandidates: pendingHmrCandidateChange?.addedCandidates.size ?? 0,
 				pendingCssTargets: pendingHmrCssTargetFiles?.size ?? 0,
@@ -7524,9 +7527,9 @@ function createViteFrameworkPlugins(options = {}, frameworkBranch) {
 			tokenSources: createCssTokenSourceMap(getSourceCandidateSourcesForEntries(void 0), opts)
 		});
 		for (const dependency of generated.dependencies) hookContext?.addWatchFile?.(dependency);
-		cleanGeneratedCssByFile.set(file, outputCss);
-		tracedGeneratedCssByFile.set(file, tracedCss);
-		generatedClassSetByFile.set(file, new Set(generated.classSet));
+		cleanGeneratedCssByFile.set(fileKey, outputCss);
+		tracedGeneratedCssByFile.set(fileKey, tracedCss);
+		generatedClassSetByFile.set(fileKey, new Set(generated.classSet));
 		const shouldInjectGeneratedCssIntoMain = mainCssChunkMatcher(outputFile, opts.appType) || hasTailwindRootDirectives(generatorTransformCode, { importFallback: currentGeneratorOptions.importFallback }) && !normalizeOutputPathKey(outputFile).includes("/");
 		recordViteProcessedCssAssetResult(file, tracedCss, {
 			injectIntoMain: shouldInjectGeneratedCssIntoMain,

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-VGfkFQkC.js");
+const require_vite = require("./vite-DnkObu2L.js");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-DF1gE6a5.mjs";
+import { t as WeappTailwindcss } from "./vite-Tpgi77vE.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -204,10 +204,10 @@
     "semver": "~7.8.5",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
-    "@weapp-tailwindcss/shared": "2.0.0",
-    "@weapp-tailwindcss/postcss": "3.1.9",
     "@weapp-tailwindcss/reset": "0.1.1",
+    "@weapp-tailwindcss/shared": "2.0.0",
     "tailwindcss-config": "2.0.1",
+    "@weapp-tailwindcss/postcss": "3.1.9",
     "weapp-style-injector": "1.0.1"
   },
   "devDependencies": {