weapp-tailwindcss 5.0.5 → 5.0.6

package/dist/{bundle-state-Cso_ceUo.js → bundle-state-CFgzVHFP.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_precheck = require("./precheck-b8Y8qZg0.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
 let node_module = require("node:module");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/{bundle-state-DEyxCR4f.mjs → bundle-state-CdNXQl-o.mjs}

@@ -1,4 +1,4 @@
-import { h as traverse, m as babelParse, o as Parser } from "./precheck-Bsn_LMmo.mjs";
+import { h as traverse, m as babelParse, o as Parser } from "./precheck-Copn2SqE.mjs";
 import { createRequire } from "node:module";
 import process from "node:process";
 import path from "node:path";

package/dist/core.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_precheck = require("./precheck-b8Y8qZg0.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });

package/dist/core.mjs

@@ -1,4 +1,4 @@
-import { n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Bsn_LMmo.mjs";
+import { n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Copn2SqE.mjs";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });

package/dist/{generator-DVWLNO0n.mjs → generator-Bgn4m8An.mjs}

@@ -1,4 +1,4 @@
-import { K as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-Cczrkzqt.mjs";
+import { K as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-Ji6AXPh2.mjs";
 import process from "node:process";
 //#region src/generator/options.ts
 const explicitGeneratorTargetEnvKeys = ["WEAPP_TW_TARGET", "WEAPP_TAILWINDCSS_TARGET"];

package/dist/{generator-AD-eX8Tr.js → generator-C56PJYxA.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 //#region src/generator/options.ts

package/dist/generator.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
-const require_generator = require("./generator-AD-eX8Tr.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_generator = require("./generator-C56PJYxA.js");
 let tailwindcss_patch = require("tailwindcss-patch");
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
 exports.createWeappTailwindcssGeneratorFromPatcher = require_generator.createWeappTailwindcssGeneratorFromPatcher;

package/dist/generator.mjs

@@ -1,3 +1,3 @@
-import { J as transformTailwindV4CssToWeapp, S as resolveTailwindV4SourceOptionsFromPatcher, a as transformTailwindV3CssByTarget, b as resolveTailwindV4SourceFromPatchOptions, n as resolveTailwindV3SourceFromPatcher, o as transformTailwindV3CssToWeapp, q as transformTailwindV4CssByTarget, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source } from "./v3-engine-Cczrkzqt.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-DVWLNO0n.mjs";
+import { J as transformTailwindV4CssToWeapp, S as resolveTailwindV4SourceOptionsFromPatcher, a as transformTailwindV3CssByTarget, b as resolveTailwindV4SourceFromPatchOptions, n as resolveTailwindV3SourceFromPatcher, o as transformTailwindV3CssToWeapp, q as transformTailwindV4CssByTarget, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-Bgn4m8An.mjs";
 export { createWeappTailwindcssGenerator, createWeappTailwindcssGeneratorFromPatcher, normalizeWeappTailwindcssGeneratorOptions, resolveTailwindSourceFromPatcher, resolveTailwindV3Source, resolveTailwindV3SourceFromPatcher, resolveTailwindV3SourceOptionsFromPatcher, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveTailwindV4SourceFromPatcher, resolveTailwindV4SourceOptionsFromPatcher, transformTailwindV3CssByTarget, transformTailwindV3CssToWeapp, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp };

package/dist/gulp.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
-const require_precheck = require("./precheck-b8Y8qZg0.js");
-const require_tailwindcss = require("./tailwindcss-CpQ6X4l6.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-vOetpdWs.js");
-const require_source_candidates = require("./source-candidates-o2ZrKWzu.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-Bmzdjlk0.js");
+const require_source_candidates = require("./source-candidates-Caf2GDvx.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_process = require("node:process");

package/dist/gulp.mjs

@@ -1,8 +1,8 @@
-import { D as normalizeTailwindConfigDirectives, T as hasTailwindRootDirectives, _ as resolveViteSourceScanEntries, k as normalizeTailwindSourceForGenerator, l as getRuntimeClassSetSignature, lt as createDebug } from "./v3-engine-Cczrkzqt.mjs";
-import { n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Bsn_LMmo.mjs";
-import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-AWaPVF2B.mjs";
-import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-xf49kky6.mjs";
-import { n as createTailwindV3DefaultExtractor, t as createSourceCandidateCollector } from "./source-candidates-BsWYoIPN.mjs";
+import { D as normalizeTailwindConfigDirectives, T as hasTailwindRootDirectives, _ as resolveViteSourceScanEntries, k as normalizeTailwindSourceForGenerator, l as getRuntimeClassSetSignature, lt as createDebug } from "./v3-engine-Ji6AXPh2.mjs";
+import { n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Copn2SqE.mjs";
+import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-C0Zgo3Es.mjs";
+import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BEYHQkZc.mjs";
+import { n as createTailwindV3DefaultExtractor, t as createSourceCandidateCollector } from "./source-candidates-BODCmzz5.mjs";
 import fs from "node:fs";
 import process from "node:process";
 import path from "node:path";

package/dist/{incremental-runtime-class-set-xf49kky6.mjs → incremental-runtime-class-set-BEYHQkZc.mjs}

@@ -1,7 +1,7 @@
-import { A as normalizeTailwindV3CssEntrySource, B as splitTailwindV4GeneratedCssBySourceOrder, E as hasTailwindSourceDirectives, F as createCssAppend, G as prependConfigDirective, H as stripTailwindBanner, I as hasTailwindGeneratedCss, L as hasTailwindGeneratedCssMarkers, M as removeTailwindSourceDirectives, N as resolveCssEntrySource, O as normalizeTailwindSourceDirectives, P as VITE_MARKER_RE, R as splitGeneratorPlaceholderCssBySourceOrder, S as resolveTailwindV4SourceOptionsFromPatcher, T as hasTailwindRootDirectives, U as stripTailwindBanners, V as stripGeneratorPlaceholderMarkers, W as normalizeConfigDirective, X as loadTailwindV4DesignSystem, Y as filterUnsupportedMiniProgramTailwindV4Candidates, gt as omitUndefined, h as resolveTailwindV4EntriesFromCss, j as parseImportRequest, l as getRuntimeClassSetSignature, lt as createDebug, n as resolveTailwindV3SourceFromPatcher, r as resolveTailwindV3SourceOptionsFromPatcher, rt as normalizeLegacyContentEntries, st as resolveTailwindV4CssSourceBase, t as resolveTailwindV3Source, w as hasTailwindApplyDirective, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1, z as splitTailwindGeneratedCssByBanner } from "./v3-engine-Cczrkzqt.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DVWLNO0n.mjs";
-import { p as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-Bsn_LMmo.mjs";
-import { r as isUniAppXEnabled } from "./tailwindcss-AWaPVF2B.mjs";
+import { A as normalizeTailwindV3CssEntrySource, B as splitTailwindV4GeneratedCssBySourceOrder, E as hasTailwindSourceDirectives, F as createCssAppend, G as prependConfigDirective, H as stripTailwindBanner, I as hasTailwindGeneratedCss, L as hasTailwindGeneratedCssMarkers, M as removeTailwindSourceDirectives, N as resolveCssEntrySource, O as normalizeTailwindSourceDirectives, P as VITE_MARKER_RE, R as splitGeneratorPlaceholderCssBySourceOrder, S as resolveTailwindV4SourceOptionsFromPatcher, T as hasTailwindRootDirectives, U as stripTailwindBanners, V as stripGeneratorPlaceholderMarkers, W as normalizeConfigDirective, X as loadTailwindV4DesignSystem, Y as filterUnsupportedMiniProgramTailwindV4Candidates, gt as omitUndefined, h as resolveTailwindV4EntriesFromCss, j as parseImportRequest, l as getRuntimeClassSetSignature, lt as createDebug, n as resolveTailwindV3SourceFromPatcher, r as resolveTailwindV3SourceOptionsFromPatcher, rt as normalizeLegacyContentEntries, st as resolveTailwindV4CssSourceBase, t as resolveTailwindV3Source, w as hasTailwindApplyDirective, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1, z as splitTailwindGeneratedCssByBanner } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Bgn4m8An.mjs";
+import { p as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-Copn2SqE.mjs";
+import { r as isUniAppXEnabled } from "./tailwindcss-C0Zgo3Es.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
 import { extractRawCandidatesWithPositions, extractSourceCandidates, extractValidCandidates, resolveValidTailwindV4Candidates } from "tailwindcss-patch";
@@ -1262,6 +1262,15 @@ function mergeMarkedUserLayerComponentsCss(baseCss, markedCss) {
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
+const TAILWIND_V4_GENERATOR_AT_RULES = new Set([
+	"config",
+	"custom-variant",
+	"plugin",
+	"source",
+	"theme",
+	"utility",
+	"variant"
+]);
 function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
 	return finalizeMiniProgramCss(css, {
@@ -1303,6 +1312,26 @@ function removeTailwindApplyAtRules(source) {
 		return source;
 	}
 }
+function removeTailwindV4GeneratorAtRules(source) {
+	try {
+		const root = postcss.parse(source);
+		let changed = false;
+		root.walkAtRules((rule) => {
+			if (!TAILWIND_V4_GENERATOR_AT_RULES.has(rule.name)) return;
+			rule.remove();
+			changed = true;
+		});
+		root.walk((node) => {
+			if ("nodes" in node && node.nodes?.length === 0) {
+				node.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
+}
 function shouldScanTailwindV4Sources(majorVersion, target, generatorRuntime, isolateCssSource) {
 	if (majorVersion !== 4 || isolateCssSource) return false;
 	return target === "web" || generatorRuntime.size === 0;
@@ -1340,7 +1369,19 @@ function isCommentOnlyCss(source) {
 	}
 }
 function stripTailwindSourceMediaFragments(source) {
-	return source.replace(/^\s*@media\s+source\([^)]*\)\s*\{\s*$/gm, "").replace(/^\s*\}\s*(?=@(?:source|theme|config|plugin|utility|variant|custom-variant)\b)/gm, "").replace(/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/gm, "");
+	let removedSourceMediaStart = false;
+	return source.split(/\r?\n/).filter((line) => {
+		if (/^\s*@media\s+source\([^)]*\)\s*\{\s*$/.test(line)) {
+			removedSourceMediaStart = true;
+			return false;
+		}
+		if (/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/.test(line)) return false;
+		if (removedSourceMediaStart && /^\s*\}\s*$/.test(line)) {
+			removedSourceMediaStart = false;
+			return false;
+		}
+		return true;
+	}).join("\n").replace(/\}[^\S\r\n]*(?=@(?:config|source)\b)/g, "");
 }
 function stripLeadingTailwindSourceMediaCloseFragment(source) {
 	return source.replace(/^\s*\}\s*(?:\n|$)/, "");
@@ -1508,7 +1549,7 @@ function shouldFilterApplyOnlyGeneratedCss(majorVersion, target, source, options
 }
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
-	const cleanedSource = removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
+	const cleanedSource = removeTailwindSourceDirectives(removeTailwindV4GeneratorAtRules(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source))), { importFallback: options.importFallback });
 	if (cleanedSource.trim().length === 0) return "";
 	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindApplyAtRules(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedSource) : cleanedSource)), { importFallback: options.importFallback })));
 	if (userSource.trim().length === 0) return "";
@@ -1608,6 +1649,7 @@ async function generateCssByGenerator(options) {
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
 	const localImportParts = splitLocalCssImports(effectiveRawSource);
 	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
+	const userCssRawSource = majorVersion === 4 ? removeTailwindV4GeneratorAtRules(generatorRawSource) : generatorRawSource;
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: generatorOptions.target === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -1696,7 +1738,7 @@ async function generateCssByGenerator(options) {
 		});
 		const generatedCss = shouldFilterApplyOnlyCss ? filterApplyOnlyGeneratedCss(stripTailwindBanner(generated.css), generatorRawSource) : stripTailwindBanner(generated.css);
 		const hasMatchedCssSourceFile = sources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
-		const orderedExtraCss = hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(generatorRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(generatorRawSource, generated.rawCss);
+		const orderedExtraCss = hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(userCssRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssRawSource, generated.rawCss);
 		const shouldAppendMatchedCssSourceCompat = !hasMatchedCssSourceFile || orderedExtraCss !== void 0;
 		if (orderedExtraCss) {
 			let css = generatedCss;
@@ -1720,14 +1762,14 @@ async function generateCssByGenerator(options) {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, userCssOptions);
+				const userCss = await transformGeneratorUserCss(userCssRawSource, userCssOptions);
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (generated.target === "weapp" && shouldAppendMatchedCssSourceCompat) {
 				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				if (!shouldFilterApplyOnlyCss) {
-					css = await appendLegacyCompatCss(css, generatorRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				}
 			} else if (generated.target === "weapp" && shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 			return {
@@ -1766,7 +1808,7 @@ async function generateCssByGenerator(options) {
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (hasMatchedCssSourceFile && generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -1776,13 +1818,13 @@ async function generateCssByGenerator(options) {
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (hasMatchedCssSourceFile && generated.target === "weapp") {
-				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -1803,8 +1845,8 @@ async function generateCssByGenerator(options) {
 			};
 		}
 		if (!shouldFilterApplyOnlyCss) {
-			css = await appendLegacyCompatCss(css, generatorRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-			css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
 		return {
 			css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {

package/dist/{incremental-runtime-class-set-vOetpdWs.js → incremental-runtime-class-set-Bmzdjlk0.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
-const require_generator = require("./generator-AD-eX8Tr.js");
-const require_precheck = require("./precheck-b8Y8qZg0.js");
-const require_tailwindcss = require("./tailwindcss-CpQ6X4l6.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_generator = require("./generator-C56PJYxA.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
 let node_fs = require("node:fs");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
@@ -1266,6 +1266,15 @@ function mergeMarkedUserLayerComponentsCss(baseCss, markedCss) {
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
+const TAILWIND_V4_GENERATOR_AT_RULES = new Set([
+	"config",
+	"custom-variant",
+	"plugin",
+	"source",
+	"theme",
+	"utility",
+	"variant"
+]);
 function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
 	return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
@@ -1307,6 +1316,26 @@ function removeTailwindApplyAtRules(source) {
 		return source;
 	}
 }
+function removeTailwindV4GeneratorAtRules(source) {
+	try {
+		const root = postcss.default.parse(source);
+		let changed = false;
+		root.walkAtRules((rule) => {
+			if (!TAILWIND_V4_GENERATOR_AT_RULES.has(rule.name)) return;
+			rule.remove();
+			changed = true;
+		});
+		root.walk((node) => {
+			if ("nodes" in node && node.nodes?.length === 0) {
+				node.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
+}
 function shouldScanTailwindV4Sources(majorVersion, target, generatorRuntime, isolateCssSource) {
 	if (majorVersion !== 4 || isolateCssSource) return false;
 	return target === "web" || generatorRuntime.size === 0;
@@ -1344,7 +1373,19 @@ function isCommentOnlyCss(source) {
 	}
 }
 function stripTailwindSourceMediaFragments(source) {
-	return source.replace(/^\s*@media\s+source\([^)]*\)\s*\{\s*$/gm, "").replace(/^\s*\}\s*(?=@(?:source|theme|config|plugin|utility|variant|custom-variant)\b)/gm, "").replace(/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/gm, "");
+	let removedSourceMediaStart = false;
+	return source.split(/\r?\n/).filter((line) => {
+		if (/^\s*@media\s+source\([^)]*\)\s*\{\s*$/.test(line)) {
+			removedSourceMediaStart = true;
+			return false;
+		}
+		if (/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/.test(line)) return false;
+		if (removedSourceMediaStart && /^\s*\}\s*$/.test(line)) {
+			removedSourceMediaStart = false;
+			return false;
+		}
+		return true;
+	}).join("\n").replace(/\}[^\S\r\n]*(?=@(?:config|source)\b)/g, "");
 }
 function stripLeadingTailwindSourceMediaCloseFragment(source) {
 	return source.replace(/^\s*\}\s*(?:\n|$)/, "");
@@ -1512,7 +1553,7 @@ function shouldFilterApplyOnlyGeneratedCss(majorVersion, target, source, options
 }
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
-	const cleanedSource = require_v3_engine.removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
+	const cleanedSource = require_v3_engine.removeTailwindSourceDirectives(removeTailwindV4GeneratorAtRules(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source))), { importFallback: options.importFallback });
 	if (cleanedSource.trim().length === 0) return "";
 	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindApplyAtRules(require_v3_engine.removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedSource) : cleanedSource)), { importFallback: options.importFallback })));
 	if (userSource.trim().length === 0) return "";
@@ -1612,6 +1653,7 @@ async function generateCssByGenerator(options) {
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(require_v3_engine.normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
 	const localImportParts = splitLocalCssImports(effectiveRawSource);
 	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
+	const userCssRawSource = majorVersion === 4 ? removeTailwindV4GeneratorAtRules(generatorRawSource) : generatorRawSource;
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: generatorOptions.target === "weapp" ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -1700,7 +1742,7 @@ async function generateCssByGenerator(options) {
 		});
 		const generatedCss = shouldFilterApplyOnlyCss ? filterApplyOnlyGeneratedCss(require_v3_engine.stripTailwindBanner(generated.css), generatorRawSource) : require_v3_engine.stripTailwindBanner(generated.css);
 		const hasMatchedCssSourceFile = sources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
-		const orderedExtraCss = hasMatchedCssSourceFile ? require_v3_engine.splitTailwindV4GeneratedCssBySourceOrder(generatorRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(generatorRawSource, generated.rawCss);
+		const orderedExtraCss = hasMatchedCssSourceFile ? require_v3_engine.splitTailwindV4GeneratedCssBySourceOrder(userCssRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssRawSource, generated.rawCss);
 		const shouldAppendMatchedCssSourceCompat = !hasMatchedCssSourceFile || orderedExtraCss !== void 0;
 		if (orderedExtraCss) {
 			let css = generatedCss;
@@ -1724,14 +1766,14 @@ async function generateCssByGenerator(options) {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, userCssOptions);
+				const userCss = await transformGeneratorUserCss(userCssRawSource, userCssOptions);
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (generated.target === "weapp" && shouldAppendMatchedCssSourceCompat) {
 				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				if (!shouldFilterApplyOnlyCss) {
-					css = await appendLegacyCompatCss(css, generatorRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				}
 			} else if (generated.target === "weapp" && shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 			return {
@@ -1770,7 +1812,7 @@ async function generateCssByGenerator(options) {
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (hasMatchedCssSourceFile && generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -1780,13 +1822,13 @@ async function generateCssByGenerator(options) {
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (hasMatchedCssSourceFile && generated.target === "weapp") {
-				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -1807,8 +1849,8 @@ async function generateCssByGenerator(options) {
 			};
 		}
 		if (!shouldFilterApplyOnlyCss) {
-			css = await appendLegacyCompatCss(css, generatorRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-			css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
 		return {
 			css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {

package/dist/index.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-AD-eX8Tr.js");
+const require_generator = require("./generator-C56PJYxA.js");
 const require_gulp = require("./gulp.js");
-const require_postcss = require("./postcss-Cbi6RFpf.js");
-const require_vite = require("./vite-CTuHPC91.js");
-const require_webpack = require("./webpack-BBHJYKqB.js");
+const require_postcss = require("./postcss-B7QNe78h.js");
+const require_vite = require("./vite-Bw6LOXvf.js");
+const require_webpack = require("./webpack-nn3P8_S_.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-DVWLNO0n.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-Bgn4m8An.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-hSUxK7oR.mjs";
-import { t as WeappTailwindcss } from "./vite-DLXDMHON.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-DJFw08SK.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BgINK7Nm.mjs";
+import { t as WeappTailwindcss } from "./vite-ChZ2cbn4.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-CMJ7iqN7.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{postcss-Cbi6RFpf.js → postcss-B7QNe78h.js}

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
-const require_generator = require("./generator-AD-eX8Tr.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_generator = require("./generator-C56PJYxA.js");
 let postcss$1 = require("postcss");
 postcss$1 = require_chunk.__toESM(postcss$1);
 let tailwindcss_patch = require("tailwindcss-patch");

package/dist/{postcss-hSUxK7oR.mjs → postcss-BgINK7Nm.mjs}

@@ -1,5 +1,5 @@
-import { $ as collectCssInlineSourceCandidates, T as hasTailwindRootDirectives, Z as DEFAULT_SOURCE_SCAN_EXTENSIONS, at as resolveCssSourceEntries, dt as readInstalledPackageMajorVersion, et as createSourceScanPattern, it as parseConfigParam, rt as normalizeLegacyContentEntries, t as resolveTailwindV3Source, tt as expandTailwindSourceEntries, w as hasTailwindApplyDirective, y as resolveTailwindV4Source$1 } from "./v3-engine-Cczrkzqt.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DVWLNO0n.mjs";
+import { $ as collectCssInlineSourceCandidates, T as hasTailwindRootDirectives, Z as DEFAULT_SOURCE_SCAN_EXTENSIONS, at as resolveCssSourceEntries, dt as readInstalledPackageMajorVersion, et as createSourceScanPattern, it as parseConfigParam, rt as normalizeLegacyContentEntries, t as resolveTailwindV3Source, tt as expandTailwindSourceEntries, w as hasTailwindApplyDirective, y as resolveTailwindV4Source$1 } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Bgn4m8An.mjs";
 import postcss$1 from "postcss";
 import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
 import process from "node:process";

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-Cbi6RFpf.js");
+const require_postcss = require("./postcss-B7QNe78h.js");
 exports.default = require_postcss.weappTailwindcssPostcssPlugin;
 exports.weappTailwindcssPostcssPlugin = require_postcss.weappTailwindcssPostcssPlugin;

package/dist/postcss.mjs

@@ -1,2 +1,2 @@
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-hSUxK7oR.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-BgINK7Nm.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };

package/dist/{precheck-Bsn_LMmo.mjs → precheck-Copn2SqE.mjs}

@@ -1,7 +1,7 @@
-import { K as createTailwindV4Engine$1, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, gt as omitUndefined, ht as resolveBooleanObjectOption, lt as createDebug, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-Cczrkzqt.mjs";
+import { K as createTailwindV4Engine$1, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, gt as omitUndefined, ht as resolveBooleanObjectOption, lt as createDebug, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-Ji6AXPh2.mjs";
 import { a as resolveDefaultCssPreflight, i as getDefaultOptions, o as DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH, s as HARD_PARSE_CACHE_MAX_ENTRIES } from "./defaults-8xrgzxFY.mjs";
 import { i as isMap, n as defuOverrideArray } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-AWaPVF2B.mjs";
+import { i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-C0Zgo3Es.mjs";
 import { splitCandidateTokens } from "tailwindcss-patch";
 import process from "node:process";
 import path from "node:path";

package/dist/{precheck-b8Y8qZg0.js → precheck-CyPbGn38.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
 const require_defaults = require("./defaults-BPUuNYcD.js");
 require("./utils-Dolmt8EO.js");
-const require_tailwindcss = require("./tailwindcss-CpQ6X4l6.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
 let tailwindcss_patch = require("tailwindcss-patch");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/presets.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
 const require_utils = require("./utils-Dolmt8EO.js");
-const require_tailwindcss = require("./tailwindcss-CpQ6X4l6.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
 require("./logger-TlKT3xmR.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/presets.mjs

@@ -1,6 +1,6 @@
-import { gt as omitUndefined } from "./v3-engine-Cczrkzqt.mjs";
+import { gt as omitUndefined } from "./v3-engine-Ji6AXPh2.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-AWaPVF2B.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-C0Zgo3Es.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import process from "node:process";
 import path from "node:path";

package/dist/{source-candidates-BsWYoIPN.mjs → source-candidates-BODCmzz5.mjs}

@@ -1,4 +1,4 @@
-import { Q as FULL_SOURCE_SCAN_EXTENSION_RE, ct as toPosixPath, nt as isFileMatchedByTailwindSourceEntries, ot as resolveSourceScanPath } from "./v3-engine-Cczrkzqt.mjs";
+import { Q as FULL_SOURCE_SCAN_EXTENSION_RE, ct as toPosixPath, nt as isFileMatchedByTailwindSourceEntries, ot as resolveSourceScanPath } from "./v3-engine-Ji6AXPh2.mjs";
 import { createRequire } from "node:module";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
 import path from "node:path";

package/dist/{source-candidates-o2ZrKWzu.js → source-candidates-Caf2GDvx.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
 let node_module = require("node:module");
 let tailwindcss_patch = require("tailwindcss-patch");
 let node_path = require("node:path");

package/dist/{tailwindcss-AWaPVF2B.mjs → tailwindcss-C0Zgo3Es.mjs}

@@ -1,4 +1,4 @@
-import { _t as findNearestPackageRoot, dt as readInstalledPackageMajorVersion, f as runtimeSignaturePatchersSymbol, gt as omitUndefined, mt as normalizeStringListOption, ut as createTailwindcssPatcher, vt as findWorkspacePackageDir, yt as findWorkspaceRoot } from "./v3-engine-Cczrkzqt.mjs";
+import { _t as findNearestPackageRoot, dt as readInstalledPackageMajorVersion, f as runtimeSignaturePatchersSymbol, gt as omitUndefined, mt as normalizeStringListOption, ut as createTailwindcssPatcher, vt as findWorkspacePackageDir, yt as findWorkspaceRoot } from "./v3-engine-Ji6AXPh2.mjs";
 import { n as defuOverrideArray } from "./utils-DsaS975I.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";

package/dist/{tailwindcss-CpQ6X4l6.js → tailwindcss-Tw6CSVHL.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
 require("./utils-Dolmt8EO.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");

package/dist/{transform-BkGtbxb1.js → transform-95ivJthq.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_precheck = require("./precheck-b8Y8qZg0.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
 let tailwindcss_patch = require("tailwindcss-patch");
 let magic_string = require("magic-string");
 magic_string = require_chunk.__toESM(magic_string);

package/dist/{transform-DumSZmTh.mjs → transform-DgCFGtQR.mjs}

@@ -1,4 +1,4 @@
-import { c as createAttributeMatcher, d as _defineProperty, f as isClassContextLiteralPath, l as analyzeSource, m as babelParse, p as replaceWxml, s as generateCode, u as JsTokenUpdater } from "./precheck-Bsn_LMmo.mjs";
+import { c as createAttributeMatcher, d as _defineProperty, f as isClassContextLiteralPath, l as analyzeSource, m as babelParse, p as replaceWxml, s as generateCode, u as JsTokenUpdater } from "./precheck-Copn2SqE.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "tailwindcss-patch";
 import MagicString from "magic-string";

package/dist/{v3-engine-CM0TRa8V.js → v3-engine-6FVAcrZl.js}

@@ -2074,7 +2074,7 @@ const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|(?:use|forward)\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|use|forward|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
-const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant)\b[\s\S]*\{/;
+const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant|plugin)\b[\s\S]*\{/;
 const TAILWIND_V3_SUBPATH_IMPORT_LAYERS = new Map([
 	["tailwindcss/base", "base"],
 	["tailwindcss/components", "components"],
@@ -2160,6 +2160,7 @@ function extractTailwindDirectiveLines(rawSource, options = {}) {
 		if (!trimmed || trimmed.startsWith("//")) continue;
 		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE.exec(line)?.[0];
 		if (!directive) continue;
+		if (TAILWIND_EXTRACTABLE_BLOCK_START_RE.test(directive)) continue;
 		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
 		const normalizedTrimmed = normalized.trim();
 		if (options.removeConfig && normalizedTrimmed.startsWith("@config")) continue;

package/dist/{v3-engine-Cczrkzqt.mjs → v3-engine-Ji6AXPh2.mjs}

@@ -2066,7 +2066,7 @@ const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|(?:use|forward)\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|use|forward|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
-const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant)\b[\s\S]*\{/;
+const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant|plugin)\b[\s\S]*\{/;
 const TAILWIND_V3_SUBPATH_IMPORT_LAYERS = new Map([
 	["tailwindcss/base", "base"],
 	["tailwindcss/components", "components"],
@@ -2152,6 +2152,7 @@ function extractTailwindDirectiveLines(rawSource, options = {}) {
 		if (!trimmed || trimmed.startsWith("//")) continue;
 		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE.exec(line)?.[0];
 		if (!directive) continue;
+		if (TAILWIND_EXTRACTABLE_BLOCK_START_RE.test(directive)) continue;
 		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
 		const normalizedTrimmed = normalized.trim();
 		if (options.removeConfig && normalizedTrimmed.startsWith("@config")) continue;

package/dist/{vite-CTuHPC91.js → vite-Bw6LOXvf.js}

@@ -1,12 +1,12 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
-const require_generator = require("./generator-AD-eX8Tr.js");
-const require_precheck = require("./precheck-b8Y8qZg0.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_generator = require("./generator-C56PJYxA.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
 const require_utils = require("./utils-Dolmt8EO.js");
-const require_tailwindcss = require("./tailwindcss-CpQ6X4l6.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-vOetpdWs.js");
-const require_source_candidates = require("./source-candidates-o2ZrKWzu.js");
-const require_bundle_state = require("./bundle-state-Cso_ceUo.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-Bmzdjlk0.js");
+const require_source_candidates = require("./source-candidates-Caf2GDvx.js");
+const require_bundle_state = require("./bundle-state-CFgzVHFP.js");
 require("./logger-TlKT3xmR.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
@@ -66,7 +66,7 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-BkGtbxb1.js")).then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = Promise.resolve().then(() => require("./transform-95ivJthq.js")).then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const preprocessorLangs = new Set([

package/dist/{vite-DLXDMHON.mjs → vite-ChZ2cbn4.mjs}

@@ -1,11 +1,11 @@
-import { C as hasLocalCssImport, D as normalizeTailwindConfigDirectives, E as hasTailwindSourceDirectives, L as hasTailwindGeneratedCssMarkers, M as removeTailwindSourceDirectives, T as hasTailwindRootDirectives, Y as filterUnsupportedMiniProgramTailwindV4Candidates, _ as resolveViteSourceScanEntries, _t as findNearestPackageRoot, ft as findTailwindConfig, g as resolveTailwindV4EntriesFromCssCached, gt as omitUndefined, j as parseImportRequest, k as normalizeTailwindSourceForGenerator, l as getRuntimeClassSetSignature, lt as createDebug, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, pt as resolveTailwindcssOptions, st as resolveTailwindV4CssSourceBase, v as resolveViteTailwindV4CssDependencies, w as hasTailwindApplyDirective } from "./v3-engine-Cczrkzqt.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DVWLNO0n.mjs";
-import { _ as collectRuntimeClassSet, a as vitePluginName, b as refreshTailwindRuntimeState, g as toCustomAttributesEntities, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise } from "./precheck-Bsn_LMmo.mjs";
+import { C as hasLocalCssImport, D as normalizeTailwindConfigDirectives, E as hasTailwindSourceDirectives, L as hasTailwindGeneratedCssMarkers, M as removeTailwindSourceDirectives, T as hasTailwindRootDirectives, Y as filterUnsupportedMiniProgramTailwindV4Candidates, _ as resolveViteSourceScanEntries, _t as findNearestPackageRoot, ft as findTailwindConfig, g as resolveTailwindV4EntriesFromCssCached, gt as omitUndefined, j as parseImportRequest, k as normalizeTailwindSourceForGenerator, l as getRuntimeClassSetSignature, lt as createDebug, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, pt as resolveTailwindcssOptions, st as resolveTailwindV4CssSourceBase, v as resolveViteTailwindV4CssDependencies, w as hasTailwindApplyDirective } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-Bgn4m8An.mjs";
+import { _ as collectRuntimeClassSet, a as vitePluginName, b as refreshTailwindRuntimeState, g as toCustomAttributesEntities, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise } from "./precheck-Copn2SqE.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { a as normalizeCssEntries, c as hasConfiguredTailwindV4CssRoots, i as resolveUniAppXOptions, l as upsertTailwindV4CssSource, r as isUniAppXEnabled } from "./tailwindcss-AWaPVF2B.mjs";
-import { a as validateCandidatesByGenerator, i as generateCssByGenerator, n as createHmrTimingRecorder, o as mergeMarkedUserLayerComponentsCss, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-xf49kky6.mjs";
-import { n as createTailwindV3DefaultExtractor, r as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-BsWYoIPN.mjs";
-import { C as toAbsoluteOutputPath, _ as normalizePath, a as applyLinkedResults, b as stripRequestQuery, c as createBundlerGeneratedCssMarker, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, g as isCSSRequest, h as formatPostcssSourceMap, i as createRuntimeAffectingSourceSignature, l as hasBundlerGeneratedCssMarker, m as cleanUrl, n as createBundleBuildState, o as createBundleModuleGraphOptions, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, u as parseBundlerGeneratedCssMarkerBlocks, v as slash, x as normalizeOutputPathKey, y as isSourceStyleRequest } from "./bundle-state-DEyxCR4f.mjs";
+import { a as normalizeCssEntries, c as hasConfiguredTailwindV4CssRoots, i as resolveUniAppXOptions, l as upsertTailwindV4CssSource, r as isUniAppXEnabled } from "./tailwindcss-C0Zgo3Es.mjs";
+import { a as validateCandidatesByGenerator, i as generateCssByGenerator, n as createHmrTimingRecorder, o as mergeMarkedUserLayerComponentsCss, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BEYHQkZc.mjs";
+import { n as createTailwindV3DefaultExtractor, r as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-BODCmzz5.mjs";
+import { C as toAbsoluteOutputPath, _ as normalizePath, a as applyLinkedResults, b as stripRequestQuery, c as createBundlerGeneratedCssMarker, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, g as isCSSRequest, h as formatPostcssSourceMap, i as createRuntimeAffectingSourceSignature, l as hasBundlerGeneratedCssMarker, m as cleanUrl, n as createBundleBuildState, o as createBundleModuleGraphOptions, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, u as parseBundlerGeneratedCssMarkerBlocks, v as slash, x as normalizeOutputPathKey, y as isSourceStyleRequest } from "./bundle-state-CdNXQl-o.mjs";
 import { t as logger$1 } from "./logger-BNzxZbZj.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
@@ -58,7 +58,7 @@ function resolveUniAppXStyleIsolationEnabled(root) {
 //#region src/uni-app-x/vite.ts
 let transformUVuePromise;
 function loadTransformUVue() {
-	transformUVuePromise ?? (transformUVuePromise = import("./transform-DumSZmTh.mjs").then((mod) => mod.transformUVue));
+	transformUVuePromise ?? (transformUVuePromise = import("./transform-DgCFGtQR.mjs").then((mod) => mod.transformUVue));
 	return transformUVuePromise;
 }
 const preprocessorLangs = new Set([

package/dist/vite.js

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

package/dist/vite.mjs

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

package/dist/weapp-tw-css-import-rewrite-loader.js

@@ -2364,7 +2364,7 @@ const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|(?:use|forward)\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|use|forward|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
-const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant)\b[\s\S]*\{/;
+const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant|plugin)\b[\s\S]*\{/;
 const TAILWIND_V3_SUBPATH_IMPORT_LAYERS = new Map([
 	["tailwindcss/base", "base"],
 	["tailwindcss/components", "components"],
@@ -2437,6 +2437,7 @@ function extractTailwindDirectiveLines(rawSource, options = {}) {
 		if (!trimmed || trimmed.startsWith("//")) continue;
 		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE.exec(line)?.[0];
 		if (!directive) continue;
+		if (TAILWIND_EXTRACTABLE_BLOCK_START_RE.test(directive)) continue;
 		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
 		const normalizedTrimmed = normalized.trim();
 		if (options.removeConfig && normalizedTrimmed.startsWith("@config")) continue;
@@ -5320,6 +5321,15 @@ function reorderMarkedUserLayerComponentsCss(css) {
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
+const TAILWIND_V4_GENERATOR_AT_RULES = new Set([
+	"config",
+	"custom-variant",
+	"plugin",
+	"source",
+	"theme",
+	"utility",
+	"variant"
+]);
 function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
 	return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
@@ -5361,6 +5371,26 @@ function removeTailwindApplyAtRules(source) {
 		return source;
 	}
 }
+function removeTailwindV4GeneratorAtRules(source) {
+	try {
+		const root = require_watch_dependencies.postcss_default.parse(source);
+		let changed = false;
+		root.walkAtRules((rule) => {
+			if (!TAILWIND_V4_GENERATOR_AT_RULES.has(rule.name)) return;
+			rule.remove();
+			changed = true;
+		});
+		root.walk((node) => {
+			if ("nodes" in node && node.nodes?.length === 0) {
+				node.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
+}
 function shouldScanTailwindV4Sources(majorVersion, target, generatorRuntime, isolateCssSource) {
 	if (majorVersion !== 4 || isolateCssSource) return false;
 	return target === "web" || generatorRuntime.size === 0;
@@ -5398,7 +5428,19 @@ function isCommentOnlyCss(source) {
 	}
 }
 function stripTailwindSourceMediaFragments(source) {
-	return source.replace(/^\s*@media\s+source\([^)]*\)\s*\{\s*$/gm, "").replace(/^\s*\}\s*(?=@(?:source|theme|config|plugin|utility|variant|custom-variant)\b)/gm, "").replace(/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/gm, "");
+	let removedSourceMediaStart = false;
+	return source.split(/\r?\n/).filter((line) => {
+		if (/^\s*@media\s+source\([^)]*\)\s*\{\s*$/.test(line)) {
+			removedSourceMediaStart = true;
+			return false;
+		}
+		if (/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/.test(line)) return false;
+		if (removedSourceMediaStart && /^\s*\}\s*$/.test(line)) {
+			removedSourceMediaStart = false;
+			return false;
+		}
+		return true;
+	}).join("\n").replace(/\}[^\S\r\n]*(?=@(?:config|source)\b)/g, "");
 }
 function stripLeadingTailwindSourceMediaCloseFragment(source) {
 	return source.replace(/^\s*\}\s*(?:\n|$)/, "");
@@ -5566,7 +5608,7 @@ function shouldFilterApplyOnlyGeneratedCss(majorVersion, target, source, options
 }
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
-	const cleanedSource = removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
+	const cleanedSource = removeTailwindSourceDirectives(removeTailwindV4GeneratorAtRules(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source))), { importFallback: options.importFallback });
 	if (cleanedSource.trim().length === 0) return "";
 	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindApplyAtRules(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedSource) : cleanedSource)), { importFallback: options.importFallback })));
 	if (userSource.trim().length === 0) return "";
@@ -5666,6 +5708,7 @@ async function generateCssByGenerator(options) {
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
 	const localImportParts = splitLocalCssImports(effectiveRawSource);
 	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
+	const userCssRawSource = majorVersion === 4 ? removeTailwindV4GeneratorAtRules(generatorRawSource) : generatorRawSource;
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: generatorOptions.target === "weapp" ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -5754,7 +5797,7 @@ async function generateCssByGenerator(options) {
 		});
 		const generatedCss = shouldFilterApplyOnlyCss ? filterApplyOnlyGeneratedCss(stripTailwindBanner(generated.css), generatorRawSource) : stripTailwindBanner(generated.css);
 		const hasMatchedCssSourceFile = sources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
-		const orderedExtraCss = hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(generatorRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(generatorRawSource, generated.rawCss);
+		const orderedExtraCss = hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(userCssRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssRawSource, generated.rawCss);
 		const shouldAppendMatchedCssSourceCompat = !hasMatchedCssSourceFile || orderedExtraCss !== void 0;
 		if (orderedExtraCss) {
 			let css = generatedCss;
@@ -5778,14 +5821,14 @@ async function generateCssByGenerator(options) {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, userCssOptions);
+				const userCss = await transformGeneratorUserCss(userCssRawSource, userCssOptions);
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (generated.target === "weapp" && shouldAppendMatchedCssSourceCompat) {
 				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 				if (!shouldFilterApplyOnlyCss) {
-					css = await appendLegacyCompatCss(css, generatorRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				}
 			} else if (generated.target === "weapp" && shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 			return {
@@ -5824,7 +5867,7 @@ async function generateCssByGenerator(options) {
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (hasMatchedCssSourceFile && generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -5834,13 +5877,13 @@ async function generateCssByGenerator(options) {
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (hasMatchedCssSourceFile && generated.target === "weapp") {
-				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(generatorRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -5861,8 +5904,8 @@ async function generateCssByGenerator(options) {
 			};
 		}
 		if (!shouldFilterApplyOnlyCss) {
-			css = await appendLegacyCompatCss(css, generatorRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-			css = await appendLegacyContainerCompatCss(css, generatorRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
 		return {
 			css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {

package/dist/{webpack-DJFw08SK.mjs → webpack-CMJ7iqN7.mjs}

@@ -1,10 +1,10 @@
-import { M as removeTailwindSourceDirectives, l as getRuntimeClassSetSignature, lt as createDebug, pt as resolveTailwindcssOptions } from "./v3-engine-Cczrkzqt.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DVWLNO0n.mjs";
-import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Bsn_LMmo.mjs";
+import { M as removeTailwindSourceDirectives, l as getRuntimeClassSetSignature, lt as createDebug, pt as resolveTailwindcssOptions } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-Bgn4m8An.mjs";
+import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Copn2SqE.mjs";
 import { r as getGroupedEntries } from "./utils-DsaS975I.mjs";
-import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-AWaPVF2B.mjs";
-import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-xf49kky6.mjs";
-import { C as toAbsoluteOutputPath, S as resolveOutputSpecifier, b as stripRequestQuery, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, n as createBundleBuildState, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, y as isSourceStyleRequest } from "./bundle-state-DEyxCR4f.mjs";
+import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-C0Zgo3Es.mjs";
+import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BEYHQkZc.mjs";
+import { C as toAbsoluteOutputPath, S as resolveOutputSpecifier, b as stripRequestQuery, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, n as createBundleBuildState, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, y as isSourceStyleRequest } from "./bundle-state-CdNXQl-o.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import process from "node:process";

package/dist/{webpack-BBHJYKqB.js → webpack-nn3P8_S_.js}

@@ -1,11 +1,11 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CM0TRa8V.js");
-const require_generator = require("./generator-AD-eX8Tr.js");
-const require_precheck = require("./precheck-b8Y8qZg0.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_generator = require("./generator-C56PJYxA.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
 const require_utils = require("./utils-Dolmt8EO.js");
-const require_tailwindcss = require("./tailwindcss-CpQ6X4l6.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-vOetpdWs.js");
-const require_bundle_state = require("./bundle-state-Cso_ceUo.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-Bmzdjlk0.js");
+const require_bundle_state = require("./bundle-state-CFgzVHFP.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-BBHJYKqB.js");
+const require_webpack = require("./webpack-nn3P8_S_.js");
 exports.WeappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcssPackageDir = require_webpack.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-DJFw08SK.mjs";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-CMJ7iqN7.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -187,8 +187,8 @@
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
     "@weapp-tailwindcss/postcss": "3.0.3",
-    "@weapp-tailwindcss/reset": "0.1.1",
     "@weapp-tailwindcss/shared": "2.0.0",
+    "@weapp-tailwindcss/reset": "0.1.1",
     "tailwindcss-config": "2.0.0"
   },
   "devDependencies": {