weapp-tailwindcss 5.5.0 → 5.5.2

package/dist/gulp.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_gulp = require("./gulp-Dtc01FdI.cjs");
+const require_gulp = require("./gulp-C1r36Y_f.cjs");
 exports.WeappTailwindcss = require_gulp.createPlugins;
 exports.createPlugins = require_gulp.createPlugins;
 exports.weappTailwindcss = require_gulp.createPlugins;

package/dist/gulp.js

@@ -1,2 +1,2 @@
-import { t as createPlugins } from "./gulp-CVUiPXPy.js";
+import { t as createPlugins } from "./gulp-qGXKwQMZ.js";
 export { createPlugins as WeappTailwindcss, createPlugins, createPlugins as weappTailwindcss };

package/dist/{hmr-timing-DNxQm-bN.js → hmr-timing-DixZjtTS.js}

@@ -1,7 +1,7 @@
-import { $ as hasTailwindRootDirectives, At as resolveTailwindV4CssSourceBase, B as removeUnsupportedMiniProgramAtRules, F as stripTailwindSourceMediaFragments, G as shouldFilterApplyOnlyGeneratedCss, H as removeTailwindV4GeneratedUserCssArtifacts, I as stripUnmatchedTailwindSourceMediaCloseFragments, J as splitUserCssLayerBlocks, K as extractGeneratedCssForUserLayerSelectors, L as finalizeMiniProgramCss$1, Lt as filterUnsupportedMiniProgramTailwindV4Candidates, M as isCommentOnlyCss, P as removeTailwindV4GeneratorAtRules, T as omitUndefined, Tt as isFileMatchedByTailwindSourceEntries, U as filterApplyOnlyGeneratedCss, W as normalizeEmptyTailwindCustomVariants, Y as preferScopedGeneratedCssRules, Z as hasTailwindApplyDirective, _t as stripTailwindBanners, a as resolveGeneratorRuntimeBranch, at as removeTailwindSourceDirectives, ct as VITE_MARKER_RE, d as resolveTailwindV4SourceFromRuntime, dt as hasTailwindGeneratedCssMarkers, et as hasTailwindSourceDirectives, ft as splitGeneratorPlaceholderCssBySourceOrder, gt as stripTailwindBanner, ht as stripGeneratorPlaceholderMarkers, i as normalizeWeappTailwindcssGeneratorOptions, it as parseImportRequest, j as transformGeneratorUserCss, jt as toPosixPath, kt as resolveSourceScanPath, lt as createCssAppend, mt as splitTailwindV4GeneratedCssBySourceOrder, nt as normalizeTailwindSourceDirectives, ot as resolveCssEntrySource, p as resolveTailwindV4SourceOptionsFromRuntime, pt as splitTailwindGeneratedCssByBanner, q as hasUserCssLayerBlocks, s as shouldUseMiniProgramCssBranch, st as GENERATOR_PLACEHOLDER_MARKER_RE, u as resolveTailwindV4Source$1, ut as hasTailwindGeneratedCss, vt as normalizeConfigDirective, wt as isFileExcludedByTailwindSourceEntries, xt as FULL_SOURCE_SCAN_EXTENSION_RE, yt as prependConfigDirective, zt as loadTailwindV4DesignSystem } from "./generator-DyXTBPmE.js";
+import { $ as hasTailwindRootDirectives, At as resolveTailwindV4CssSourceBase, B as removeUnsupportedMiniProgramAtRules, F as stripTailwindSourceMediaFragments, G as shouldFilterApplyOnlyGeneratedCss, H as removeTailwindV4GeneratedUserCssArtifacts, I as stripUnmatchedTailwindSourceMediaCloseFragments, J as splitUserCssLayerBlocks, K as extractGeneratedCssForUserLayerSelectors, L as finalizeMiniProgramCss$1, M as isCommentOnlyCss, Nt as parseCssImportSpecifier, P as removeTailwindV4GeneratorAtRules, Pt as quoteCssImportSpecifier, T as omitUndefined, Tt as isFileMatchedByTailwindSourceEntries, U as filterApplyOnlyGeneratedCss, Vt as loadTailwindV4DesignSystem, W as normalizeEmptyTailwindCustomVariants, Y as preferScopedGeneratedCssRules, Z as hasTailwindApplyDirective, _t as stripTailwindBanners, a as resolveGeneratorRuntimeBranch, at as removeTailwindSourceDirectives, ct as VITE_MARKER_RE, d as resolveTailwindV4SourceFromRuntime, dt as hasTailwindGeneratedCssMarkers, et as hasTailwindSourceDirectives, ft as splitGeneratorPlaceholderCssBySourceOrder, gt as stripTailwindBanner, ht as stripGeneratorPlaceholderMarkers, i as normalizeWeappTailwindcssGeneratorOptions, it as parseImportRequest, j as transformGeneratorUserCss, jt as toPosixPath, kt as resolveSourceScanPath, lt as createCssAppend, mt as splitTailwindV4GeneratedCssBySourceOrder, nt as normalizeTailwindSourceDirectives, ot as resolveCssEntrySource, p as resolveTailwindV4SourceOptionsFromRuntime, pt as splitTailwindGeneratedCssByBanner, q as hasUserCssLayerBlocks, s as shouldUseMiniProgramCssBranch, st as GENERATOR_PLACEHOLDER_MARKER_RE, u as resolveTailwindV4Source$1, ut as hasTailwindGeneratedCss, vt as normalizeConfigDirective, wt as isFileExcludedByTailwindSourceEntries, xt as FULL_SOURCE_SCAN_EXTENSION_RE, yt as prependConfigDirective, zt as filterUnsupportedMiniProgramTailwindV4Candidates } from "./generator-DxEsInLz.js";
 import { o as transformCssMacroCss, r as hasCssMacroTailwindV4InternalAtRules, t as hasCssMacroStyleOptions } from "./auto-2dg_uhEJ.js";
-import { _ as includesTailwindV4PreflightDirective, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as collectCssInlineSourceCandidates } from "./tailwindcss-BK9S7zuq.js";
-import { A as consumeCompilationScopeChanges, B as createGenerationArtifact, F as getCompilationSessionPool, G as replaceWxml, I as runCompilerOwnerActivity, J as traverse, K as createDebug, P as getTailwindGenerationSessionPool, R as mergeCompilationDependencyChanges, V as createAttributeMatcher, Y as md5Hash, k as composeGenerationArtifact, l as recordCompilerShadowReport, m as resolveStyleOptionsFromContext, o as completeCompilerShadowReportRun, q as babelParse, r as createStylePlatformAdapter, s as getCompilerShadowRunRevision, u as getFrameworkCompilerSession, z as createCssFragment } from "./compiler-B0YSc0DY.js";
+import { _ as includesTailwindV4PreflightDirective, h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled, v as collectCssInlineSourceCandidates } from "./tailwindcss-D2joPNdN.js";
+import { A as consumeCompilationScopeChanges, B as createGenerationArtifact, F as getCompilationSessionPool, G as replaceWxml, I as runCompilerOwnerActivity, J as traverse, K as createDebug, P as getTailwindGenerationSessionPool, R as mergeCompilationDependencyChanges, V as createAttributeMatcher, Y as md5Hash, k as composeGenerationArtifact, l as recordCompilerShadowReport, m as resolveStyleOptionsFromContext, o as completeCompilerShadowReportRun, q as babelParse, r as createStylePlatformAdapter, s as getCompilerShadowRunRevision, u as getFrameworkCompilerSession, z as createCssFragment } from "./compiler-tHMcW3BT.js";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -216,6 +216,7 @@ const TEMPLATE_SOURCE_CANDIDATE_EXTENSIONS = /* @__PURE__ */ new Set([
 	"ksml",
 	"ttml",
 	"qml",
+	"qxml",
 	"tyml",
 	"xhsml",
 	"swan",
@@ -461,11 +462,11 @@ function createSourceCandidateStore(options = {}) {
 		cssSourceById.set(normalizedId, source);
 		replaceCssLayer(normalizedId, await resolveCandidates(normalizedId, source, "css"));
 	}
-	async function syncModuleSource(id, source) {
+	async function syncModuleSource(id, source, sourceExtension) {
 		const normalizedId = cleanUrl(id);
 		if (moduleSourceById.get(normalizedId) !== source) revision++;
 		moduleSourceById.set(normalizedId, source);
-		const candidates = await resolveCandidates(normalizedId, source, resolveSourceCandidateExtension(normalizedId));
+		const candidates = await resolveCandidates(normalizedId, source, sourceExtension ?? resolveSourceCandidateExtension(normalizedId));
 		replaceModuleLayer(normalizedId, candidates);
 		return new Set(candidates);
 	}
@@ -1228,7 +1229,7 @@ function createRuntimeClassSetManager(options = {}) {
 			await reset();
 		}
 		runtimeSignature = nextSignature;
-		const nextBaseClassSet = options.baseClassSet;
+		const nextBaseClassSet = options.baseClassSet ? createNonSourceBaseClassSet(options.baseClassSet, candidateCountByClass) : void 0;
 		const canUseBaseWithoutInitialFullScan = Boolean(fullRebuild && !hadTrackedRuntimeFiles && options.skipInitialFullScanWithBase === true && nextBaseClassSet && nextBaseClassSet.size > 0);
 		for (const [file, previousCandidates] of candidatesByFile) {
 			if (!snapshot.removedFiles.has(file) && (currentRuntimeFiles.has(file) || snapshot.hasOmittedKnownFiles)) continue;
@@ -1906,6 +1907,209 @@ async function adaptGeneratedCssWithFrameworkRootPipeline(owner, generated, opti
 	});
 }
 //#endregion
+//#region src/bundlers/shared/generator-css/user-layer-order.ts
+const USER_LAYER_COMPONENTS_START = "/*! weapp-tailwindcss layer components start */";
+const USER_LAYER_COMPONENTS_END = "/*! weapp-tailwindcss layer components end */";
+function appendCss(base, extra) {
+	if (!base) return extra;
+	if (!extra) return base;
+	if (/\s$/.test(base) || /^\s/.test(extra)) return `${base}${extra}`;
+	return `${base}\n${extra}`;
+}
+function removeFirstCssOccurrence(css, chunk) {
+	const trimmed = chunk.trim();
+	if (!trimmed) return css;
+	const index = css.indexOf(trimmed);
+	if (index === -1) return css;
+	return appendCss(css.slice(0, index).trimEnd(), css.slice(index + trimmed.length).trimStart());
+}
+function collectSelectorsFromCss(css) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		postcss.parse(css).walkRules((rule) => {
+			for (const selector of rule.selectors ?? [rule.selector]) {
+				const normalized = selector.trim();
+				if (normalized) selectors.add(normalized);
+			}
+		});
+	} catch {}
+	return selectors;
+}
+function normalizeRuleValue(value) {
+	return value.replace(/\s+/g, " ").trim();
+}
+function createRuleKey(rule) {
+	const parents = [];
+	let parent = rule.parent;
+	while (parent && parent.type !== "root") {
+		if (parent.type === "atrule") parents.push(`${parent.name}:${normalizeRuleValue(parent.params)}`);
+		parent = parent.parent;
+	}
+	const selectors = (rule.selectors ?? [rule.selector]).map((selector) => normalizeRuleValue(selector)).join(",");
+	const declarations = (rule.nodes ?? []).filter((node) => node.type === "decl").map((node) => `${node.prop}:${normalizeRuleValue(node.value)}:${node.important ? "1" : "0"}`).join(";");
+	return `${parents.reverse().join("|")}\n${selectors}\n${declarations}`;
+}
+function collectRuleKeysFromCss(css) {
+	const keys = /* @__PURE__ */ new Set();
+	try {
+		postcss.parse(css).walkRules((rule) => {
+			keys.add(createRuleKey(rule));
+		});
+	} catch {}
+	return keys;
+}
+function matchesLayerSelector(selector, layerSelector) {
+	if (selector === layerSelector) return true;
+	if (!selector.startsWith(layerSelector)) return false;
+	const next = selector[layerSelector.length];
+	return next === ":" || next === "[";
+}
+function removeCssRulesForSelectors(css, layerCss) {
+	const selectors = [...collectSelectorsFromCss(layerCss)];
+	if (selectors.length === 0) return css;
+	try {
+		const root = postcss.parse(css);
+		root.walkRules((rule) => {
+			if ((rule.selectors ?? [rule.selector]).some((selector) => selectors.some((layerSelector) => matchesLayerSelector(selector.trim(), layerSelector)))) rule.remove();
+		});
+		return root.toString();
+	} catch {
+		return removeFirstCssOccurrence(css, layerCss);
+	}
+}
+function removeExactCssRules(css, duplicateCss) {
+	const duplicateKeys = collectRuleKeysFromCss(duplicateCss);
+	if (duplicateKeys.size === 0) return css;
+	try {
+		const root = postcss.parse(css);
+		root.walkRules((rule) => {
+			if (duplicateKeys.has(createRuleKey(rule))) rule.remove();
+		});
+		return root.toString();
+	} catch {
+		return css;
+	}
+}
+function wrapUserLayerComponentsCss(css) {
+	return css.trim().length > 0 ? `${USER_LAYER_COMPONENTS_START}\n${css}\n${USER_LAYER_COMPONENTS_END}` : css;
+}
+function extractMarkedUserLayerComponentsCss(css) {
+	const layers = [];
+	let rest = "";
+	let cursor = 0;
+	while (cursor < css.length) {
+		const startIndex = css.indexOf(USER_LAYER_COMPONENTS_START, cursor);
+		if (startIndex === -1) {
+			rest += css.slice(cursor);
+			break;
+		}
+		rest += css.slice(cursor, startIndex);
+		const contentStart = startIndex + 47;
+		const endIndex = css.indexOf(USER_LAYER_COMPONENTS_END, contentStart);
+		if (endIndex === -1) {
+			rest += css.slice(startIndex);
+			break;
+		}
+		const layerCss = css.slice(contentStart, endIndex).trim();
+		if (layerCss) layers.push(layerCss);
+		cursor = endIndex + 45;
+	}
+	return {
+		layers,
+		rest
+	};
+}
+function isGeneratedInfrastructureRule(rule) {
+	const declarations = (rule.nodes ?? []).filter((node) => node.type === "decl");
+	if (declarations.length === 0) return false;
+	if (declarations.every((declaration) => declaration.prop.startsWith("--"))) return true;
+	const selectors = (rule.selectors ?? [rule.selector]).map((selector) => selector.trim());
+	if (!(selectors.length > 0 && selectors.every((selector) => selector === "view" || selector === "text" || selector === "::before" || selector === "::after"))) return false;
+	const declarationMap = new Map(declarations.map((declaration) => [declaration.prop, declaration.value]));
+	return declarationMap.get("box-sizing") === "border-box" && declarationMap.has("border");
+}
+function findLayerInsertionIndex(css) {
+	try {
+		const root = postcss.parse(css);
+		let insertionIndex = -1;
+		root.walkRules((rule) => {
+			if (insertionIndex !== -1 || isGeneratedInfrastructureRule(rule)) return;
+			let topLevelNode = rule;
+			while (topLevelNode.parent && topLevelNode.parent.type !== "root") topLevelNode = topLevelNode.parent;
+			const offset = topLevelNode.source?.start?.offset;
+			if (typeof offset === "number") insertionIndex = css.lastIndexOf("\n", Math.max(0, offset - 1)) + 1;
+		});
+		return insertionIndex;
+	} catch {
+		return -1;
+	}
+}
+function reorderMarkedUserLayerComponentsCss(css) {
+	if (!css.includes(USER_LAYER_COMPONENTS_START)) return css;
+	const { layers, rest } = extractMarkedUserLayerComponentsCss(css);
+	if (layers.length === 0) return rest;
+	const layerCss = layers.join("\n");
+	const restWithoutLayerDuplicates = removeExactCssRules(rest, layerCss);
+	const insertionIndex = findLayerInsertionIndex(restWithoutLayerDuplicates);
+	if (insertionIndex === -1) return appendCss(restWithoutLayerDuplicates, layerCss);
+	return appendCss(appendCss(restWithoutLayerDuplicates.slice(0, insertionIndex), layerCss), restWithoutLayerDuplicates.slice(insertionIndex));
+}
+function mergeMarkedUserLayerComponentsCss(baseCss, markedCss) {
+	if (!markedCss.includes(USER_LAYER_COMPONENTS_START)) return {
+		css: baseCss,
+		merged: false
+	};
+	const { layers } = extractMarkedUserLayerComponentsCss(markedCss);
+	if (layers.length === 0) return {
+		css: baseCss,
+		merged: false
+	};
+	const layerCss = layers.join("\n");
+	return {
+		css: reorderMarkedUserLayerComponentsCss(appendCss(removeCssRulesForSelectors(baseCss, layerCss), wrapUserLayerComponentsCss(layerCss))),
+		merged: true
+	};
+}
+//#endregion
+//#region src/bundlers/shared/framework-user-css.ts
+function normalizeUserSource(source) {
+	try {
+		const root = postcss.parse(source);
+		root.walkAtRules("media", (rule) => {
+			if (/^source\(/.test(rule.params)) rule.replaceWith(...rule.nodes ?? []);
+		});
+		return root.toString();
+	} catch {
+		return stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source));
+	}
+}
+async function restoreFrameworkProcessedUserCss(css, generated, source, options, generatorOptions) {
+	const userCssOptions = {
+		generatorTarget: generated.target,
+		generatorStyleOptions: resolveGeneratorStyleOptions(options.opts, options.cssHandlerOptions, generatorOptions.styleOptions),
+		cssUserHandlerOptions: options.cssUserHandlerOptions,
+		styleHandler: options.styleHandler,
+		importFallback: generatorOptions.importFallback
+	};
+	const transform = async (value) => {
+		const parts = splitUserCssLayerBlocks(value);
+		const layer = await transformGeneratorUserCss(parts.layer, userCssOptions);
+		const rest = await transformGeneratorUserCss(parts.rest, userCssOptions);
+		return removeTailwindV4GeneratedUserCssArtifacts(finalizeMiniProgramGeneratorCss(createCssSourceOrderAppend(wrapUserLayerComponentsCss(layer), rest), generated.target, options.runtimeState.tailwindRuntime.majorVersion, options.opts.cssPreflight, {
+			injectPreflight: false,
+			preservePreflight: generated.metadata?.preflightMode?.preserve,
+			styleOptions: options.cssHandlerOptions
+		}));
+	};
+	const userSource = normalizeUserSource(source);
+	const ordered = splitRawSourceByGeneratedCssOrder(userSource, generated.metadata?.rawCss ?? "") ?? {
+		before: "",
+		after: userSource
+	};
+	const withBefore = createCssSourceOrderAppend(filterExistingCssRules(css, await transform(ordered.before)), css);
+	return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(withBefore, filterExistingCssRules(withBefore, await transform(ordered.after))));
+}
+//#endregion
 //#region src/bundlers/shared/generator-css/legacy-selectors.ts
 const CLASS_SELECTOR_RE = /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i;
 const MINI_PROGRAM_THEME_SCOPE_SELECTORS = /* @__PURE__ */ new Set([
@@ -3409,10 +3613,20 @@ function normalizeMiniProgramOutputImportRequest(request) {
 	if (request.startsWith(".") || request.startsWith("/") || /^(?:[a-z][a-z\d+.-]*:|#)/i.test(request)) return request;
 	return `./${request}`;
 }
-function normalizeMiniProgramImportShell(css) {
-	return css.replace(MINI_PROGRAM_OUTPUT_IMPORT_RE, (_match, prefix, quote, request, suffix) => {
+function normalizeMiniProgramImportShell(css, output) {
+	const normalized = output?.cssOnly ? css : css.replace(MINI_PROGRAM_OUTPUT_IMPORT_RE, (_match, prefix, quote, request, suffix) => {
 		return `${prefix}${quote}${normalizeMiniProgramOutputImportRequest(request)}${quote}${suffix}`;
 	});
+	if (!output || !normalized.includes("@import")) return normalized;
+	const files = new Set([...output.outputFiles].map(normalizeOutputPath));
+	const root = postcss.parse(normalized);
+	root.walkAtRules("import", (rule) => {
+		const parsed = parseCssImportSpecifier(rule.params);
+		if (!parsed || output.cssOnly && !/\.css(?:$|[?#])/i.test(parsed.specifier) || !files.has(resolveOutputImportRequest(output.outputFile, parsed.specifier))) return;
+		const request = normalizeMiniProgramOutputImportRequest(parsed.specifier);
+		if (request !== parsed.specifier) rule.params = rule.params.replace(parsed.raw, quoteCssImportSpecifier(request, parsed.quote));
+	});
+	return root.toString();
 }
 function normalizeOutputPath(file) {
 	const segments = [];
@@ -3445,9 +3659,9 @@ function isMiniProgramOutputImport(node) {
 	return request !== void 0 && MINI_PROGRAM_OUTPUT_STYLE_RE.test(request);
 }
 function isSelfMiniProgramOutputImport(outputFile, node) {
-	if (!isMiniProgramOutputImport(node) || node.type !== "atrule") return false;
-	const request = parseImportRequest(node.params);
-	return request !== void 0 && resolveOutputImportRequest(outputFile, request) === normalizeOutputPath(outputFile);
+	if (node.type !== "atrule" || node.name !== "import") return false;
+	const request = parseCssImportSpecifier(node.params)?.specifier;
+	return request !== void 0 && /\.(?:css|wxss|acss|ttss|qss|jxss|tyss)(?:$|[?#])/i.test(request) && resolveOutputImportRequest(outputFile, request) === normalizeOutputPath(outputFile);
 }
 function removeMiniProgramOutputImportsBy(css, predicate) {
 	if (!css.includes("@import")) return css;
@@ -3471,8 +3685,11 @@ function removeSelfMiniProgramOutputImports(css, outputFile) {
 function removeMiniProgramOutputImports(css) {
 	return removeMiniProgramOutputImportsBy(css, isMiniProgramOutputImport);
 }
-function normalizeMiniProgramGeneratorCssSource(css, outputFile) {
-	const normalized = normalizeMiniProgramImportShell(css);
+function normalizeMiniProgramGeneratorCssSource(css, outputFile, outputFiles) {
+	const normalized = normalizeMiniProgramImportShell(css, outputFile && outputFiles ? {
+		outputFile,
+		outputFiles
+	} : void 0);
 	if (outputFile) return removeSelfMiniProgramOutputImports(normalized, outputFile);
 	return isPureLocalCssImportWrapper(normalized) ? normalized : removeMiniProgramOutputImports(normalized);
 }
@@ -3582,170 +3799,6 @@ function finalizeIncrementalGeneratorCss(previousCss, incrementalCss, target, ma
 	return createCssAppend(previousCss, finalizedIncrementalCss);
 }
 //#endregion
-//#region src/bundlers/shared/generator-css/user-layer-order.ts
-const USER_LAYER_COMPONENTS_START = "/*! weapp-tailwindcss layer components start */";
-const USER_LAYER_COMPONENTS_END = "/*! weapp-tailwindcss layer components end */";
-function appendCss(base, extra) {
-	if (!base) return extra;
-	if (!extra) return base;
-	if (/\s$/.test(base) || /^\s/.test(extra)) return `${base}${extra}`;
-	return `${base}\n${extra}`;
-}
-function removeFirstCssOccurrence(css, chunk) {
-	const trimmed = chunk.trim();
-	if (!trimmed) return css;
-	const index = css.indexOf(trimmed);
-	if (index === -1) return css;
-	return appendCss(css.slice(0, index).trimEnd(), css.slice(index + trimmed.length).trimStart());
-}
-function collectSelectorsFromCss(css) {
-	const selectors = /* @__PURE__ */ new Set();
-	try {
-		postcss.parse(css).walkRules((rule) => {
-			for (const selector of rule.selectors ?? [rule.selector]) {
-				const normalized = selector.trim();
-				if (normalized) selectors.add(normalized);
-			}
-		});
-	} catch {}
-	return selectors;
-}
-function normalizeRuleValue(value) {
-	return value.replace(/\s+/g, " ").trim();
-}
-function createRuleKey(rule) {
-	const parents = [];
-	let parent = rule.parent;
-	while (parent && parent.type !== "root") {
-		if (parent.type === "atrule") parents.push(`${parent.name}:${normalizeRuleValue(parent.params)}`);
-		parent = parent.parent;
-	}
-	const selectors = (rule.selectors ?? [rule.selector]).map((selector) => normalizeRuleValue(selector)).join(",");
-	const declarations = (rule.nodes ?? []).filter((node) => node.type === "decl").map((node) => `${node.prop}:${normalizeRuleValue(node.value)}:${node.important ? "1" : "0"}`).join(";");
-	return `${parents.reverse().join("|")}\n${selectors}\n${declarations}`;
-}
-function collectRuleKeysFromCss(css) {
-	const keys = /* @__PURE__ */ new Set();
-	try {
-		postcss.parse(css).walkRules((rule) => {
-			keys.add(createRuleKey(rule));
-		});
-	} catch {}
-	return keys;
-}
-function matchesLayerSelector(selector, layerSelector) {
-	if (selector === layerSelector) return true;
-	if (!selector.startsWith(layerSelector)) return false;
-	const next = selector[layerSelector.length];
-	return next === ":" || next === "[";
-}
-function removeCssRulesForSelectors(css, layerCss) {
-	const selectors = [...collectSelectorsFromCss(layerCss)];
-	if (selectors.length === 0) return css;
-	try {
-		const root = postcss.parse(css);
-		root.walkRules((rule) => {
-			if ((rule.selectors ?? [rule.selector]).some((selector) => selectors.some((layerSelector) => matchesLayerSelector(selector.trim(), layerSelector)))) rule.remove();
-		});
-		return root.toString();
-	} catch {
-		return removeFirstCssOccurrence(css, layerCss);
-	}
-}
-function removeExactCssRules(css, duplicateCss) {
-	const duplicateKeys = collectRuleKeysFromCss(duplicateCss);
-	if (duplicateKeys.size === 0) return css;
-	try {
-		const root = postcss.parse(css);
-		root.walkRules((rule) => {
-			if (duplicateKeys.has(createRuleKey(rule))) rule.remove();
-		});
-		return root.toString();
-	} catch {
-		return css;
-	}
-}
-function wrapUserLayerComponentsCss(css) {
-	return css.trim().length > 0 ? `${USER_LAYER_COMPONENTS_START}\n${css}\n${USER_LAYER_COMPONENTS_END}` : css;
-}
-function extractMarkedUserLayerComponentsCss(css) {
-	const layers = [];
-	let rest = "";
-	let cursor = 0;
-	while (cursor < css.length) {
-		const startIndex = css.indexOf(USER_LAYER_COMPONENTS_START, cursor);
-		if (startIndex === -1) {
-			rest += css.slice(cursor);
-			break;
-		}
-		rest += css.slice(cursor, startIndex);
-		const contentStart = startIndex + 47;
-		const endIndex = css.indexOf(USER_LAYER_COMPONENTS_END, contentStart);
-		if (endIndex === -1) {
-			rest += css.slice(startIndex);
-			break;
-		}
-		const layerCss = css.slice(contentStart, endIndex).trim();
-		if (layerCss) layers.push(layerCss);
-		cursor = endIndex + 45;
-	}
-	return {
-		layers,
-		rest
-	};
-}
-function isGeneratedInfrastructureRule(rule) {
-	const declarations = (rule.nodes ?? []).filter((node) => node.type === "decl");
-	if (declarations.length === 0) return false;
-	if (declarations.every((declaration) => declaration.prop.startsWith("--"))) return true;
-	const selectors = (rule.selectors ?? [rule.selector]).map((selector) => selector.trim());
-	if (!(selectors.length > 0 && selectors.every((selector) => selector === "view" || selector === "text" || selector === "::before" || selector === "::after"))) return false;
-	const declarationMap = new Map(declarations.map((declaration) => [declaration.prop, declaration.value]));
-	return declarationMap.get("box-sizing") === "border-box" && declarationMap.has("border");
-}
-function findLayerInsertionIndex(css) {
-	try {
-		const root = postcss.parse(css);
-		let insertionIndex = -1;
-		root.walkRules((rule) => {
-			if (insertionIndex !== -1 || isGeneratedInfrastructureRule(rule)) return;
-			let topLevelNode = rule;
-			while (topLevelNode.parent && topLevelNode.parent.type !== "root") topLevelNode = topLevelNode.parent;
-			const offset = topLevelNode.source?.start?.offset;
-			if (typeof offset === "number") insertionIndex = css.lastIndexOf("\n", Math.max(0, offset - 1)) + 1;
-		});
-		return insertionIndex;
-	} catch {
-		return -1;
-	}
-}
-function reorderMarkedUserLayerComponentsCss(css) {
-	if (!css.includes(USER_LAYER_COMPONENTS_START)) return css;
-	const { layers, rest } = extractMarkedUserLayerComponentsCss(css);
-	if (layers.length === 0) return rest;
-	const layerCss = layers.join("\n");
-	const restWithoutLayerDuplicates = removeExactCssRules(rest, layerCss);
-	const insertionIndex = findLayerInsertionIndex(restWithoutLayerDuplicates);
-	if (insertionIndex === -1) return appendCss(restWithoutLayerDuplicates, layerCss);
-	return appendCss(appendCss(restWithoutLayerDuplicates.slice(0, insertionIndex), layerCss), restWithoutLayerDuplicates.slice(insertionIndex));
-}
-function mergeMarkedUserLayerComponentsCss(baseCss, markedCss) {
-	if (!markedCss.includes(USER_LAYER_COMPONENTS_START)) return {
-		css: baseCss,
-		merged: false
-	};
-	const { layers } = extractMarkedUserLayerComponentsCss(markedCss);
-	if (layers.length === 0) return {
-		css: baseCss,
-		merged: false
-	};
-	const layerCss = layers.join("\n");
-	return {
-		css: reorderMarkedUserLayerComponentsCss(appendCss(removeCssRulesForSelectors(baseCss, layerCss), wrapUserLayerComponentsCss(layerCss))),
-		merged: true
-	};
-}
-//#endregion
 //#region src/bundlers/shared/generator-css/pipeline/deferred-output.ts
 async function finalizeDeferredGeneratorCss(context) {
 	const { cssUserHandlerOptions, file, filterGeneratedApplyOnlyCss, generated, generatedUserCssRawSource, generatorOptions, generatorRawSource, generatorStyleOptions, hasMatchedCssSourceFile, localImports, majorVersion, options, opts, preflightMode, runtimeWithCurrentCss, styleHandler, userCssOrderSource, userRawSourceProcessed } = context;
@@ -4533,12 +4586,16 @@ async function generateTailwindV4CssWithImplementation(options, implementation)
 		uniAppX: options.opts.uniAppX
 	});
 	const shouldReplayFrameworkPostcss = options.cssStage === "framework-processed" && hasFrameworkPostcssOptions(frameworkPostcssOwner) && normalizedGeneratorOptions.target === "weapp";
+	const generationInput = !shouldReplayFrameworkPostcss && options.frameworkProcessedUserCss ? {
+		...options,
+		userRawSource: [options.userRawSource, options.frameworkProcessedUserCss].filter(Boolean).join("\n")
+	} : options;
 	const scope = options.scope ?? {
 		id: options.outputFile ?? options.file,
 		kind: options.cssHandlerOptions.isMainChunk ? "global" : "component"
 	};
 	const generated = await generateCssByGenerator(shouldReplayFrameworkPostcss ? {
-		...options,
+		...generationInput,
 		compilation: implementation.frameworkAdapter === "graph" ? {
 			enabled: true,
 			preserveDeletedCss: normalizedGeneratorOptions.hmr?.preserveDeletedCss ?? true,
@@ -4547,7 +4604,7 @@ async function generateTailwindV4CssWithImplementation(options, implementation)
 		} : void 0,
 		deferCssAdaptation: true
 	} : {
-		...options,
+		...generationInput,
 		compilation: implementation.frameworkAdapter === "graph" ? {
 			enabled: true,
 			preserveDeletedCss: normalizedGeneratorOptions.hmr?.preserveDeletedCss ?? true,
@@ -4567,13 +4624,18 @@ async function generateTailwindV4CssWithImplementation(options, implementation)
 			snapshot: generated.snapshot
 		} : {}
 	}) : generated.css;
-	const css = isVueScopedStyleRequest(resolvePostcssRequestOption(options.cssHandlerOptions)) ? preferScopedGeneratedCssRules(adaptedCss) : adaptedCss;
-	const artifact = implementation.emitArtifact ? createCoreArtifact(generated, css, options) : void 0;
+	const composedCss = shouldReplayFrameworkPostcss && options.frameworkProcessedUserCss ? await restoreFrameworkProcessedUserCss(adaptedCss, generated, options.frameworkProcessedUserCss, options, normalizedGeneratorOptions) : adaptedCss;
+	const css = isVueScopedStyleRequest(resolvePostcssRequestOption(options.cssHandlerOptions)) ? preferScopedGeneratedCssRules(composedCss) : composedCss;
+	const classSet = options.frameworkProcessedUserCss ? resolveGeneratedCssClassSet(generated.target, generated.classSet, options.runtime, css, options.opts.escapeMap, options.previousClassSet) : generated.classSet;
+	const artifact = implementation.emitArtifact ? createCoreArtifact({
+		...generated,
+		classSet
+	}, css, options) : void 0;
 	return {
 		...generated,
 		...artifact ? { artifact } : {},
 		css,
-		classSet: generated.classSet,
+		classSet,
 		dependencies: generated.dependencies,
 		metadata: {
 			file: options.file,
@@ -4691,4 +4753,4 @@ function createHmrTimingRecorder(bundler) {
 	};
 }
 //#endregion
-export { createCssSourceTraceCacheSignature as A, createSourceCandidateCollector as B, isSourceStyleRequest as C, parseBundlerGeneratedCssMarkerBlocks as D, hasBundlerGeneratedCssMarker as E, createEscapeFragments as F, resolveSourceCandidateScanFiles as G, isSourceCandidateRequest as H, isPureLocalCssImportWrapper as I, rewriteLocalCssImportRequestsForOutput as L, isCssSourceTraceEnabled as M, createRuntimeClassSetManager as N, stripBundlerGeneratedCssMarkers as O, collectStrictEscapedRuntimeCandidates as P, splitLocalCssImports as R, isSourcePreprocessorRequest as S, createBundlerGeneratedCssMarker as T, extractCandidatesFromSource as U, createSourceCandidateStore as V, createSourceCandidateEligibilityMatcher as W, captureResolvedFrameworkPostcssOptions as _, extractMarkedUserLayerComponentsCss as a, finalizeMiniProgramGeneratorCss as b, collectRawSourceClassSelectors as c, runWithConcurrency as d, normalizeMiniProgramGeneratorCssSource as f, captureFrameworkPostcssOptions as g, removeGeneratedSelectorCompatCss as h, validateCandidatesByGenerator as i, createCssTokenSourceMap as j, annotateCssSourceTrace as k, pushConcurrentTaskFactories as l, scoreTailwindV4CssSourceFileMatch as m, emitHmrTiming as n, mergeMarkedUserLayerComponentsCss as o, normalizeMiniProgramImportShell as p, generateTailwindV4Css as r, collectGeneratedRawSourceCandidatesFromCss as s, createHmrTimingRecorder as t, resolveTaskConcurrency as u, collectFrameworkPostcssOptionsFromLoaderEntries as v, stripRequestQuery as w, hasMiniProgramTailwindV4PreflightReset as x, createCssSourceOrderAppend as y, finalizeCompilerShadowRun as z };
+export { createCssSourceTraceCacheSignature as A, createSourceCandidateCollector as B, isSourceStyleRequest as C, parseBundlerGeneratedCssMarkerBlocks as D, hasBundlerGeneratedCssMarker as E, createEscapeFragments as F, resolveSourceCandidateScanFiles as G, isSourceCandidateRequest as H, isPureLocalCssImportWrapper as I, rewriteLocalCssImportRequestsForOutput as L, isCssSourceTraceEnabled as M, createRuntimeClassSetManager as N, stripBundlerGeneratedCssMarkers as O, collectStrictEscapedRuntimeCandidates as P, splitLocalCssImports as R, isSourcePreprocessorRequest as S, createBundlerGeneratedCssMarker as T, extractCandidatesFromSource as U, createSourceCandidateStore as V, createSourceCandidateEligibilityMatcher as W, captureResolvedFrameworkPostcssOptions as _, collectGeneratedRawSourceCandidatesFromCss as a, finalizeMiniProgramGeneratorCss as b, resolveTaskConcurrency as c, normalizeMiniProgramImportShell as d, scoreTailwindV4CssSourceFileMatch as f, captureFrameworkPostcssOptions as g, mergeMarkedUserLayerComponentsCss as h, validateCandidatesByGenerator as i, createCssTokenSourceMap as j, annotateCssSourceTrace as k, runWithConcurrency as l, extractMarkedUserLayerComponentsCss as m, emitHmrTiming as n, collectRawSourceClassSelectors as o, removeGeneratedSelectorCompatCss as p, generateTailwindV4Css as r, pushConcurrentTaskFactories as s, createHmrTimingRecorder as t, normalizeMiniProgramGeneratorCssSource as u, collectFrameworkPostcssOptionsFromLoaderEntries as v, stripRequestQuery as w, hasMiniProgramTailwindV4PreflightReset as x, createCssSourceOrderAppend as y, finalizeCompilerShadowRun as z };

package/dist/{hmr-timing-3SdRVfZx.cjs → hmr-timing-DuIbach8.cjs}

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
-const require_generator = require("./generator-DsrQ9txU.cjs");
-const require_tailwindcss = require("./tailwindcss-C-jBBQfw.cjs");
-const require_v4_generation_core = require("./v4-generation-core-DuIVZvRz.cjs");
-const require_compiler = require("./compiler-SwMb3lOX.cjs");
+const require_generator = require("./generator-CCw17l0G.cjs");
+const require_tailwindcss = require("./tailwindcss-DhaLV5a2.cjs");
+const require_v4_generation_core = require("./v4-generation-core-bOm8k4AY.cjs");
+const require_compiler = require("./compiler-BSMSbVVt.cjs");
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
@@ -177,7 +177,7 @@ function createRuntimeClassSetManager(options = {}) {
 			await reset();
 		}
 		runtimeSignature = nextSignature;
-		const nextBaseClassSet = options.baseClassSet;
+		const nextBaseClassSet = options.baseClassSet ? createNonSourceBaseClassSet(options.baseClassSet, candidateCountByClass) : void 0;
 		const canUseBaseWithoutInitialFullScan = Boolean(fullRebuild && !hadTrackedRuntimeFiles && options.skipInitialFullScanWithBase === true && nextBaseClassSet && nextBaseClassSet.size > 0);
 		for (const [file, previousCandidates] of candidatesByFile) {
 			if (!snapshot.removedFiles.has(file) && (currentRuntimeFiles.has(file) || snapshot.hasOmittedKnownFiles)) continue;

package/dist/index.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-DsrQ9txU.cjs");
-const require_gulp = require("./gulp-Dtc01FdI.cjs");
+const require_generator = require("./generator-CCw17l0G.cjs");
+const require_gulp = require("./gulp-C1r36Y_f.cjs");
 const require_postcss = require("./postcss.cjs");
-const require_vite = require("./vite-CJbO-7AQ.cjs");
-const require_webpack = require("./webpack-BWknqSDV.cjs");
+const require_vite = require("./vite-bJZi1V-l.cjs");
+const require_webpack = require("./webpack-CsBe1G_1.cjs");
 require("./webpack.cjs");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;

package/dist/index.js

@@ -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.js";
-import { t as createWeappTailwindcssGenerator } from "./generator-DyXTBPmE.js";
-import { t as createPlugins } from "./gulp-CVUiPXPy.js";
+import { t as createWeappTailwindcssGenerator } from "./generator-DxEsInLz.js";
+import { t as createPlugins } from "./gulp-qGXKwQMZ.js";
 import weappTailwindcssPostcssPlugin from "./postcss.js";
-import { t as WeappTailwindcss } from "./vite-0PsttwuR.js";
-import { n as weappTailwindcssPackageDir } from "./webpack-DVtKeBq1.js";
+import { t as WeappTailwindcss } from "./vite-C_JJxZWl.js";
+import { n as weappTailwindcssPackageDir } from "./webpack-BDOQUv3J.js";
 import "./webpack.js";
 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/{pipeline-helpers-DVrgv1HS.cjs → pipeline-helpers-CUwwOFt3.cjs}

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
-const require_generator = require("./generator-DsrQ9txU.cjs");
-const require_v4_generation_core = require("./v4-generation-core-DuIVZvRz.cjs");
-const require_compiler = require("./compiler-SwMb3lOX.cjs");
-const require_defaults = require("./defaults-BI9j1znS.cjs");
-const require_final_css_cleanup = require("./final-css-cleanup-BMlUDzik.cjs");
+const require_generator = require("./generator-CCw17l0G.cjs");
+const require_v4_generation_core = require("./v4-generation-core-bOm8k4AY.cjs");
+const require_compiler = require("./compiler-BSMSbVVt.cjs");
+const require_defaults = require("./defaults-CiGsr8Xq.cjs");
+const require_final_css_cleanup = require("./final-css-cleanup-DSjczga3.cjs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
 let node_process = require("node:process");

package/dist/postcss.cjs

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

package/dist/postcss.js

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

package/dist/presets.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-DsrQ9txU.cjs");
-const require_tailwindcss = require("./tailwindcss-C-jBBQfw.cjs");
+const require_generator = require("./generator-CCw17l0G.cjs");
+const require_tailwindcss = require("./tailwindcss-DhaLV5a2.cjs");
 require("./utils-CuKLf1Zv.cjs");
 require("./logger-TlKT3xmR.cjs");
 let node_path = require("node:path");