weapp-tailwindcss 5.0.0-next.14 → 5.0.0-next.16

package/dist/{bundle-state-CxtGmT4t.js → bundle-state-5CBF59C0.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_precheck = require("./precheck-CZHcFX8k.js");
+const require_precheck = require("./precheck-CfyWVL3l.js");
 let node_module = require("node:module");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);

package/dist/{bundle-state-BOBbxYzQ.mjs → bundle-state-CUuNIG4-.mjs}

@@ -1,4 +1,4 @@
-import { d as traverse, u as babelParse } from "./precheck-DCresEiu.mjs";
+import { d as traverse, u as babelParse } from "./precheck-CL0BmEi5.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import { Buffer } from "node:buffer";

package/dist/bundlers/shared/generator-css/markers.d.ts

@@ -8,7 +8,19 @@ export declare const TAILWIND_BANNER_GLOBAL_RE: RegExp;
 export declare const VITE_MARKER_RE: RegExp;
 export declare function createCssAppend(base: string, extra: string): string;
 export declare function splitTailwindV4GeneratedCss(rawSource: string, rawTailwindCss: string): string | undefined;
+export declare function splitTailwindV4GeneratedCssBySourceOrder(rawSource: string, rawTailwindCss: string): {
+    before: string;
+    after: string;
+} | undefined;
+export declare function splitGeneratorPlaceholderCssBySourceOrder(rawSource: string, rawTailwindCss?: string): {
+    before: string;
+    after: string;
+} | undefined;
 export declare function removeTailwindGeneratedCssByBanner(rawSource: string): string | undefined;
+export declare function splitTailwindGeneratedCssByBanner(rawSource: string, start?: number): {
+    before: string;
+    after: string;
+} | undefined;
 export declare function stripTailwindBanner(css: string): string;
 export declare function stripTailwindBanners(css: string): string;
 export declare function stripGeneratorPlaceholderMarkers(css: string): string;

package/dist/bundlers/shared/generator-css.d.ts

@@ -4,7 +4,7 @@ import type { InternalUserDefinedOptions } from '../../types';
 export { hasTailwindSourceDirectives, normalizeTailwindSourceForGenerator, removeTailwindSourceDirectives, resolveCssEntrySource, } from './generator-css/directives';
 export { removeTailwindApplyRules, } from './generator-css/legacy-compat';
 export { inheritLegacyUnitConvertedDeclarations, } from './generator-css/legacy-units';
-export { createCssAppend, hasTailwindGeneratedCss, hasTailwindGeneratedCssMarkers, removeTailwindGeneratedCssByBanner, splitTailwindV4GeneratedCss, stripGeneratorPlaceholderMarkers, stripTailwindBanner, stripTailwindBanners, } from './generator-css/markers';
+export { createCssAppend, hasTailwindGeneratedCss, hasTailwindGeneratedCssMarkers, removeTailwindGeneratedCssByBanner, splitGeneratorPlaceholderCssBySourceOrder, splitTailwindGeneratedCssByBanner, splitTailwindV4GeneratedCss, splitTailwindV4GeneratedCssBySourceOrder, stripGeneratorPlaceholderMarkers, stripTailwindBanner, stripTailwindBanners, } from './generator-css/markers';
 export { resolveGeneratorSource, } from './generator-css/source-resolver';
 export interface GenerateCssByGeneratorOptions {
     opts: InternalUserDefinedOptions;

package/dist/bundlers/vite/css-finalizer.d.ts

@@ -19,6 +19,7 @@ interface CssFinalizerContext {
     getSourceCandidatesForEntries?: ((entries: TailwindSourceEntry[] | undefined) => Set<string>) | undefined;
     waitForSourceCandidateSyncs?: () => Promise<void>;
     rememberMainCssSource?: (file: string, rawSource: string) => void;
+    getRememberedMainCssSource?: (file: string) => string | undefined;
 }
 export declare function createViteCssFinalizerOutputPlugin(context: CssFinalizerContext): Plugin;
 export {};

package/dist/core.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-8l464Juk.js");
-const require_precheck = require("./precheck-CZHcFX8k.js");
+const require_precheck = require("./precheck-CfyWVL3l.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 { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-DCresEiu.mjs";
+import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-CL0BmEi5.mjs";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });

package/dist/{generator-CRORPkpW.js → generator-BTf14-zB.js}

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

package/dist/{generator-C9H44wEF.mjs → generator-BjB20Esq.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-BBvwlLWp.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-B1AJfKB1.js");
+const require_generator = require("./generator-BTf14-zB.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-BBvwlLWp.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-BjB20Esq.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-B4EXHHii.js");
-const require_precheck = require("./precheck-CZHcFX8k.js");
-const require_tailwindcss = require("./tailwindcss-CN0K7G-l.js");
-const require_source_candidates = require("./source-candidates-BvbvkIPP.js");
+const require_v3_engine = require("./v3-engine-B1AJfKB1.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-DtYQ57bs.js");
+const require_precheck = require("./precheck-CfyWVL3l.js");
+const require_tailwindcss = require("./tailwindcss-CSdlV4y2.js");
+const require_source_candidates = require("./source-candidates-bTqXER8H.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-DoKrMrEh.mjs";
-import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-DCresEiu.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-7k0LFa12.mjs";
-import { t as createSourceCandidateCollector } from "./source-candidates-CK70jGo7.mjs";
+import { F as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-BBvwlLWp.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-Dten3guT.mjs";
+import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-CL0BmEi5.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-CJ487R7-.mjs";
+import { t as createSourceCandidateCollector } from "./source-candidates-D9iHMeLE.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";

package/dist/{incremental-runtime-class-set-B4EXHHii.js → incremental-runtime-class-set-DtYQ57bs.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-CZHcFX8k.js");
-const require_tailwindcss = require("./tailwindcss-CN0K7G-l.js");
+const require_v3_engine = require("./v3-engine-B1AJfKB1.js");
+const require_generator = require("./generator-BTf14-zB.js");
+const require_precheck = require("./precheck-CfyWVL3l.js");
+const require_tailwindcss = require("./tailwindcss-CSdlV4y2.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,45 @@ 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 splitGeneratorPlaceholderCssBySourceOrder(rawSource, rawTailwindCss) {
+	const match = GENERATOR_PLACEHOLDER_MARKER_RE.exec(rawSource);
+	if (!match || match.index === void 0) return;
+	let afterStart = match.index + match[0].length;
+	while (/\s/.test(rawSource[afterStart] ?? "")) afterStart++;
+	if (rawTailwindCss && rawSource.slice(afterStart).startsWith(rawTailwindCss)) {
+		afterStart += rawTailwindCss.length;
+		while (/\s/.test(rawSource[afterStart] ?? "")) afterStart++;
+	}
+	return {
+		before: rawSource.slice(0, match.index),
+		after: rawSource.slice(afterStart)
+	};
+}
+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, "");
@@ -75,6 +107,7 @@ const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE = /^\s*@(?:theme|utility|variant|custom-variant)\b[\s\S]*$/;
+const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
 function parseImportRequest(params) {
 	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
 }
@@ -131,7 +164,7 @@ function extractTailwindDirectiveLines(rawSource, options = {}) {
 	for (const line of stripGeneratorPlaceholderMarkers(rawSource).split(/\r?\n/)) {
 		const trimmed = line.trim();
 		if (!trimmed || trimmed.startsWith("//")) continue;
-		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE.exec(line)?.[0];
+		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE.exec(line)?.[0];
 		if (!directive) continue;
 		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
 		const normalizedTrimmed = normalized.trim();
@@ -1456,6 +1489,57 @@ function createStableJson(value) {
 function createLegacyCompatTransformCacheKey(source, options) {
 	return `${createStableJson(options)}\0${source}`;
 }
+function countUnclosedBlocks(source) {
+	let depth = 0;
+	let quote;
+	let inComment = false;
+	let escaped = false;
+	for (let index = 0; index < source.length; index += 1) {
+		const char = source[index];
+		const next = source[index + 1];
+		if (inComment) {
+			if (char === "*" && next === "/") {
+				inComment = false;
+				index += 1;
+			}
+			continue;
+		}
+		if (quote) {
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+			if (char === "\\") {
+				escaped = true;
+				continue;
+			}
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "/" && next === "*") {
+			inComment = true;
+			index += 1;
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "{") depth += 1;
+		else if (char === "}" && depth > 0) depth -= 1;
+	}
+	return depth;
+}
+function closeTrailingUnclosedBlocks(source) {
+	try {
+		postcss.default.parse(source);
+		return source;
+	} catch (error) {
+		if (error.reason !== "Unclosed block") return source;
+		const unclosedBlocks = countUnclosedBlocks(source);
+		return unclosedBlocks > 0 ? `${source}${"}".repeat(unclosedBlocks)}` : source;
+	}
+}
 function removeTailwindApplyRules(rawSource) {
 	try {
 		const root = postcss.default.parse(rawSource);
@@ -1477,7 +1561,7 @@ function removeTailwindApplyRules(rawSource) {
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
 	if (cached !== void 0) return cached;
-	const resolved = removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(removeTailwindSourceDirectives(stripTailwindBanners(rawSource))));
+	const resolved = closeTrailingUnclosedBlocks(removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(removeTailwindSourceDirectives(closeTrailingUnclosedBlocks(stripTailwindBanners(rawSource))))));
 	setLimitedCacheValue(legacyCompatSourceCache, rawSource, resolved);
 	return resolved;
 }
@@ -1635,6 +1719,55 @@ 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 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, "");
+}
+function stripLeadingTailwindSourceMediaCloseFragment(source) {
+	return source.replace(/^\s*\}\s*(?:\n|$)/, "");
+}
+function stripUnmatchedTailwindSourceMediaCloseFragments(source) {
+	try {
+		postcss.default.parse(source);
+		return source;
+	} catch {
+		return stripLeadingTailwindSourceMediaCloseFragment(source).replace(/\s*\}\s*$/, "");
+	}
+}
+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 placeholderParts = splitGeneratorPlaceholderCssBySourceOrder(rawSource, rawTailwindCss);
+	if (placeholderParts) return placeholderParts;
+	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(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
+	if (cleanedSource.trim().length === 0) return "";
+	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedSource) : cleanedSource)), { importFallback: options.importFallback }));
+	if (userSource.trim().length === 0) return "";
+	if (isCommentOnlyCss(userSource)) return userSource;
+	if (options.generatorTarget !== "weapp") return userSource;
+	const { css } = await options.styleHandler(userSource, {
+		...options.generatorStyleOptions,
+		...options.cssUserHandlerOptions
+	});
+	return removeUnsupportedMiniProgramAtRules(css);
+}
 function isPureLocalCssImportWrapper(css) {
 	let hasImport = false;
 	try {
@@ -1691,7 +1824,7 @@ async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, getSourceCandidatesForEntries, styleHandler, debug } = options;
 	const generatorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator);
 	const majorVersion = runtimeState.twPatcher.majorVersion;
-	const effectiveRawSource = normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback });
+	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: generatorOptions.target === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -1756,29 +1889,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 +1918,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 || generated.target === "web") return {
 			css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
 			target: generated.target,
 			source: "generator",