weapp-tailwindcss 5.0.0-next.13 → 5.0.0-next.15

package/dist/defaults.js

@@ -1,151 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./chunk-8l464Juk.js");
-require("./utils-D0MZP_tr.js");
-let _weapp_core_escape = require("@weapp-core/escape");
-let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
-//#region src/defaults.ts
-const CSS_FILE_PATTERN = /.+\.(?:wx|ac|jx|tt|q|c|ty)ss$/;
-const HTML_FILE_PATTERN = /.+\.(?:(?:wx|ax|jx|ks|tt|q|ty|xhs)ml|swan)$/;
-const JS_FILE_PATTERN = /.+\.[cm]?js?$/;
-const BACKSLASH_RE = /\\/g;
-function normalizePath(p) {
-	return p.replace(BACKSLASH_RE, "/");
-}
-const MPX_STYLES_DIR_PATTERN = /(?:^|\/)styles\/.*\.(?:wx|ac|jx|tt|q|c|ty)ss$/i;
-const KBONE_MAIN_CSS_RE = /^(?:common\/)?miniprogram-app/;
-const IMPLICIT_MAIN_CSS_RE = /^(?:app|common\/main|bundle)(?:\.|\/|$)/;
-const MAIN_CSS_CHUNK_MATCHERS = {
-	"uni-app": (file) => file.startsWith("common/main") || file.startsWith("app"),
-	"uni-app-vite": (file) => file.startsWith("app") || file.startsWith("common/main"),
-	"uni-app-x": (file) => file.startsWith("app") || file.startsWith("common/main"),
-	"mpx": (file) => {
-		const normalized = normalizePath(file);
-		if (normalized.startsWith("app")) return true;
-		return MPX_STYLES_DIR_PATTERN.test(normalized);
-	},
-	"taro": (file) => file.startsWith("app"),
-	"remax": (file) => file.startsWith("app"),
-	"rax": (file) => file.startsWith("bundle"),
-	"native": (file) => file.startsWith("app"),
-	"weapp-vite": (file) => file.startsWith("app"),
-	"kbone": (file) => KBONE_MAIN_CSS_RE.test(file)
-};
-const alwaysFalse = () => false;
-const TAILWIND_V3_CSS_PREFLIGHT = {
-	"box-sizing": "border-box",
-	"border-width": "0",
-	"border-style": "solid",
-	"border-color": "currentColor"
-};
-const TAILWIND_V4_CSS_PREFLIGHT = {
-	"box-sizing": "border-box",
-	"margin": "0",
-	"padding": "0",
-	"border": "0 solid"
-};
-function getDefaultCssPreflight(tailwindcssMajorVersion) {
-	return { ...tailwindcssMajorVersion === 4 ? TAILWIND_V4_CSS_PREFLIGHT : TAILWIND_V3_CSS_PREFLIGHT };
-}
-function resolveDefaultCssPreflight(cssPreflight, tailwindcssMajorVersion) {
-	if (cssPreflight === false) return false;
-	return {
-		...getDefaultCssPreflight(tailwindcssMajorVersion),
-		...cssPreflight ?? {}
-	};
-}
-function createMainCssChunkMatcher() {
-	return (file, appType) => {
-		if (!appType) {
-			const normalized = normalizePath(file);
-			return IMPLICIT_MAIN_CSS_RE.test(normalized) || MPX_STYLES_DIR_PATTERN.test(normalized) || KBONE_MAIN_CSS_RE.test(normalized);
-		}
-		const matcher = MAIN_CSS_CHUNK_MATCHERS[appType];
-		return matcher ? matcher(file) : true;
-	};
-}
-function getDefaultOptions() {
-	return {
-		/**
-		* wxss 微信小程序
-		* acss 支付宝小程序
-		* jxss 京东小程序
-		* ttss 头条小程序
-		* qss QQ小程序
-		* css 最正常的样式文件
-		* tyss 涂鸦小程序
-		*/
-		cssMatcher: (file) => CSS_FILE_PATTERN.test(file),
-		/**
-		* wxml 微信小程序
-		* axml 支付宝小程序
-		* jxml 京东小程序
-		* ksml 快手小程序
-		* ttml 头条小程序
-		* qml QQ小程序
-		* tyml 涂鸦小程序
-		* xhsml 小红书小程序
-		* swan 百度小程序
-		*/
-		htmlMatcher: (file) => HTML_FILE_PATTERN.test(file),
-		jsMatcher: (file) => {
-			if (file.includes("node_modules")) return false;
-			return JS_FILE_PATTERN.test(file);
-		},
-		mainCssChunkMatcher: createMainCssChunkMatcher(),
-		wxsMatcher: alwaysFalse,
-		cssPreflight: getDefaultCssPreflight(3),
-		disabled: false,
-		onLoad: _weapp_tailwindcss_shared.noop,
-		onStart: _weapp_tailwindcss_shared.noop,
-		onEnd: _weapp_tailwindcss_shared.noop,
-		onUpdate: _weapp_tailwindcss_shared.noop,
-		customAttributes: {},
-		customReplaceDictionary: _weapp_core_escape.MappingChars2String,
-		appType: void 0,
-		arbitraryValues: {
-			allowDoubleQuotes: false,
-			bareArbitraryValues: false
-		},
-		cssChildCombinatorReplaceValue: ["view", "text"],
-		inlineWxs: false,
-		injectAdditionalCssVarScope: false,
-		jsPreserveClass: (keyword) => {
-			/**
-			* 默认保留 keyword
-			*/
-			if (keyword === "*") return true;
-			return false;
-		},
-		disabledDefaultTemplateHandler: false,
-		cssSelectorReplacement: {
-			root: [
-				"page",
-				".tw-root",
-				"wx-root-portal-content"
-			],
-			universal: ["view", "text"]
-		},
-		babelParserOptions: {
-			sourceType: "unambiguous",
-			cache: true,
-			cacheKey: "st:unambiguous"
-		},
-		postcssOptions: {},
-		cssRemoveProperty: true,
-		cssRemoveHoverPseudoClass: true,
-		ignoreCallExpressionIdentifiers: [],
-		ignoreTaggedTemplateExpressionIdentifiers: ["weappTwIgnore"],
-		replaceRuntimePackages: false,
-		generator: { target: "weapp" },
-		tailwindcssPatcherOptions: { filter(className) {
-			return !(0, _weapp_core_escape.isAllowedClassName)(className);
-		} },
-		logLevel: "info"
-	};
-}
-//#endregion
-exports.TAILWIND_V3_CSS_PREFLIGHT = TAILWIND_V3_CSS_PREFLIGHT;
-exports.TAILWIND_V4_CSS_PREFLIGHT = TAILWIND_V4_CSS_PREFLIGHT;
-exports.getDefaultCssPreflight = getDefaultCssPreflight;
-exports.getDefaultOptions = getDefaultOptions;
-exports.resolveDefaultCssPreflight = resolveDefaultCssPreflight;
+const require_defaults = require("./defaults-IHhYxNeU.js");
+exports.TAILWIND_V3_CSS_PREFLIGHT = require_defaults.TAILWIND_V3_CSS_PREFLIGHT;
+exports.TAILWIND_V4_CSS_PREFLIGHT = require_defaults.TAILWIND_V4_CSS_PREFLIGHT;
+exports.getDefaultCssPreflight = require_defaults.getDefaultCssPreflight;
+exports.getDefaultOptions = require_defaults.getDefaultOptions;
+exports.resolveDefaultCssPreflight = require_defaults.resolveDefaultCssPreflight;

package/dist/defaults.mjs

@@ -1,144 +1,2 @@
-import { a as noop } from "./utils-CycMvPn_.mjs";
-import { MappingChars2String, isAllowedClassName } from "@weapp-core/escape";
-//#region src/defaults.ts
-const CSS_FILE_PATTERN = /.+\.(?:wx|ac|jx|tt|q|c|ty)ss$/;
-const HTML_FILE_PATTERN = /.+\.(?:(?:wx|ax|jx|ks|tt|q|ty|xhs)ml|swan)$/;
-const JS_FILE_PATTERN = /.+\.[cm]?js?$/;
-const BACKSLASH_RE = /\\/g;
-function normalizePath(p) {
-	return p.replace(BACKSLASH_RE, "/");
-}
-const MPX_STYLES_DIR_PATTERN = /(?:^|\/)styles\/.*\.(?:wx|ac|jx|tt|q|c|ty)ss$/i;
-const KBONE_MAIN_CSS_RE = /^(?:common\/)?miniprogram-app/;
-const IMPLICIT_MAIN_CSS_RE = /^(?:app|common\/main|bundle)(?:\.|\/|$)/;
-const MAIN_CSS_CHUNK_MATCHERS = {
-	"uni-app": (file) => file.startsWith("common/main") || file.startsWith("app"),
-	"uni-app-vite": (file) => file.startsWith("app") || file.startsWith("common/main"),
-	"uni-app-x": (file) => file.startsWith("app") || file.startsWith("common/main"),
-	"mpx": (file) => {
-		const normalized = normalizePath(file);
-		if (normalized.startsWith("app")) return true;
-		return MPX_STYLES_DIR_PATTERN.test(normalized);
-	},
-	"taro": (file) => file.startsWith("app"),
-	"remax": (file) => file.startsWith("app"),
-	"rax": (file) => file.startsWith("bundle"),
-	"native": (file) => file.startsWith("app"),
-	"weapp-vite": (file) => file.startsWith("app"),
-	"kbone": (file) => KBONE_MAIN_CSS_RE.test(file)
-};
-const alwaysFalse = () => false;
-const TAILWIND_V3_CSS_PREFLIGHT = {
-	"box-sizing": "border-box",
-	"border-width": "0",
-	"border-style": "solid",
-	"border-color": "currentColor"
-};
-const TAILWIND_V4_CSS_PREFLIGHT = {
-	"box-sizing": "border-box",
-	"margin": "0",
-	"padding": "0",
-	"border": "0 solid"
-};
-function getDefaultCssPreflight(tailwindcssMajorVersion) {
-	return { ...tailwindcssMajorVersion === 4 ? TAILWIND_V4_CSS_PREFLIGHT : TAILWIND_V3_CSS_PREFLIGHT };
-}
-function resolveDefaultCssPreflight(cssPreflight, tailwindcssMajorVersion) {
-	if (cssPreflight === false) return false;
-	return {
-		...getDefaultCssPreflight(tailwindcssMajorVersion),
-		...cssPreflight ?? {}
-	};
-}
-function createMainCssChunkMatcher() {
-	return (file, appType) => {
-		if (!appType) {
-			const normalized = normalizePath(file);
-			return IMPLICIT_MAIN_CSS_RE.test(normalized) || MPX_STYLES_DIR_PATTERN.test(normalized) || KBONE_MAIN_CSS_RE.test(normalized);
-		}
-		const matcher = MAIN_CSS_CHUNK_MATCHERS[appType];
-		return matcher ? matcher(file) : true;
-	};
-}
-function getDefaultOptions() {
-	return {
-		/**
-		* wxss 微信小程序
-		* acss 支付宝小程序
-		* jxss 京东小程序
-		* ttss 头条小程序
-		* qss QQ小程序
-		* css 最正常的样式文件
-		* tyss 涂鸦小程序
-		*/
-		cssMatcher: (file) => CSS_FILE_PATTERN.test(file),
-		/**
-		* wxml 微信小程序
-		* axml 支付宝小程序
-		* jxml 京东小程序
-		* ksml 快手小程序
-		* ttml 头条小程序
-		* qml QQ小程序
-		* tyml 涂鸦小程序
-		* xhsml 小红书小程序
-		* swan 百度小程序
-		*/
-		htmlMatcher: (file) => HTML_FILE_PATTERN.test(file),
-		jsMatcher: (file) => {
-			if (file.includes("node_modules")) return false;
-			return JS_FILE_PATTERN.test(file);
-		},
-		mainCssChunkMatcher: createMainCssChunkMatcher(),
-		wxsMatcher: alwaysFalse,
-		cssPreflight: getDefaultCssPreflight(3),
-		disabled: false,
-		onLoad: noop,
-		onStart: noop,
-		onEnd: noop,
-		onUpdate: noop,
-		customAttributes: {},
-		customReplaceDictionary: MappingChars2String,
-		appType: void 0,
-		arbitraryValues: {
-			allowDoubleQuotes: false,
-			bareArbitraryValues: false
-		},
-		cssChildCombinatorReplaceValue: ["view", "text"],
-		inlineWxs: false,
-		injectAdditionalCssVarScope: false,
-		jsPreserveClass: (keyword) => {
-			/**
-			* 默认保留 keyword
-			*/
-			if (keyword === "*") return true;
-			return false;
-		},
-		disabledDefaultTemplateHandler: false,
-		cssSelectorReplacement: {
-			root: [
-				"page",
-				".tw-root",
-				"wx-root-portal-content"
-			],
-			universal: ["view", "text"]
-		},
-		babelParserOptions: {
-			sourceType: "unambiguous",
-			cache: true,
-			cacheKey: "st:unambiguous"
-		},
-		postcssOptions: {},
-		cssRemoveProperty: true,
-		cssRemoveHoverPseudoClass: true,
-		ignoreCallExpressionIdentifiers: [],
-		ignoreTaggedTemplateExpressionIdentifiers: ["weappTwIgnore"],
-		replaceRuntimePackages: false,
-		generator: { target: "weapp" },
-		tailwindcssPatcherOptions: { filter(className) {
-			return !isAllowedClassName(className);
-		} },
-		logLevel: "info"
-	};
-}
-//#endregion
+import { a as resolveDefaultCssPreflight, i as getDefaultOptions, n as TAILWIND_V4_CSS_PREFLIGHT, r as getDefaultCssPreflight, t as TAILWIND_V3_CSS_PREFLIGHT } from "./defaults-B1igPF_e.mjs";
 export { TAILWIND_V3_CSS_PREFLIGHT, TAILWIND_V4_CSS_PREFLIGHT, getDefaultCssPreflight, getDefaultOptions, resolveDefaultCssPreflight };

package/dist/{generator-CRORPkpW.js → generator-CImaTibB.js}

@@ -1,4 +1,4 @@
-const require_v3_engine = require("./v3-engine-DwV1E6rX.js");
+const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
 //#region src/generator/options.ts
 function normalizeWeappTailwindcssGeneratorOptions(options) {
 	if (options == null) return {

package/dist/{generator-C9H44wEF.mjs → generator-DSMdL4vg.mjs}

@@ -1,4 +1,4 @@
-import { C as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-D61eilBl.mjs";
+import { C as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-qoWtwjIj.mjs";
 //#region src/generator/options.ts
 function normalizeWeappTailwindcssGeneratorOptions(options) {
 	if (options == null) return {

package/dist/generator.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-DwV1E6rX.js");
-const require_generator = require("./generator-CRORPkpW.js");
+const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
+const require_generator = require("./generator-CImaTibB.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 { S as resolveTailwindV4SourceOptionsFromPatcher, T as transformTailwindV4CssToWeapp, a as transformTailwindV3CssByTarget, b as resolveTailwindV4SourceFromPatchOptions, n as resolveTailwindV3SourceFromPatcher, o as transformTailwindV3CssToWeapp, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, w as transformTailwindV4CssByTarget, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source } from "./v3-engine-D61eilBl.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-C9H44wEF.mjs";
+import { S as resolveTailwindV4SourceOptionsFromPatcher, T as transformTailwindV4CssToWeapp, a as transformTailwindV3CssByTarget, b as resolveTailwindV4SourceFromPatchOptions, n as resolveTailwindV3SourceFromPatcher, o as transformTailwindV3CssToWeapp, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, w as transformTailwindV4CssByTarget, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source } from "./v3-engine-qoWtwjIj.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-DSMdL4vg.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-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-DwV1E6rX.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-DN9KKjSi.js");
-const require_precheck = require("./precheck-CRX-pMKJ.js");
-const require_tailwindcss = require("./tailwindcss-DZ6jVYb4.js");
-const require_source_candidates = require("./source-candidates-C4YgmZ8A.js");
+const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CH1L--wj.js");
+const require_precheck = require("./precheck-GcUdX1BX.js");
+const require_tailwindcss = require("./tailwindcss-CkTBauKa.js");
+const require_source_candidates = require("./source-candidates-ES3ttZPe.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_path = require("node:path");

package/dist/gulp.mjs

@@ -1,8 +1,8 @@
-import { F as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-D61eilBl.mjs";
-import { i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, o as processCachedTask, r as emitHmrTiming, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-Dbn4yPfZ.mjs";
-import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-SG48aLG2.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-BbTVeQkG.mjs";
-import { t as createSourceCandidateCollector } from "./source-candidates-CyupdLKi.mjs";
+import { F as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-qoWtwjIj.mjs";
+import { i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, o as processCachedTask, r as emitHmrTiming, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-P-3ZoWW5.mjs";
+import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-DMXLnfTN.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-fe0rGj7T.mjs";
+import { t as createSourceCandidateCollector } from "./source-candidates-om5-wQJ0.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";

package/dist/{incremental-runtime-class-set-DN9KKjSi.js → incremental-runtime-class-set-CH1L--wj.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-DwV1E6rX.js");
-const require_generator = require("./generator-CRORPkpW.js");
-const require_precheck = require("./precheck-CRX-pMKJ.js");
-const require_tailwindcss = require("./tailwindcss-DZ6jVYb4.js");
+const require_v3_engine = require("./v3-engine-v__n8_Sd.js");
+const require_generator = require("./generator-CImaTibB.js");
+const require_precheck = require("./precheck-GcUdX1BX.js");
+const require_tailwindcss = require("./tailwindcss-CkTBauKa.js");
 let node_fs = require("node:fs");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
@@ -17,6 +17,7 @@ const TAILWIND_GENERATED_CSS_MARKER_RE = /\/\*!\s*tailwindcss v|@property\s+--tw
 const GENERATOR_PLACEHOLDER_MARKER_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\//i;
 const GENERATOR_PLACEHOLDER_MARKER_GLOBAL_RE = /\/\*!\s*weapp-tailwindcss generator-placeholder\s*\*\/\s*/gi;
 const TAILWIND_BANNER_PREFIX_RE = /^\/\*!\s*tailwindcss v[^*]*\*\/\s*/i;
+const TAILWIND_BANNER_RE = /\/\*!\s*tailwindcss v[^*]*\*\//i;
 const TAILWIND_BANNER_GLOBAL_RE = /\/\*!\s*tailwindcss v[^*]*\*\/\s*/gi;
 const VITE_MARKER_RE = /\/\*\$vite\$:[^*]*\*\//g;
 function createCssAppend(base, extra) {
@@ -24,14 +25,31 @@ function createCssAppend(base, extra) {
 	if (!extra) return base;
 	return `${base}\n${extra}`;
 }
-function splitTailwindV4GeneratedCss(rawSource, rawTailwindCss) {
+function splitTailwindV4GeneratedCssBySourceOrder(rawSource, rawTailwindCss) {
 	const trimmedRaw = rawSource.trim();
 	const trimmedTailwind = rawTailwindCss.trim();
-	if (trimmedRaw === trimmedTailwind) return "";
-	if (trimmedTailwind.startsWith(trimmedRaw)) return "";
+	if (trimmedRaw === trimmedTailwind) return {
+		before: "",
+		after: ""
+	};
+	if (trimmedTailwind.startsWith(trimmedRaw)) return {
+		before: "",
+		after: ""
+	};
 	const start = rawSource.indexOf(rawTailwindCss);
 	if (start === -1) return;
-	return createCssAppend(rawSource.slice(0, start), rawSource.slice(start + rawTailwindCss.length));
+	return {
+		before: rawSource.slice(0, start),
+		after: rawSource.slice(start + rawTailwindCss.length)
+	};
+}
+function splitTailwindGeneratedCssByBanner(rawSource, start) {
+	const match = start === void 0 ? TAILWIND_BANNER_RE.exec(rawSource) : { index: start };
+	if (!match || match.index === void 0) return;
+	return {
+		before: rawSource.slice(0, match.index),
+		after: [...rawSource.slice(match.index).matchAll(VITE_MARKER_RE)].map((item) => item[0]).join("\n")
+	};
 }
 function stripTailwindBanner(css) {
 	return css.replace(TAILWIND_BANNER_PREFIX_RE, "");
@@ -1595,7 +1613,7 @@ const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
 function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight) {
 	if (target !== "weapp") return css;
 	return finalizeMiniProgramCss(css, {
-		cssPreflight,
+		cssPreflight: majorVersion === 4 ? cssPreflight : void 0,
 		preservePseudoContentInit: majorVersion === 3
 	});
 }
@@ -1635,6 +1653,39 @@ function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOpt
 function isLocalImportRequest(request) {
 	return request.length > 0 && !request.startsWith("tailwindcss") && !request.startsWith("weapp-tailwindcss") && !request.startsWith("data:") && !REMOTE_IMPORT_RE.test(request);
 }
+function isCommentOnlyCss(source) {
+	try {
+		const root = postcss.default.parse(source);
+		return root.nodes.length > 0 && root.nodes.every((node) => node.type === "comment");
+	} catch {
+		return false;
+	}
+}
+function createCssSourceOrderAppend(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 splitRawSourceByGeneratedCssOrder(rawSource, rawTailwindCss) {
+	const exactParts = splitTailwindV4GeneratedCssBySourceOrder(rawSource, rawTailwindCss);
+	if (exactParts) return exactParts;
+	return splitTailwindGeneratedCssByBanner(rawSource);
+}
+async function transformGeneratorUserCss(source, options) {
+	if (source.trim().length === 0) return "";
+	const cleanedSource = removeTailwindSourceDirectives(source, { importFallback: options.importFallback });
+	if (cleanedSource.trim().length === 0) return "";
+	const extraSource = options.generatorTarget === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedSource) : cleanedSource;
+	if (extraSource.trim().length === 0) return "";
+	if (isCommentOnlyCss(extraSource)) return extraSource;
+	if (options.generatorTarget !== "weapp") return extraSource;
+	const { css } = await options.styleHandler(extraSource, {
+		...options.generatorStyleOptions,
+		...options.cssUserHandlerOptions
+	});
+	return removeUnsupportedMiniProgramAtRules(css);
+}
 function isPureLocalCssImportWrapper(css) {
 	let hasImport = false;
 	try {
@@ -1756,29 +1807,21 @@ async function generateCssByGenerator(options) {
 				incremental: true
 			};
 		}
-		const extraCss = splitTailwindV4GeneratedCss(effectiveRawSource, generated.rawCss);
-		if (typeof extraCss === "string") {
+		const hasMatchedCssSourceFile = sources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
+		const orderedExtraCss = hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(effectiveRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(effectiveRawSource, generated.rawCss);
+		if (orderedExtraCss) {
 			let css = stripTailwindBanner(generated.css);
 			if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
-			if (extraCss.trim().length > 0) {
-				const cleanedExtraCss = removeTailwindSourceDirectives(extraCss, { importFallback: generatorOptions.importFallback });
-				if (cleanedExtraCss.trim().length > 0) {
-					const extraSource = generated.target === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedExtraCss) : cleanedExtraCss;
-					if (extraSource.trim().length === 0) return {
-						css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
-						target: generated.target,
-						source: "generator",
-						dependencies: generated.dependencies
-					};
-					if (generated.target === "weapp") {
-						const { css: userCss } = await styleHandler(extraSource, {
-							...generatorStyleOptions,
-							...cssUserHandlerOptions
-						});
-						css = createCssAppend(css, removeUnsupportedMiniProgramAtRules(userCss));
-					} else css = createCssAppend(css, extraSource);
-				}
-			}
+			const userCssOptions = {
+				generatorTarget: generated.target,
+				generatorStyleOptions,
+				cssUserHandlerOptions,
+				styleHandler,
+				importFallback: generatorOptions.importFallback
+			};
+			const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
+			const afterUserCss = await transformGeneratorUserCss(orderedExtraCss.after, userCssOptions);
+			css = createCssSourceOrderAppend(createCssSourceOrderAppend(beforeUserCss, css), afterUserCss);
 			if (generated.target === "weapp") {
 				css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
@@ -1793,7 +1836,7 @@ async function generateCssByGenerator(options) {
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = stripTailwindBanner(generated.css);
 		if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
-		if (sources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile)) return {
+		if (hasMatchedCssSourceFile) return {
 			css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
 			target: generated.target,
 			source: "generator",