weapp-tailwindcss 5.1.13 → 5.1.14

package/dist/{hmr-timing-hRhRAjYV.mjs → hmr-timing-C3ed5vCx.mjs}

@@ -1,8 +1,8 @@
-import { $ as normalizeTailwindSourceDirectives, A as filterApplyOnlyGeneratedCss, At as resolveTailwindV4CssSourceBase, B as stripUnmatchedTailwindSourceMediaCloseFragments, F as removeTailwindV4GeneratedUserCssArtifacts, G as removeUnsupportedMiniProgramAtRules, H as finalizeMiniProgramCss, I as removeTailwindV4GeneratorAtRules, J as hasTailwindApplyDirective, L as shouldFilterApplyOnlyGeneratedCss, M as isCommentOnlyCss, N as normalizeEmptyTailwindCustomVariants, Nt as filterUnsupportedMiniProgramTailwindV4Candidates, Pt as loadTailwindV4DesignSystem, R as splitUserCssLayerBlocks, Tt as isFileMatchedByTailwindSourceEntries, V as transformGeneratorUserCss, X as hasTailwindRootDirectives, Z as hasTailwindSourceDirectives, a as resolveGeneratorRuntimeBranch, at as VITE_MARKER_RE, ct as hasTailwindGeneratedCssMarkers, d as resolveTailwindV4SourceFromRuntime, dt as splitTailwindV4GeneratedCssBySourceOrder, ft as stripGeneratorPlaceholderMarkers, gt as prependConfigDirective, ht as normalizeConfigDirective, i as normalizeWeappTailwindcssGeneratorOptions, it as GENERATOR_PLACEHOLDER_MARKER_RE, j as hasUserCssLayerBlocks, jt as toPosixPath$1, k as extractGeneratedCssForUserLayerSelectors, kt as resolveSourceScanPath, lt as splitGeneratorPlaceholderCssBySourceOrder, mt as stripTailwindBanners, nt as removeTailwindSourceDirectives, ot as createCssAppend, p as resolveTailwindV4SourceOptionsFromRuntime, pt as stripTailwindBanner, rt as resolveCssEntrySource, s as shouldUseMiniProgramCssBranch, st as hasTailwindGeneratedCss, t as createWeappTailwindcssGenerator, tt as parseImportRequest, u as resolveTailwindV4Source$1, ut as splitTailwindGeneratedCssByBanner, xt as FULL_SOURCE_SCAN_EXTENSION_RE, z as stripTailwindSourceMediaFragments } from "./generator-BvPcmqxU.mjs";
+import { $ as normalizeTailwindSourceDirectives, A as filterApplyOnlyGeneratedCss, At as resolveTailwindV4CssSourceBase, B as stripUnmatchedTailwindSourceMediaCloseFragments, F as removeTailwindV4GeneratedUserCssArtifacts, G as removeUnsupportedMiniProgramAtRules, H as finalizeMiniProgramCss, I as removeTailwindV4GeneratorAtRules, J as hasTailwindApplyDirective, L as shouldFilterApplyOnlyGeneratedCss, M as isCommentOnlyCss, N as normalizeEmptyTailwindCustomVariants, Nt as filterUnsupportedMiniProgramTailwindV4Candidates, Pt as loadTailwindV4DesignSystem, R as splitUserCssLayerBlocks, Tt as isFileMatchedByTailwindSourceEntries, V as transformGeneratorUserCss, X as hasTailwindRootDirectives, Z as hasTailwindSourceDirectives, a as resolveGeneratorRuntimeBranch, at as VITE_MARKER_RE, ct as hasTailwindGeneratedCssMarkers, d as resolveTailwindV4SourceFromRuntime, dt as splitTailwindV4GeneratedCssBySourceOrder, ft as stripGeneratorPlaceholderMarkers, gt as prependConfigDirective, ht as normalizeConfigDirective, i as normalizeWeappTailwindcssGeneratorOptions, it as GENERATOR_PLACEHOLDER_MARKER_RE, j as hasUserCssLayerBlocks, jt as toPosixPath$1, k as extractGeneratedCssForUserLayerSelectors, kt as resolveSourceScanPath, lt as splitGeneratorPlaceholderCssBySourceOrder, mt as stripTailwindBanners, nt as removeTailwindSourceDirectives, ot as createCssAppend, p as resolveTailwindV4SourceOptionsFromRuntime, pt as stripTailwindBanner, rt as resolveCssEntrySource, s as shouldUseMiniProgramCssBranch, st as hasTailwindGeneratedCss, t as createWeappTailwindcssGenerator, tt as parseImportRequest, u as resolveTailwindV4Source$1, ut as splitTailwindGeneratedCssByBanner, xt as FULL_SOURCE_SCAN_EXTENSION_RE, z as stripTailwindSourceMediaFragments } from "./generator-B59OA64h.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
-import { h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as includesTailwindV4PreflightDirective } from "./tailwindcss-DZT_pWrd.mjs";
-import { _ as babelParse, b as md5Hash, g as replaceWxml, v as traverse, y as createDebug } from "./wxml-DdGdeqaH.mjs";
-import { r as resolveStyleOptionsFromContext } from "./context-xSJE588m.mjs";
+import { h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as includesTailwindV4PreflightDirective } from "./tailwindcss-DPcKMLxL.mjs";
+import { _ as babelParse, b as md5Hash, g as replaceWxml, i as createAttributeMatcher, n as Parser, v as traverse, y as createDebug } from "./wxml-DdGdeqaH.mjs";
+import { r as resolveStyleOptionsFromContext } from "./context-BL8Gy71H.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -1472,7 +1472,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 		index: 0,
 		matched: true
 	}) : void 0;
-	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? await resolveTailwindV4Source$1(normalizedSourceOptions) : void 0;
+	const canResolveCombinedConfiguredCssSources = (normalizedSourceOptions?.cssSources?.length ?? 0) <= 1 || hasTailwindGeneratedCss(rawSource);
+	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? (canResolveCombinedConfiguredCssSources ? await resolveTailwindV4Source$1(normalizedSourceOptions) : void 0) : void 0;
 	if (configuredCssSource) return generatorOptions?.config ? {
 		...configuredCssSource,
 		css: prependConfigDirective(configuredCssSource.css, generatorOptions.config)
@@ -2464,6 +2465,8 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = generatedCss;
+		const distinctUserLayerParts = hasDistinctUserRawSource && hasUserCssLayerBlocks(generatedUserCssRawSource) ? splitUserCssLayerBlocks(generatedUserCssRawSource) : void 0;
+		let restoredDistinctUserLayerCss = false;
 		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await transformGeneratorUserCss(generatedUserCssRawSource, {
 			generatorTarget: generated.target,
 			generatorStyleOptions,
@@ -2493,10 +2496,26 @@ async function generateCssByGenerator(options) {
 					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				}
 			}
+			if (hasDistinctUserRawSource && distinctUserLayerParts) {
+				const layerUserCss = await transformGeneratorUserCss(distinctUserLayerParts.layer, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback,
+					processed: userRawSourceProcessed
+				});
+				if (filterExistingCssRules(css, layerUserCss).trim().length > 0) {
+					css = createCssSourceOrderAppend$1(wrapUserLayerComponentsCss(layerUserCss), css);
+					restoredDistinctUserLayerCss = true;
+					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+				}
+			}
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
+				const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+				const userCss = await transformGeneratorUserCss(distinctUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2504,10 +2523,11 @@ async function generateCssByGenerator(options) {
 					importFallback: generatorOptions.importFallback,
 					processed: userRawSourceProcessed
 				});
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
-				const userCss = await transformGeneratorUserCss(removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource), {
+				const cleanedUserCssRawSource = removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
+				const userCss = await transformGeneratorUserCss(restoredDistinctUserLayerCss && hasUserCssLayerBlocks(cleanedUserCssRawSource) ? splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2572,7 +2592,8 @@ async function generateCssByGenerator(options) {
 			css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
 		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !hasTailwindApplyDirective(generatedUserCssRawSource)) {
-			const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
+			const distinctUserCssRawSource = restoredDistinctUserLayerCss ? distinctUserLayerParts?.rest ?? generatedUserCssRawSource : generatedUserCssRawSource;
+			const userCss = await transformGeneratorUserCss(distinctUserCssRawSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -2580,7 +2601,7 @@ async function generateCssByGenerator(options) {
 				importFallback: generatorOptions.importFallback,
 				processed: userRawSourceProcessed
 			});
-			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
+			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, distinctUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
 			css = createCssSourceOrderAppend$1(css, missingUserCss);
 		}
 		const finalCss = finalizeGeneratorCss(css, generated.target, {
@@ -2889,10 +2910,66 @@ const SCRIPT_SOURCE_CANDIDATE_EXTENSIONS = /* @__PURE__ */ new Set([
 	"mts",
 	"cts"
 ]);
+const TEMPLATE_SOURCE_CANDIDATE_EXTENSIONS = /* @__PURE__ */ new Set([
+	"html",
+	"wxml",
+	"axml",
+	"jxml",
+	"ksml",
+	"ttml",
+	"qml",
+	"tyml",
+	"xhsml",
+	"swan",
+	"vue",
+	"uvue",
+	"nvue",
+	"mpx"
+]);
 async function extractCandidatesFromSource(source, extension, options = {}) {
 	const candidates = options.extractor ? new Set(await options.extractor(source, extension)) : new Set(await extractSourceCandidates(source, extension, { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } }));
 	const scriptCandidates = await extractScriptStringCandidates(source, extension, options);
 	for (const candidate of scriptCandidates) candidates.add(candidate);
+	const templateAttributeCandidates = await extractTemplateAttributeCandidates(source, extension, options);
+	for (const candidate of templateAttributeCandidates) candidates.add(candidate);
+	return candidates;
+}
+function isDefaultTemplateAttribute(name) {
+	if (name === "class" || name === "hover-class" || name === "virtualhostclass") return true;
+	const lowerName = name.toLowerCase();
+	return lowerName === "class" || lowerName === "hover-class" || lowerName === "virtualhostclass";
+}
+async function extractCandidateTokensFromTemplateAttributeValue(value, options) {
+	return options.extractor ? await options.extractor(value, "html") : await extractSourceCandidates(value, "html", { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } });
+}
+async function extractTemplateAttributeCandidates(source, extension, options) {
+	if (!TEMPLATE_SOURCE_CANDIDATE_EXTENSIONS.has(extension)) return [];
+	if (!options.customAttributesEntities?.length) return [];
+	const candidates = /* @__PURE__ */ new Set();
+	const matchCustomAttribute = createAttributeMatcher(options.customAttributesEntities);
+	const defaultTemplateHandlerEnabled = !options.disabledDefaultTemplateHandler;
+	let tag = "";
+	const tasks = [];
+	const parser = new Parser({
+		onopentagname(name) {
+			tag = name;
+		},
+		onattribute(name, value) {
+			if (!value) return;
+			const shouldHandleDefault = defaultTemplateHandlerEnabled && isDefaultTemplateAttribute(name);
+			const shouldHandleCustom = matchCustomAttribute?.(tag, name) ?? false;
+			if (!shouldHandleDefault && !shouldHandleCustom) return;
+			tasks.push((async () => {
+				for (const candidate of await extractCandidateTokensFromTemplateAttributeValue(value, options)) candidates.add(candidate);
+			})());
+		},
+		onclosetag() {
+			tag = "";
+		}
+	}, { xmlMode: true });
+	parser.write(source);
+	parser.end();
+	await Promise.all(tasks);
 	return candidates;
 }
 async function extractScriptStringCandidates(source, extension, options) {
@@ -3042,8 +3119,21 @@ function resolveSourceCandidateExtension(id) {
 	const normalized = cleanUrl(id);
 	return /\.([^.\\/]+)$/.exec(normalized)?.[1] ?? "html";
 }
-function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, extractor) {
-	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${extractor ? "custom" : "default"}\0${md5Hash(source)}`;
+function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, customAttributesEntities, disabledDefaultTemplateHandler, extractor) {
+	return [
+		extension,
+		JSON.stringify(bareArbitraryValues ?? false),
+		createCustomAttributesCacheSignature(customAttributesEntities),
+		disabledDefaultTemplateHandler === true ? "default-template:off" : "default-template:on",
+		extractor ? "custom" : "default",
+		md5Hash(source)
+	].join("\0");
+}
+function createCustomAttributesCacheSignature(customAttributesEntities) {
+	return JSON.stringify((customAttributesEntities ?? []).map(([selector, props]) => [stringifyCustomAttributeToken(selector), Array.isArray(props) ? props.map(stringifyCustomAttributeToken) : stringifyCustomAttributeToken(props)]));
+}
+function stringifyCustomAttributeToken(token) {
+	return typeof token === "string" ? `s:${token}` : `r:${token.source}/${token.flags}`;
 }
 async function extractCandidates(source, extension, options) {
 	return extractCandidatesFromSource(source, extension, options);
@@ -3090,7 +3180,7 @@ function createSourceCandidateStore(options = {}) {
 		const normalizedId = cleanUrl(id);
 		scanSourceById.set(normalizedId, source);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceScanLayer(normalizedId, new Set(cachedCandidates));
@@ -3103,7 +3193,7 @@ function createSourceCandidateStore(options = {}) {
 	async function syncCss(id, source) {
 		const normalizedId = cleanUrl(id);
 		cssSourceById.set(normalizedId, source);
-		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceCssLayer(normalizedId, new Set(cachedCandidates));
@@ -3117,7 +3207,7 @@ function createSourceCandidateStore(options = {}) {
 		const normalizedId = cleanUrl(id);
 		transformSourceById.set(normalizedId, source);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.customAttributesEntities, options.disabledDefaultTemplateHandler, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : await extractCandidates(source, extension, options);
 		if (!cachedCandidates) sourceCandidateContentCache.set(contentCacheKey, [...extractedCandidates]);

package/dist/index.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_framework = require("./framework.js");
-const require_generator = require("./generator-CS10c9g1.js");
-const require_gulp = require("./gulp-DNZZvUMq.js");
+const require_generator = require("./generator-CEnUsjed.js");
+const require_gulp = require("./gulp-C1Q3LRzg.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-DnkObu2L.js");
-const require_webpack = require("./webpack-CzXjfvYS.js");
+const require_vite = require("./vite-BNlPdsGM.js");
+const require_webpack = require("./webpack-Jpe048pQ.js");
 require("./webpack.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.mjs";
-import { t as createWeappTailwindcssGenerator } from "./generator-BvPcmqxU.mjs";
-import { t as createPlugins } from "./gulp-BEOzXrbp.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-B59OA64h.mjs";
+import { t as createPlugins } from "./gulp-DUYWxmZC.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-Tpgi77vE.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-CTYm19zA.mjs";
+import { t as WeappTailwindcss } from "./vite-CBU5NXTX.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-CZ38fMGC.mjs";
 import "./webpack.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveMpxPlatform, resolvePlatform, resolveTaroPlatform, resolveUniAppXPlatform, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/postcss.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_generator = require("./generator-CS10c9g1.js");
+const require_generator = require("./generator-CEnUsjed.js");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
 	createGenerator: (source) => {
 		return require_generator.createWeappTailwindcssGenerator(source);

package/dist/postcss.mjs

@@ -1,4 +1,4 @@
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-BvPcmqxU.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-B59OA64h.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/presets.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
 const require_object = require("./object-COs_Mw6p.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 require("./utils-CuKLf1Zv.js");
 require("./logger-TlKT3xmR.js");
 let node_path = require("node:path");

package/dist/presets.mjs

@@ -1,6 +1,6 @@
 import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DZT_pWrd.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DPcKMLxL.mjs";
 import { n as defuOverrideArray } from "./utils-MVwpU07P.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";

package/dist/rspack.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_webpack = require("./webpack-CzXjfvYS.js");
+const require_webpack = require("./webpack-Jpe048pQ.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 //#region src/bundlers/rspack/index.ts

package/dist/rspack.mjs

@@ -1,4 +1,4 @@
-import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-CTYm19zA.mjs";
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-CZ38fMGC.mjs";
 import path from "node:path";
 //#region src/bundlers/rspack/index.ts
 const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";

package/dist/{source-candidate-scan-signature-t4XKAQ04.mjs → source-candidate-scan-signature-D7RWjWsY.mjs}

@@ -1,8 +1,8 @@
 import { detectAppType } from "./framework.mjs";
 import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-CrJJc5rK.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-DZT_pWrd.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-DPcKMLxL.mjs";
 import { _ as babelParse, n as Parser, v as traverse } from "./wxml-DdGdeqaH.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-hRhRAjYV.mjs";
+import { u as generateCssByGenerator } from "./hmr-timing-C3ed5vCx.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
@@ -702,78 +702,51 @@ function createLocalSourceEntries(sourceFile) {
 	}];
 }
 function intersectCandidates(first, second) {
-	const scoped = /* @__PURE__ */ new Set();
+	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Set();
 	const [small, large] = first.size <= second.size ? [first, second] : [second, first];
+	const scoped = /* @__PURE__ */ new Set();
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
-function intersectCandidateSourceMaps(first, second) {
-	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Map();
-	const scoped = /* @__PURE__ */ new Map();
-	for (const [candidate, sources] of first) if (second.has(candidate)) scoped.set(candidate, sources);
-	return scoped;
-}
 function mergeCandidates(first, second) {
 	return /* @__PURE__ */ new Set([...first, ...second]);
 }
-function intersectExplicitSourceCandidates(scopedCandidates, localCandidates) {
-	if (localCandidates.size === 0 && scopedCandidates.size > 0) return scopedCandidates;
-	return intersectCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates) {
-	if (scopedCandidates.size === 0 && localCandidates.size === 0 && fallbackCandidates?.size) return fallbackCandidates;
-	return intersectExplicitSourceCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceMaps(scopedSources, localSources, fallbackSources) {
-	if (scopedSources.size === 0 && localSources.size === 0 && fallbackSources?.size) return fallbackSources;
-	if (localSources.size === 0 && scopedSources.size > 0) return scopedSources;
-	return intersectCandidateSourceMaps(scopedSources, localSources);
+function canFallbackToOutputCandidates(rawSource, entries) {
+	return rawSource.includes("@source") && entries.length > 0 && entries.every((entry) => !entry.negated);
 }
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
 		localEntries: void 0
 	};
-	const localEntries = createLocalSourceEntries(sourceFile);
-	if (!resolvedEntries || resolvedEntries.length === 0) return {
-		entries: localEntries,
-		localEntries: void 0
-	};
-	return {
-		entries: resolvedEntries,
-		localEntries
-	};
+	if (resolvedEntries !== void 0) return { entries: resolvedEntries };
+	return { entries: createLocalSourceEntries(sourceFile) };
 }
 async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile) {
 	return resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 }
 async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fallbackSignature, getSourceCandidatesForEntries, options = {}) {
 	if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource)) return fallbackSignature;
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return fallbackSignature;
-	const scopedCandidates = getSourceCandidatesForEntries(entries);
-	const scopedSignature = createCandidateSignature(localEntries ? resolveExplicitSourceCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries), getSourceCandidatesForEntries(void 0)) : scopedCandidates);
+	const scopedSignature = createCandidateSignature(getSourceCandidatesForEntries(entries));
 	return options.includeFallbackSignature === true ? `${scopedSignature}:${fallbackSignature}` : scopedSignature;
 }
 async function createScopedGeneratorSourceTraceMap(rawSource, sourceFile, getSourceCandidateSourcesForEntries) {
 	if (!getSourceCandidateSourcesForEntries || !hasOwnSourceDirectives(rawSource)) return getSourceCandidateSourcesForEntries?.(void 0);
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return getSourceCandidateSourcesForEntries(void 0);
-	const scopedSources = getSourceCandidateSourcesForEntries(entries);
-	return localEntries ? resolveExplicitSourceMaps(scopedSources, getSourceCandidateSourcesForEntries(localEntries), getSourceCandidateSourcesForEntries(void 0)) : scopedSources;
+	return getSourceCandidateSourcesForEntries(entries);
 }
 async function createScopedGeneratorRuntime(options) {
 	const { cssHandlerOptions, fallbackRuntime, getSourceCandidatesForEntries, outputFile, rawSource, shouldExcludeSubpackageSourceCandidates, sourceFile, scopedSourceCandidateGetter } = options;
 	if (getSourceCandidatesForEntries && rawSource && sourceFile) {
-		const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+		const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
-			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			const shouldMergeFallbackRuntime = hasCssMacroTailwindV4CustomVariantConditionalComments(rawSource);
-			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
-			const localCandidates = scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries);
-			const fallbackCandidates = scopedSourceCandidateGetter?.(void 0);
-			const scopedLocalCandidates = resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates);
-			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
+			const explicitCandidates = getSourceCandidatesForEntries(entries);
+			const outputCandidates = scopedSourceCandidateGetter?.(void 0);
+			const scopedCandidates = outputCandidates ? explicitCandidates.size === 0 && canFallbackToOutputCandidates(rawSource, entries) ? outputCandidates : intersectCandidates(explicitCandidates, outputCandidates) : explicitCandidates;
+			return hasCssMacroTailwindV4CustomVariantConditionalComments(rawSource) ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);

package/dist/{source-candidate-scan-signature-CMgu5bJk.js → source-candidate-scan-signature-R3dzamcm.js}

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
 require("./auto-DtU6f3X6.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
-const require_hmr_timing = require("./hmr-timing-DW1g3zjl.js");
+const require_hmr_timing = require("./hmr-timing-BZ5sWIqO.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
@@ -706,78 +706,51 @@ function createLocalSourceEntries(sourceFile) {
 	}];
 }
 function intersectCandidates(first, second) {
-	const scoped = /* @__PURE__ */ new Set();
+	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Set();
 	const [small, large] = first.size <= second.size ? [first, second] : [second, first];
+	const scoped = /* @__PURE__ */ new Set();
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
-function intersectCandidateSourceMaps(first, second) {
-	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Map();
-	const scoped = /* @__PURE__ */ new Map();
-	for (const [candidate, sources] of first) if (second.has(candidate)) scoped.set(candidate, sources);
-	return scoped;
-}
 function mergeCandidates(first, second) {
 	return /* @__PURE__ */ new Set([...first, ...second]);
 }
-function intersectExplicitSourceCandidates(scopedCandidates, localCandidates) {
-	if (localCandidates.size === 0 && scopedCandidates.size > 0) return scopedCandidates;
-	return intersectCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates) {
-	if (scopedCandidates.size === 0 && localCandidates.size === 0 && fallbackCandidates?.size) return fallbackCandidates;
-	return intersectExplicitSourceCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceMaps(scopedSources, localSources, fallbackSources) {
-	if (scopedSources.size === 0 && localSources.size === 0 && fallbackSources?.size) return fallbackSources;
-	if (localSources.size === 0 && scopedSources.size > 0) return scopedSources;
-	return intersectCandidateSourceMaps(scopedSources, localSources);
+function canFallbackToOutputCandidates(rawSource, entries) {
+	return rawSource.includes("@source") && entries.length > 0 && entries.every((entry) => !entry.negated);
 }
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
 		localEntries: void 0
 	};
-	const localEntries = createLocalSourceEntries(sourceFile);
-	if (!resolvedEntries || resolvedEntries.length === 0) return {
-		entries: localEntries,
-		localEntries: void 0
-	};
-	return {
-		entries: resolvedEntries,
-		localEntries
-	};
+	if (resolvedEntries !== void 0) return { entries: resolvedEntries };
+	return { entries: createLocalSourceEntries(sourceFile) };
 }
 async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile) {
 	return resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(rawSource, node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 }
 async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fallbackSignature, getSourceCandidatesForEntries, options = {}) {
 	if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource)) return fallbackSignature;
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return fallbackSignature;
-	const scopedCandidates = getSourceCandidatesForEntries(entries);
-	const scopedSignature = createCandidateSignature(localEntries ? resolveExplicitSourceCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries), getSourceCandidatesForEntries(void 0)) : scopedCandidates);
+	const scopedSignature = createCandidateSignature(getSourceCandidatesForEntries(entries));
 	return options.includeFallbackSignature === true ? `${scopedSignature}:${fallbackSignature}` : scopedSignature;
 }
 async function createScopedGeneratorSourceTraceMap(rawSource, sourceFile, getSourceCandidateSourcesForEntries) {
 	if (!getSourceCandidateSourcesForEntries || !hasOwnSourceDirectives(rawSource)) return getSourceCandidateSourcesForEntries?.(void 0);
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return getSourceCandidateSourcesForEntries(void 0);
-	const scopedSources = getSourceCandidateSourcesForEntries(entries);
-	return localEntries ? resolveExplicitSourceMaps(scopedSources, getSourceCandidateSourcesForEntries(localEntries), getSourceCandidateSourcesForEntries(void 0)) : scopedSources;
+	return getSourceCandidateSourcesForEntries(entries);
 }
 async function createScopedGeneratorRuntime(options) {
 	const { cssHandlerOptions, fallbackRuntime, getSourceCandidatesForEntries, outputFile, rawSource, shouldExcludeSubpackageSourceCandidates, sourceFile, scopedSourceCandidateGetter } = options;
 	if (getSourceCandidatesForEntries && rawSource && sourceFile) {
-		const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+		const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
-			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			const shouldMergeFallbackRuntime = (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4CustomVariantConditionalComments)(rawSource);
-			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
-			const localCandidates = scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries);
-			const fallbackCandidates = scopedSourceCandidateGetter?.(void 0);
-			const scopedLocalCandidates = resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates);
-			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
+			const explicitCandidates = getSourceCandidatesForEntries(entries);
+			const outputCandidates = scopedSourceCandidateGetter?.(void 0);
+			const scopedCandidates = outputCandidates ? explicitCandidates.size === 0 && canFallbackToOutputCandidates(rawSource, entries) ? outputCandidates : intersectCandidates(explicitCandidates, outputCandidates) : explicitCandidates;
+			return (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4CustomVariantConditionalComments)(rawSource) ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);

package/dist/tailwindcss/candidates.d.ts

@@ -1,7 +1,11 @@
+import type { ICustomAttributesEntities } from '../types';
 import type { IArbitraryValues } from '../types/shared';
 export interface SourceCandidateExtractionOptions {
     bareArbitraryValues?: IArbitraryValues['bareArbitraryValues'] | undefined;
+    customAttributesEntities?: ICustomAttributesEntities | undefined;
+    disabledDefaultTemplateHandler?: boolean | undefined;
     extractor?: ((source: string, extension: string) => Promise<Iterable<string>> | Iterable<string>) | undefined;
 }
 export declare function extractCandidatesFromSource(source: string, extension: string, options?: SourceCandidateExtractionOptions): Promise<Set<string>>;
+export declare function extractTemplateAttributeCandidates(source: string, extension: string, options: SourceCandidateExtractionOptions): Promise<never[] | Set<string>>;
 export declare function extractScriptStringCandidates(source: string, extension: string, options: SourceCandidateExtractionOptions): Promise<never[] | Set<string>>;

package/dist/{tailwindcss-DZT_pWrd.mjs → tailwindcss-DPcKMLxL.mjs}

@@ -1,4 +1,4 @@
-import { At as resolveTailwindV4CssSourceBase, C as findWorkspaceRoot, Ct as createTailwindSourceEntryMatcher, D as normalizeStringListOption, Dt as parseConfigParam, E as resolveTailwindcssOptions, Et as normalizeLegacyContentEntries, Mt as resolveCssMacroTailwindV4Source, Ot as resolveCssSourceEntries, Pt as loadTailwindV4DesignSystem, S as findWorkspacePackageDir, St as FULL_SOURCE_SCAN_PATTERN, T as normalizeTailwindcssRuntimeOptions, _ as groupCssEntriesByBase, b as normalizeCssEntries, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as guessBasedirFromEntries, w as normalizeExtendLengthUnits, wt as expandTailwindSourceEntries, x as findNearestPackageRoot, y as isTailwindV4CssEntry } from "./generator-BvPcmqxU.mjs";
+import { At as resolveTailwindV4CssSourceBase, C as findWorkspaceRoot, Ct as createTailwindSourceEntryMatcher, D as normalizeStringListOption, Dt as parseConfigParam, E as resolveTailwindcssOptions, Et as normalizeLegacyContentEntries, Mt as resolveCssMacroTailwindV4Source, Ot as resolveCssSourceEntries, Pt as loadTailwindV4DesignSystem, S as findWorkspacePackageDir, St as FULL_SOURCE_SCAN_PATTERN, T as normalizeTailwindcssRuntimeOptions, _ as groupCssEntriesByBase, b as normalizeCssEntries, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as guessBasedirFromEntries, w as normalizeExtendLengthUnits, wt as expandTailwindSourceEntries, x as findNearestPackageRoot, y as isTailwindV4CssEntry } from "./generator-B59OA64h.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.mjs";
 import { createRequire } from "node:module";

package/dist/{tailwindcss-z9JMF-qU.js → tailwindcss-KBYPJ2DW.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_generator = require("./generator-CS10c9g1.js");
+const require_generator = require("./generator-CEnUsjed.js");
 const require_object = require("./object-COs_Mw6p.js");
 require("./utils-CuKLf1Zv.js");
 let node_fs = require("node:fs");