weapp-tailwindcss 5.1.14 → 5.1.15

package/dist/{source-candidate-scan-signature-D7RWjWsY.mjs → source-candidate-scan-signature-Cf7259PR.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-DPcKMLxL.mjs";
+import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-2dg_uhEJ.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-xs704TRw.mjs";
 import { _ as babelParse, n as Parser, v as traverse } from "./wxml-DdGdeqaH.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-C3ed5vCx.mjs";
+import { O as isSourceStyleRequest, d as generateCssByGenerator } from "./hmr-timing-1aS6--U7.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
@@ -225,39 +225,6 @@ function resolvePackageDir(name) {
 	return path.dirname(pkgPath);
 }
 //#endregion
-//#region src/bundlers/shared/generated-css-marker.ts
-const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
-const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
-const BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE = /\/\*!?\s*weapp-tailwindcss (vite|webpack)-generated-css(?:\s*:\s*([^\s*]+))?\s*\*\/\s*/gi;
-const VITE_INTERNAL_CSS_MARKER_GLOBAL_RE = /\/\*\$vite\$:\d+\*\/\s*/g;
-function createBundlerGeneratedCssMarker(bundler, file) {
-	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
-}
-function hasBundlerGeneratedCssMarker(source) {
-	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
-}
-function stripBundlerGeneratedCssMarkers(source) {
-	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
-}
-function parseBundlerGeneratedCssMarkerBlocks(source) {
-	const blocks = [];
-	BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex = 0;
-	let match = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-	while (match !== null) {
-		const cssStart = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex;
-		const nextMatch = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-		const cssEnd = nextMatch?.index ?? source.length;
-		const file = match[2] ? decodeURIComponent(match[2]) : void 0;
-		blocks.push({
-			bundler: match[1],
-			file,
-			css: source.slice(cssStart, cssEnd)
-		});
-		match = nextMatch;
-	}
-	return blocks;
-}
-//#endregion
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -302,30 +269,6 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
 	return matchWithExtensions(candidate, hasOutput);
 }
 //#endregion
-//#region src/bundlers/shared/style-requests.ts
-const SOURCE_STYLE_EXT_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)$/i;
-const STYLE_QUERY_RE = /(?:^|&)type=styles?(?:&|$)/;
-const STYLE_LANG_QUERY_RE = /(?:^|&)lang(?:[.=](?:css|scss|sass|less|styl|stylus|pcss|postcss))?(?:&|$)/;
-function stripHash(request) {
-	const hashIndex = request.indexOf("#");
-	return hashIndex === -1 ? request : request.slice(0, hashIndex);
-}
-function stripRequestQuery(request) {
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	return queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-}
-function isSourceStyleRequest(request) {
-	if (typeof request !== "string" || request.length === 0) return false;
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	const pathname = queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-	if (SOURCE_STYLE_EXT_RE.test(pathname)) return true;
-	if (queryIndex === -1) return false;
-	const query = normalized.slice(queryIndex + 1);
-	return STYLE_QUERY_RE.test(query) || STYLE_LANG_QUERY_RE.test(query);
-}
-//#endregion
 //#region src/bundlers/shared/v4-generation-core.ts
 async function generateTailwindV4Css(options) {
 	const majorVersion = options.runtimeState.tailwindRuntime.majorVersion;
@@ -506,6 +449,7 @@ function createBundleBuildState() {
 		runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
 		linkedByEntry: /* @__PURE__ */ new Map(),
 		dependentsByLinkedFile: /* @__PURE__ */ new Map(),
+		bundleMarkupCandidatesByFile: /* @__PURE__ */ new Map(),
 		generatorCandidateSignature: void 0
 	};
 }
@@ -526,7 +470,7 @@ function createProcessFiles() {
 }
 function readEntrySource(output) {
 	if (output.type === "chunk") return output.code;
-	return output.source.toString();
+	return typeof output.source === "string" ? output.source : Buffer.from(output.source).toString();
 }
 function classifyBundleEntry(file, opts) {
 	if (opts.htmlMatcher(file) || isHTMLRequest(file)) return "html";
@@ -784,4 +728,4 @@ function createSourceCandidateScanSignature(input) {
 	});
 }
 //#endregion
-export { createBundlerGeneratedCssMarker as A, resolveViteFrameworkProfile as B, createBundleModuleGraphOptions as C, normalizeOutputPathKey as D, stripRequestQuery as E, resolvePluginDisabledState as F, createBuiltinViteStyleInjectorPlugins as I, createBuiltinWebpackStyleInjectorPlugin as L, parseBundlerGeneratedCssMarkerBlocks as M, stripBundlerGeneratedCssMarkers as N, resolveOutputSpecifier as O, resolvePackageDir as P, viteStyleInjectorDelegates as R, applyLinkedResults as S, isSourceStyleRequest as T, resolveWebpackFrameworkProfile as V, isCSSRequest as _, createCandidateSignature as a, slash as b, getSnapshotHash as c, buildBundleSnapshot as d, classifyBundleEntry as f, formatPostcssSourceMap as g, cleanUrl as h, createScopedGeneratorSourceTraceMap as i, hasBundlerGeneratedCssMarker as j, toAbsoluteOutputPath as k, hasRuntimeAffectingSourceChanges as l, updateBundleBuildState as m, createScopedGeneratorCandidateSignature as n, createJsHashSalt as o, createBundleBuildState as p, createScopedGeneratorRuntime as r, createLinkedImpactSignature as s, createSourceCandidateScanSignature as t, summarizeStringDiff as u, isHTMLRequest as v, generateTailwindV4Css as w, createRuntimeAffectingSourceSignature as x, normalizePath as y, webpackStyleInjectorDelegates as z };
+export { createBuiltinViteStyleInjectorPlugins as A, createBundleModuleGraphOptions as C, toAbsoluteOutputPath as D, resolveOutputSpecifier as E, resolveWebpackFrameworkProfile as F, viteStyleInjectorDelegates as M, webpackStyleInjectorDelegates as N, resolvePackageDir as O, resolveViteFrameworkProfile as P, applyLinkedResults as S, normalizeOutputPathKey as T, isCSSRequest as _, createCandidateSignature as a, slash as b, getSnapshotHash as c, buildBundleSnapshot as d, classifyBundleEntry as f, formatPostcssSourceMap as g, cleanUrl as h, createScopedGeneratorSourceTraceMap as i, createBuiltinWebpackStyleInjectorPlugin as j, resolvePluginDisabledState as k, hasRuntimeAffectingSourceChanges as l, updateBundleBuildState as m, createScopedGeneratorCandidateSignature as n, createJsHashSalt as o, createBundleBuildState as p, createScopedGeneratorRuntime as r, createLinkedImpactSignature as s, createSourceCandidateScanSignature as t, summarizeStringDiff as u, isHTMLRequest as v, generateTailwindV4Css as w, createRuntimeAffectingSourceSignature as x, normalizePath as y };

package/dist/{tailwindcss-DPcKMLxL.mjs → tailwindcss-xs704TRw.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-B59OA64h.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-CEo920So.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/{transform-D5JUgMpE.mjs → transform-B_KM9sLX.mjs}

@@ -14621,6 +14621,48 @@ function isRuntimeCandidate(candidate, runtimeSet) {
 	if (!runtimeSet || runtimeSet.size === 0) return false;
 	return runtimeSet.has(candidate) || runtimeSet.has(replaceWxml(candidate));
 }
+function hasTopLevelVariant(candidate) {
+	let bracketDepth = 0;
+	let parenthesisDepth = 0;
+	let quote = "";
+	let escaped = false;
+	for (const char of candidate) {
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = "";
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "[") {
+			bracketDepth += 1;
+			continue;
+		}
+		if (char === "]") {
+			bracketDepth = Math.max(0, bracketDepth - 1);
+			continue;
+		}
+		if (char === "(") {
+			parenthesisDepth += 1;
+			continue;
+		}
+		if (char === ")") {
+			parenthesisDepth = Math.max(0, parenthesisDepth - 1);
+			continue;
+		}
+		if (char === ":" && bracketDepth === 0 && parenthesisDepth === 0) return true;
+	}
+	return false;
+}
 function shouldEnableComponentLocalStyle(id) {
 	return COMPONENT_RE.test(id);
 }
@@ -14643,18 +14685,18 @@ var UniAppXComponentLocalStyleCollector = class {
 		this.aliasByLookup.set(replaceWxml(utility), alias);
 		return alias;
 	}
-	rewriteLiteral(literal, shouldInclude) {
+	rewriteLiteral(literal) {
 		const candidates = splitCandidateTokens(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
-			if (!shouldInclude(candidate)) continue;
-			rewritten = rewritten.replace(candidate, this.ensureAlias(candidate));
+			if (!isRuntimeCandidate(candidate, this.runtimeSet)) continue;
+			rewritten = rewritten.replace(candidate, hasTopLevelVariant(candidate) ? replaceWxml(candidate) : this.ensureAlias(candidate));
 		}
 		return rewritten;
 	}
 	collectAndRewriteStaticClass(literal) {
-		return this.rewriteLiteral(literal, (candidate) => isRuntimeCandidate(candidate, this.runtimeSet));
+		return this.rewriteLiteral(literal);
 	}
 	collectRuntimeClasses(rawSource, options = {}) {
 		const wrapped = options.wrapExpression ? `${EXPRESSION_WRAPPER_PREFIX}${rawSource}${EXPRESSION_WRAPPER_SUFFIX}` : rawSource;
@@ -14669,7 +14711,7 @@ var UniAppXComponentLocalStyleCollector = class {
 				const classContext = options.wrapExpression || isClassContextLiteralPath(path);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-					if (isRuntimeCandidate(candidate, this.runtimeSet)) this.ensureAlias(candidate);
+					if (isRuntimeCandidate(candidate, this.runtimeSet) && !hasTopLevelVariant(candidate)) this.ensureAlias(candidate);
 				}
 			}
 		} catch {}

package/dist/{transform-COFRlmDF.js → transform-CcYptivi.js}

@@ -14618,6 +14618,48 @@ function isRuntimeCandidate(candidate, runtimeSet) {
 	if (!runtimeSet || runtimeSet.size === 0) return false;
 	return runtimeSet.has(candidate) || runtimeSet.has(require_wxml.replaceWxml(candidate));
 }
+function hasTopLevelVariant(candidate) {
+	let bracketDepth = 0;
+	let parenthesisDepth = 0;
+	let quote = "";
+	let escaped = false;
+	for (const char of candidate) {
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = "";
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "[") {
+			bracketDepth += 1;
+			continue;
+		}
+		if (char === "]") {
+			bracketDepth = Math.max(0, bracketDepth - 1);
+			continue;
+		}
+		if (char === "(") {
+			parenthesisDepth += 1;
+			continue;
+		}
+		if (char === ")") {
+			parenthesisDepth = Math.max(0, parenthesisDepth - 1);
+			continue;
+		}
+		if (char === ":" && bracketDepth === 0 && parenthesisDepth === 0) return true;
+	}
+	return false;
+}
 function shouldEnableComponentLocalStyle(id) {
 	return COMPONENT_RE.test(id);
 }
@@ -14640,18 +14682,18 @@ var UniAppXComponentLocalStyleCollector = class {
 		this.aliasByLookup.set(require_wxml.replaceWxml(utility), alias);
 		return alias;
 	}
-	rewriteLiteral(literal, shouldInclude) {
+	rewriteLiteral(literal) {
 		const candidates = (0, _tailwindcss_mangle_engine.splitCandidateTokens)(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
-			if (!shouldInclude(candidate)) continue;
-			rewritten = rewritten.replace(candidate, this.ensureAlias(candidate));
+			if (!isRuntimeCandidate(candidate, this.runtimeSet)) continue;
+			rewritten = rewritten.replace(candidate, hasTopLevelVariant(candidate) ? require_wxml.replaceWxml(candidate) : this.ensureAlias(candidate));
 		}
 		return rewritten;
 	}
 	collectAndRewriteStaticClass(literal) {
-		return this.rewriteLiteral(literal, (candidate) => isRuntimeCandidate(candidate, this.runtimeSet));
+		return this.rewriteLiteral(literal);
 	}
 	collectRuntimeClasses(rawSource, options = {}) {
 		const wrapped = options.wrapExpression ? `${EXPRESSION_WRAPPER_PREFIX}${rawSource}${EXPRESSION_WRAPPER_SUFFIX}` : rawSource;
@@ -14666,7 +14708,7 @@ var UniAppXComponentLocalStyleCollector = class {
 				const classContext = options.wrapExpression || require_wxml.isClassContextLiteralPath(path);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-					if (isRuntimeCandidate(candidate, this.runtimeSet)) this.ensureAlias(candidate);
+					if (isRuntimeCandidate(candidate, this.runtimeSet) && !hasTopLevelVariant(candidate)) this.ensureAlias(candidate);
 				}
 			}
 		} catch {}

package/dist/uni-app-x/component-local-style.d.ts

@@ -1,6 +1,7 @@
 interface RewriteCodeOptions {
     wrapExpression?: boolean;
 }
+export declare function hasTopLevelVariant(candidate: string): boolean;
 export declare function shouldEnableComponentLocalStyle(id: string): boolean;
 export declare function shouldEnablePageLocalStyle(id: string): boolean;
 export declare class UniAppXComponentLocalStyleCollector {

package/dist/uni-app-x/style-asset/style-value.d.ts

@@ -10,7 +10,7 @@ export declare function createUtsStyleArrayFromAppStyles(code: string, appSource
 export declare function cssSourceToStyleValue(source: string): StyleValue | undefined;
 export declare function mergeStyleValues(...items: Array<StyleValue | undefined>): StyleValue | undefined;
 export declare function createStyleValueFromApplySources(sources: string[], utilityStyles: StyleValue | undefined): StyleValue | undefined;
-export declare function collectUniAppXHarmonyApplyStyleSourcesFromSource(source: string): string[];
+export declare function collectUniAppXHarmonyApplyStyleSourcesFromSource(source: string, sourceId?: string): string[];
 export declare function collectUniAppXHarmonyApplyUtilitiesFromSources(sources: Iterable<string>): Set<string>;
 export declare function createMergedStyleValue(code: string, localStyle: StyleValue | undefined, appStyle: StyleValue): StyleValue | undefined;
 export {};