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

package/dist/{bundle-state-ClSg28Qk.js → bundle-state-DDgxuERW.js}

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

package/dist/{bundle-state-CrhkNTsw.mjs → bundle-state-YW-zLcsc.mjs}

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

package/dist/bundlers/shared/css-cleanup/root-cleanups.d.ts

@@ -2,3 +2,4 @@ import type postcss from 'postcss';
 export declare function removeSpecificityPlaceholders(root: postcss.Root): void;
 export declare function removeUnsupportedBrowserSelectors(root: postcss.Root): void;
 export declare function removeDisplayP3Declarations(root: postcss.Root): void;
+export declare function removeUnsupportedModernColorDeclarations(root: postcss.Root): void;

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

@@ -12,6 +12,10 @@ export declare function splitTailwindV4GeneratedCssBySourceOrder(rawSource: stri
     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;

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, splitTailwindGeneratedCssByBanner, splitTailwindV4GeneratedCss, splitTailwindV4GeneratedCssBySourceOrder, 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-GcUdX1BX.js");
+const require_precheck = require("./precheck-CZfnh4T6.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-DMXLnfTN.mjs";
+import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-CX-5VqM1.mjs";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 //#region src/core.ts
 const DEFAULT_MAIN_CHUNK_STYLE_OPTIONS = Object.freeze({ isMainChunk: true });

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

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

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

@@ -1,4 +1,4 @@
-import { C as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-qoWtwjIj.mjs";
+import { C as createTailwindV4Engine, i as createTailwindV3Engine, n as resolveTailwindV3SourceFromPatcher, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-CCxDqZ8e.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-v__n8_Sd.js");
-const require_generator = require("./generator-CImaTibB.js");
+const require_v3_engine = require("./v3-engine-BRInt2DS.js");
+const require_generator = require("./generator-BIEhxFdv.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-qoWtwjIj.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-DSMdL4vg.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-CCxDqZ8e.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromPatcher, r as resolveTailwindSourceFromPatcher, t as createWeappTailwindcssGenerator } from "./generator-Ber8UVgv.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-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");
+const require_v3_engine = require("./v3-engine-BRInt2DS.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CfznDtJ0.js");
+const require_precheck = require("./precheck-CZfnh4T6.js");
+const require_tailwindcss = require("./tailwindcss-BVoa7vx-.js");
+const require_source_candidates = require("./source-candidates-BDyoPviV.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-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 { F as createDebug, _ as resolveViteSourceScanEntries, l as getRuntimeClassSetSignature } from "./v3-engine-CCxDqZ8e.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-DC0RsBbK.mjs";
+import { _ as ensureRuntimeClassSet, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, t as shouldSkipJsTransform } from "./precheck-CX-5VqM1.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-D74Wk4ys.mjs";
+import { t as createSourceCandidateCollector } from "./source-candidates-DGlDzkvf.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";

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

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-8l464Juk.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");
+const require_v3_engine = require("./v3-engine-BRInt2DS.js");
+const require_generator = require("./generator-BIEhxFdv.js");
+const require_precheck = require("./precheck-CZfnh4T6.js");
+const require_tailwindcss = require("./tailwindcss-BVoa7vx-.js");
 let node_fs = require("node:fs");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
@@ -11,6 +11,7 @@ node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let tailwindcss_patch = require("tailwindcss-patch");
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 //#region src/bundlers/shared/generator-css/markers.ts
 const TAILWIND_V4_BANNER_RE = /\/\*!\s*tailwindcss v4\./;
 const TAILWIND_GENERATED_CSS_MARKER_RE = /\/\*!\s*tailwindcss v|@property\s+--tw-|--tw-|:not\(#\\#\)|\.[^,{]*(?:\\:|\\\[|\\#)|(?::host|page|\.tw-root|wx-root-portal-content)[^{]*\{[^}]*--(?:color|spacing|text|font-weight|radius)-/;
@@ -43,6 +44,20 @@ function splitTailwindV4GeneratedCssBySourceOrder(rawSource, rawTailwindCss) {
 		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;
@@ -93,6 +108,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];
 }
@@ -149,7 +165,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();
@@ -572,8 +588,19 @@ function removeDisplayP3Declarations(root) {
 			removeEmptyAtRuleAncestors(parent);
 		}
 	});
+}
+function removeUnsupportedModernColorDeclarations(root) {
+	const customPropertyValues = /* @__PURE__ */ new Map();
 	root.walkDecls((decl) => {
-		if (isDisplayP3Declaration(decl)) removeDeclarationAndEmptyRule(decl);
+		if (decl.prop.startsWith("--")) customPropertyValues.set(decl.prop, decl.value.trim());
+	});
+	root.walkDecls((decl) => {
+		const normalized = (0, _weapp_tailwindcss_postcss.normalizeModernColorValue)(decl.value, customPropertyValues);
+		if (normalized.changed) {
+			decl.value = normalized.value;
+			if (decl.prop.startsWith("--")) customPropertyValues.set(decl.prop, decl.value.trim());
+		}
+		if (normalized.hasUnsupported) removeDeclarationAndEmptyRule(decl);
 	});
 }
 //#endregion
@@ -588,6 +615,7 @@ const PREFLIGHT_RESET_PROPS = new Set([
 	"padding"
 ]);
 const CONTENT_VAR_RE = /var\(\s*--tw-content\b/;
+const HOIST_ANCHOR_COMMENT = "__weapp_tailwindcss_base_anchor__";
 function isMiniProgramThemeScopeSelector$1(selectors) {
 	return selectors.length > 0 && selectors.every((selector) => MINI_PROGRAM_THEME_SCOPE_SELECTORS$1.has(selector));
 }
@@ -705,11 +733,27 @@ function getTopDirectiveTail(root) {
 	}
 	return tail;
 }
-function insertHoistedRules(root, rules) {
-	if (rules.length === 0) return;
+function createHoistInsertionAnchor(root) {
+	for (const node of root.nodes ?? []) if (isTailwindPreflightRule(node) || isMiniProgramThemeVariableRule(node)) {
+		const anchor = postcss.default.comment({ text: HOIST_ANCHOR_COMMENT });
+		node.before(anchor);
+		return anchor;
+	}
+}
+function insertHoistedRules(root, rules, anchor) {
+	if (anchor && !anchor.parent) anchor = void 0;
+	if (rules.length === 0) {
+		anchor?.remove();
+		return;
+	}
 	const topDirectiveTail = getTopDirectiveTail(root);
 	const firstRule = rules[0];
 	if (!firstRule) return;
+	if (anchor) {
+		firstRule.raws.before = anchor.raws.before;
+		anchor.replaceWith(rules);
+		return;
+	}
 	firstRule.raws.before = topDirectiveTail ? "\n" : "";
 	if (topDirectiveTail) topDirectiveTail.after(rules);
 	else root.prepend(rules);
@@ -723,13 +767,15 @@ function finalizeMiniProgramCssRoot(root, options = {}) {
 	removeSpecificityPlaceholders(root);
 	removeUnsupportedBrowserSelectors(root);
 	removeDisplayP3Declarations(root);
+	removeUnsupportedModernColorDeclarations(root);
+	const hoistAnchor = createHoistInsertionAnchor(root);
 	const preflightRules = collectPreflightRules(root, options);
 	if (preflightRules.length === 0) {
 		const resetRule = createPreflightResetRule(options.cssPreflight);
 		if (resetRule) preflightRules.push(resetRule);
 	}
 	const themeRule = collectThemeVariableRule(root, options);
-	insertHoistedRules(root, themeRule ? [...preflightRules, themeRule] : preflightRules);
+	insertHoistedRules(root, themeRule ? [...preflightRules, themeRule] : preflightRules, hoistAnchor);
 }
 function unwrapTailwindSourceMedia(root) {
 	root.walkAtRules("media", (atRule) => {
@@ -1474,6 +1520,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);
@@ -1495,7 +1592,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;
 }
@@ -1610,10 +1707,10 @@ function inheritLegacyUnitConvertedDeclarations(css, legacyCss) {
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
-function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight) {
+function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
 	return finalizeMiniProgramCss(css, {
-		cssPreflight: majorVersion === 4 ? cssPreflight : void 0,
+		cssPreflight: majorVersion === 4 && options.injectPreflight !== false ? cssPreflight : void 0,
 		preservePseudoContentInit: majorVersion === 3
 	});
 }
@@ -1661,6 +1758,20 @@ function isCommentOnlyCss(source) {
 		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;
@@ -1668,19 +1779,21 @@ function createCssSourceOrderAppend(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(source, { importFallback: options.importFallback });
+	const cleanedSource = removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(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, {
+	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
 	});
@@ -1742,7 +1855,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,
@@ -1800,7 +1913,7 @@ async function generateCssByGenerator(options) {
 		if (typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = stripTailwindBanner(generated.incrementalCss);
 			return {
-				css: incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight)) : options.previousCss,
+				css: incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: false })) : options.previousCss,
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -1836,7 +1949,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 (hasMatchedCssSourceFile) return {
+		if (hasMatchedCssSourceFile || generated.target === "web") return {
 			css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
 			target: generated.target,
 			source: "generator",