weapp-tailwindcss 5.0.12 → 5.0.13

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

@@ -4,13 +4,13 @@ Object.defineProperties(exports, {
 });
 const require_watch_dependencies = require("./watch-dependencies-bpG6kmAf.js");
 let node_buffer = require("node:buffer");
-let node_process = require("node:process");
-node_process = require_watch_dependencies.__toESM(node_process);
-let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let node_fs = require("node:fs");
 node_fs = require_watch_dependencies.__toESM(node_fs);
 let node_path = require("node:path");
 node_path = require_watch_dependencies.__toESM(node_path);
+let node_process = require("node:process");
+node_process = require_watch_dependencies.__toESM(node_process);
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let node_util = require("node:util");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let tailwindcss_patch = require("tailwindcss-patch");
@@ -2943,6 +2943,7 @@ function readStaticConfigContent(configPath) {
 //#endregion
 //#region src/bundlers/vite/source-scan/css-entries.ts
 const VITE_SOURCE_CANDIDATE_PATTERN = FULL_SOURCE_SCAN_PATTERN;
+const tailwindConfigCssEntriesCache = /* @__PURE__ */ new Map();
 function parseImportSourceParam(params) {
 	const match = /\bsource\(\s*(none|(['"])(.*?)\2)\s*\)/.exec(params);
 	if (!match) return;
@@ -2969,6 +2970,44 @@ function resolveConfigPath(base, configPath) {
 	if (node_path.default.isAbsolute(configPath)) return node_path.default.resolve(configPath);
 	return node_path.default.resolve(base, configPath);
 }
+function createCssEntriesCacheKey(css, base, dependencies) {
+	return JSON.stringify({
+		base: node_path.default.resolve(base),
+		css,
+		dependencies
+	});
+}
+function createDependencyExcludeEntries(files) {
+	return [...files].map((file) => ({
+		base: node_path.default.dirname(file),
+		negated: true,
+		pattern: node_path.default.basename(file)
+	}));
+}
+async function statConfigDependency(file) {
+	try {
+		const stats = await (0, node_fs_promises.stat)(file);
+		return {
+			file,
+			mtimeMs: stats.mtimeMs,
+			size: stats.size
+		};
+	} catch {
+		return {
+			file,
+			mtimeMs: -1,
+			size: -1
+		};
+	}
+}
+async function collectConfigDependencySignatures(root, base) {
+	const configPaths = /* @__PURE__ */ new Set();
+	root.walkAtRules("config", (rule) => {
+		const configPath = parseConfigParam$1(rule.params);
+		if (configPath) configPaths.add(resolveConfigPath(base, configPath));
+	});
+	return Promise.all([...configPaths].sort().map(statConfigDependency));
+}
 async function resolveConfigContentEntries(root, base) {
 	const configPaths = /* @__PURE__ */ new Set();
 	root.walkAtRules("config", (rule) => {
@@ -3051,6 +3090,32 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 		dependencies: configEntries.dependencies
 	} : void 0;
 }
+async function resolveTailwindConfigEntriesFromCssCached(css, base) {
+	let root;
+	try {
+		root = _weapp_tailwindcss_postcss.postcss.parse(css);
+	} catch {
+		return;
+	}
+	const dependencies = await collectConfigDependencySignatures(root, base);
+	if (dependencies.length === 0) return;
+	const cacheKey = createCssEntriesCacheKey(css, base, dependencies);
+	const cached = tailwindConfigCssEntriesCache.get(cacheKey);
+	if (cached) return cached;
+	const task = resolveConfigContentEntries(root, base).then((resolved) => {
+		return {
+			entries: [...resolved.entries, ...createDependencyExcludeEntries(resolved.dependencies)],
+			explicit: true,
+			inlineCandidates: {
+				excluded: /* @__PURE__ */ new Set(),
+				included: /* @__PURE__ */ new Set()
+			},
+			dependencies: resolved.dependencies
+		};
+	});
+	tailwindConfigCssEntriesCache.set(cacheKey, task);
+	return task;
+}
 //#endregion
 //#region src/tailwindcss/runtime/cache.ts
 const runtimeSignaturePatchersSymbol = Symbol.for("weapp-tailwindcss.runtimeSignaturePatchers");
@@ -3772,22 +3837,45 @@ function isUniAppXEnabled(option) {
 //#region src/context/style-options.ts
 function resolveStyleOptionsFromContext(ctx) {
 	const resolvedUniAppXOptions = resolveUniAppXOptions(ctx.uniAppX);
+	const hasCssOptions = ctx.cssOptions !== void 0;
+	const cssOptions = {
+		cssPreflight: ctx.cssOptions?.cssPreflight ?? ctx.cssPreflight,
+		cssPreflightRange: ctx.cssOptions?.cssPreflightRange ?? ctx.cssPreflightRange,
+		cssChildCombinatorReplaceValue: ctx.cssOptions?.cssChildCombinatorReplaceValue ?? ctx.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: ctx.cssOptions?.cssSelectorReplacement ?? ctx.cssSelectorReplacement,
+		rem2rpx: ctx.cssOptions?.rem2rpx ?? ctx.rem2rpx,
+		cssRemoveProperty: ctx.cssOptions?.cssRemoveProperty ?? ctx.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: ctx.cssOptions?.cssRemoveHoverPseudoClass ?? ctx.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: ctx.cssOptions?.tailwindcssV4GradientFallback ?? ctx.tailwindcssV4GradientFallback,
+		cssPresetEnv: ctx.cssOptions?.cssPresetEnv ?? ctx.cssPresetEnv,
+		atRules: ctx.cssOptions?.atRules ?? ctx.atRules,
+		autoprefixer: ctx.cssOptions?.autoprefixer ?? ctx.autoprefixer,
+		cssCalc: ctx.cssOptions?.cssCalc ?? ctx.cssCalc,
+		platform: ctx.cssOptions?.platform ?? ctx.platform,
+		px2rpx: ctx.cssOptions?.px2rpx ?? ctx.px2rpx,
+		unitsToPx: ctx.cssOptions?.unitsToPx ?? ctx.unitsToPx,
+		unitConversion: ctx.cssOptions?.unitConversion ?? ctx.unitConversion,
+		injectAdditionalCssVarScope: ctx.cssOptions?.injectAdditionalCssVarScope ?? ctx.injectAdditionalCssVarScope
+	};
 	return {
-		cssPreflight: ctx.cssPreflight,
-		cssPreflightRange: ctx.cssPreflightRange,
-		cssChildCombinatorReplaceValue: ctx.cssChildCombinatorReplaceValue,
-		cssSelectorReplacement: ctx.cssSelectorReplacement,
-		rem2rpx: ctx.rem2rpx,
-		cssRemoveProperty: ctx.cssRemoveProperty,
-		cssRemoveHoverPseudoClass: ctx.cssRemoveHoverPseudoClass,
-		cssPresetEnv: ctx.cssPresetEnv,
-		autoprefixer: ctx.autoprefixer,
-		cssCalc: ctx.cssCalc,
+		cssPreflight: cssOptions.cssPreflight,
+		cssPreflightRange: cssOptions.cssPreflightRange,
+		cssChildCombinatorReplaceValue: cssOptions.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: cssOptions.cssSelectorReplacement,
+		rem2rpx: cssOptions.rem2rpx,
+		...hasCssOptions ? { cssOptions } : {},
+		cssRemoveProperty: cssOptions.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: cssOptions.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: cssOptions.tailwindcssV4GradientFallback,
+		cssPresetEnv: cssOptions.cssPresetEnv,
+		atRules: cssOptions.atRules,
+		autoprefixer: cssOptions.autoprefixer,
+		cssCalc: cssOptions.cssCalc,
 		uniAppX: resolvedUniAppXOptions.enabled,
-		platform: ctx.platform,
-		px2rpx: ctx.px2rpx,
-		unitsToPx: ctx.unitsToPx,
-		unitConversion: ctx.unitConversion
+		platform: cssOptions.platform,
+		px2rpx: cssOptions.px2rpx,
+		unitsToPx: cssOptions.unitsToPx,
+		unitConversion: cssOptions.unitConversion
 	};
 }
 //#endregion
@@ -3797,7 +3885,8 @@ function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight
 	return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
 		cssPreflight: majorVersion === 4 && options.injectPreflight !== false ? cssPreflight : void 0,
 		isTailwindcssV4: majorVersion === 4,
-		preservePseudoContentInit: majorVersion === 3
+		preservePseudoContentInit: majorVersion === 3,
+		tailwindcssV4GradientFallback: options.styleOptions?.cssOptions?.tailwindcssV4GradientFallback ?? options.styleOptions?.tailwindcssV4GradientFallback
 	});
 }
 function shouldInjectMiniProgramPreflightForGeneratorCss(opts, options) {
@@ -3806,12 +3895,24 @@ function shouldInjectMiniProgramPreflightForGeneratorCss(opts, options) {
 	return isUniAppXEnabled(opts.uniAppX) && Boolean(options.localImports?.trim());
 }
 function mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtime, options) {
-	if (options.isolateCssSource && options.currentCssCandidates?.length) return new Set([...scopedRuntime, ...options.currentCssCandidates]);
-	if (runtime.size === 0 || !options.cssHandlerOptions.isMainChunk || options.matchedCssSourceFile || options.isolateCssSource && scopedRuntime.size === 0) return scopedRuntime;
+	if (options.majorVersion === 3 && !options.isolateCssSource) return new Set([
+		...scopedRuntime,
+		...runtime,
+		...options.currentCssCandidates ?? []
+	]);
+	if (options.isolateCssSource) {
+		if (options.matchedCssSourceFile) return new Set([...scopedRuntime, ...options.currentCssCandidates ?? []]);
+		return new Set([...scopedRuntime, ...options.currentCssCandidates ?? []]);
+	}
+	if (runtime.size === 0 || !options.cssHandlerOptions.isMainChunk) return scopedRuntime;
 	return new Set([...scopedRuntime, ...runtime]);
 }
-function shouldIsolateScopedCssSource(source, sourceEntries) {
-	return Boolean(source.__weappTailwindcssMeta?.matchedCssSourceFile) || sourceEntries !== void 0 && sourceEntries.length > 0;
+function shouldIsolateScopedCssSource(majorVersion, source, sourceEntries, options) {
+	if (options.target !== "weapp") return false;
+	if (source.__weappTailwindcssMeta?.isolateCssSource) return true;
+	if (source.__weappTailwindcssMeta?.matchedCssSourceFile && (sourceEntries?.length ?? 0) > 0) return true;
+	if (sourceEntries?.length === 0) return false;
+	return (majorVersion === 3 || majorVersion === 4) && sourceEntries !== void 0 && options.cssHandlerOptions?.isMainChunk !== true;
 }
 function shouldIsolateCurrentTailwindV4CssCandidates(majorVersion, cssHandlerOptions, options) {
 	return majorVersion === 4 && !cssHandlerOptions.isMainChunk && hasTailwindApplyDirective(options.rawSource) && !hasTailwindRootDirectives(options.rawSource) && !options.hasGeneratedCss && !options.hasGeneratedMarkers;
@@ -3829,13 +3930,13 @@ function isEmptyCssSourceOrderParts(parts) {
 	return parts.before.trim().length === 0 && parts.after.trim().length === 0;
 }
 function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
+	const resolvedStyleOptions = resolveStyleOptionsFromContext(opts);
 	const preflightStyleOptions = {
-		cssPreflight: opts.cssPreflight,
-		cssPreflightRange: opts.cssPreflightRange
+		cssPreflight: resolvedStyleOptions.cssPreflight,
+		cssPreflightRange: resolvedStyleOptions.cssPreflightRange
 	};
 	return {
-		...resolveStyleOptionsFromContext(opts),
-		atRules: opts.atRules,
+		...resolvedStyleOptions,
 		uniAppXCssTarget: opts.uniAppXCssTarget,
 		uniAppXUnsupported: opts.uniAppXUnsupported,
 		...cssHandlerOptions,
@@ -3859,9 +3960,9 @@ function splitRawSourceByGeneratedCssOrder(rawSource, rawTailwindCss) {
 	if (exactParts) return exactParts;
 	return splitTailwindGeneratedCssByBanner(rawSource);
 }
-function shouldUseGeneratorForCurrentCss(majorVersion, cssHandlerOptions, options) {
+function shouldUseGeneratorForCurrentCss(_majorVersion, cssHandlerOptions, options) {
 	const hasApplyDirectives = hasTailwindApplyDirective(options.rawSource);
-	return options.hasGeneratedCss || options.hasGeneratedMarkers || options.hasSourceDirectives || majorVersion === 4 && hasApplyDirectives || cssHandlerOptions.isMainChunk;
+	return options.hasGeneratedCss || options.hasGeneratedMarkers || options.hasSourceDirectives || hasApplyDirectives || cssHandlerOptions.isMainChunk;
 }
 function createRuntimeWithCurrentCssCandidates(runtime, currentCssCandidates, isolateCurrentCssCandidates) {
 	return isolateCurrentCssCandidates ? new Set(currentCssCandidates) : currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
@@ -4378,98 +4479,53 @@ function extractStyleDirectiveSources(source) {
 	let match = SFC_STYLE_BLOCK_RE.exec(source);
 	while (match !== null) {
 		const styleSource = match[1] ?? "";
-		if (hasTailwindSourceDirectives(styleSource)) styleSources.push(styleSource);
+		if (hasTailwindSourceDirectives(styleSource, { importFallback: true })) styleSources.push(styleSource);
 		match = SFC_STYLE_BLOCK_RE.exec(source);
 	}
 	if (styleSources.length > 0) return styleSources;
-	return hasTailwindSourceDirectives(source) ? [source] : [];
+	return hasTailwindSourceDirectives(source, { importFallback: true }) ? [source] : [];
 }
 function resolveSourceSideCssEntrySource(file, sourceOptions, resolveOptions = {}) {
-	for (const sourceFile of createSourceStylePathCandidates(file, sourceOptions)) {
-		if (!(0, node_fs.existsSync)(sourceFile)) continue;
-		try {
-			const source = (0, node_fs.readFileSync)(sourceFile, "utf8");
-			for (const styleSource of extractStyleDirectiveSources(source)) {
-				const cssEntrySource = resolveCssEntrySource(styleSource, node_path.default.dirname(sourceFile), resolveOptions);
-				if (cssEntrySource) return {
-					...cssEntrySource,
-					file: sourceFile
-				};
-			}
-		} catch {
-			continue;
+	for (const sourceFile of createSourceStylePathCandidates(file, sourceOptions)) try {
+		const source = sourceOptions.sourceFile && node_path.default.resolve(sourceOptions.sourceFile) === node_path.default.resolve(sourceFile) && typeof sourceOptions.sourceCss === "string" ? sourceOptions.sourceCss : (0, node_fs.existsSync)(sourceFile) ? (0, node_fs.readFileSync)(sourceFile, "utf8") : void 0;
+		if (source === void 0) continue;
+		for (const styleSource of extractStyleDirectiveSources(source)) {
+			const cssEntrySource = resolveCssEntrySource(styleSource, node_path.default.dirname(sourceFile), resolveOptions);
+			if (cssEntrySource) return {
+				...cssEntrySource,
+				file: sourceFile
+			};
 		}
+	} catch {
+		continue;
 	}
 }
 //#endregion
-//#region src/bundlers/shared/generator-css/source-resolver.ts
-function resolvePostcssFromOption(cssHandlerOptions) {
-	const from = cssHandlerOptions.postcssOptions?.options?.from;
-	return typeof from === "string" && from.length > 0 ? from : void 0;
-}
-function resolvePostcssSourceFile(cssHandlerOptions) {
-	const from = resolvePostcssFromOption(cssHandlerOptions);
-	if (!from || !node_path.default.isAbsolute(from)) return;
-	return from.replace(/[?#].*$/, "");
-}
-function resolveCssHandlerSourceOptions(cssHandlerOptions) {
-	return cssHandlerOptions.sourceOptions;
-}
-function createCssEntrySources(cssEntries) {
-	return cssEntries?.filter((entry) => typeof entry === "string" && entry.length > 0 && node_path.default.isAbsolute(entry)).map((entry) => ({ file: node_path.default.resolve(entry) }));
-}
-function mergeCssSources(cssSources, cssEntrySources) {
-	const merged = [];
-	const seenFiles = /* @__PURE__ */ new Set();
-	const addSource = (cssSource) => {
-		const file = typeof cssSource.file === "string" && cssSource.file.length > 0 ? node_path.default.resolve(cssSource.file) : void 0;
-		if (file) {
-			if (seenFiles.has(file)) return;
-			seenFiles.add(file);
-		}
-		merged.push(cssSource);
-	};
-	for (const cssSource of cssSources ?? []) addSource(cssSource);
-	for (const cssSource of cssEntrySources ?? []) addSource(cssSource);
-	return merged.length > 0 ? merged : void 0;
-}
-function createSingleTailwindV4SourceOptions(sourceOptions, options) {
-	return omitUndefined({
-		projectRoot: sourceOptions.projectRoot,
-		baseFallbacks: sourceOptions.baseFallbacks,
-		packageName: sourceOptions.packageName,
-		base: options.base,
-		css: options.css
-	});
+//#region src/bundlers/shared/generator-css/source-resolver/apply-reference.ts
+function createTailwindV4ApplyReferenceSource(css, sourceOptions) {
+	if (!hasTailwindApplyDirective(css) || hasTailwindRootDirectives(css)) return css;
+	const utilities = collectTailwindApplyUtilities(css);
+	return [
+		`@import "${sourceOptions.packageName ?? "tailwindcss"}" source(none);`,
+		utilities.length > 0 ? `@source inline(${JSON.stringify(utilities.join(" "))});` : void 0,
+		css
+	].filter(Boolean).join("\n");
 }
-async function resolveTailwindV4CssEntrySource(cssEntry, sourceOptions) {
-	const { cssEntries: _cssEntries, cssSources: _cssSources, ...singleEntrySourceOptions } = sourceOptions;
-	if (!(0, node_fs.existsSync)(cssEntry)) return resolveTailwindV4Source({
-		...omitUndefined(singleEntrySourceOptions),
-		cssEntries: [cssEntry]
-	});
-	const css = (0, node_fs.readFileSync)(cssEntry, "utf8");
-	const base = node_path.default.dirname(node_path.default.resolve(cssEntry));
-	const entrySource = resolveCssEntrySource(css, base, { removeConfig: false });
-	const config = resolveExistingConfigPath(entrySource?.config, entrySource?.configRequest, cssEntry, {
-		...sourceOptions,
-		sourceFile: sourceOptions.sourceFile ?? cssEntry
-	});
-	return withGeneratorSourceMetadata(await resolveTailwindV4Source({
-		...omitUndefined(singleEntrySourceOptions),
-		base,
-		css: normalizeConfigDirective(css, config),
-		cssEntries: [cssEntry]
-	}), {
-		matchedCssSourceFile: cssEntry,
-		sourceBase: base,
-		sourceCss: css
+function collectTailwindApplyUtilities(css) {
+	let root;
+	try {
+		root = _weapp_tailwindcss_postcss.postcss.parse(css);
+	} catch {
+		return [];
+	}
+	const utilities = /* @__PURE__ */ new Set();
+	root.walkAtRules("apply", (rule) => {
+		for (const utility of (0, tailwindcss_patch.splitCandidateTokens)(rule.params)) utilities.add(utility);
 	});
+	return [...utilities].sort();
 }
-function resolveCssSourceBase(file, cssHandlerOptions) {
-	const normalized = (resolvePostcssFromOption(cssHandlerOptions) ?? file).replace(/[?#].*$/, "");
-	return node_path.default.dirname(node_path.default.resolve(normalized));
-}
+//#endregion
+//#region src/bundlers/shared/generator-css/source-resolver/config.ts
 function resolveExistingConfigPath(config, configRequest, file, sourceOptions) {
 	if (config && (0, node_fs.existsSync)(config)) return config;
 	if (!configRequest || node_path.default.isAbsolute(configRequest)) return sourceOptions.config;
@@ -4496,20 +4552,8 @@ function resolveExistingConfigPath(config, configRequest, file, sourceOptions) {
 	for (const candidate of configCandidates) if ((0, node_fs.existsSync)(candidate)) return candidate;
 	return sourceOptions.config;
 }
-function canResolveSourceSideCssEntry(file, cssHandlerOptions, sourceOptions) {
-	const from = resolvePostcssFromOption(cssHandlerOptions);
-	if (!from || !node_path.default.isAbsolute(from)) return node_path.default.isAbsolute(file) || Boolean(sourceOptions?.sourceFile) || Boolean(sourceOptions?.cssSources?.length);
-	return true;
-}
-function shouldResolveSourceSideCssEntry(rawSource) {
-	return rawSource.includes("@apply") || hasTailwindRootDirectives(rawSource, { importFallback: true }) || hasTailwindSourceDirectives(rawSource, { importFallback: true }) || hasTailwindGeneratedCss(rawSource) || hasTailwindGeneratedCssMarkers(rawSource);
-}
-function shouldPreferTailwindV3SourceSideEntry(rawSource, sourceSideEntrySource) {
-	return Boolean(sourceSideEntrySource) && !hasTailwindSourceDirectives(rawSource, { importFallback: true });
-}
-function shouldPreferResolvedSourceSideEntry(cssEntrySource, sourceSideEntrySource) {
-	return Boolean(sourceSideEntrySource?.config) && Boolean(cssEntrySource?.configRequest) && (!cssEntrySource?.config || !(0, node_fs.existsSync)(cssEntrySource.config));
-}
+//#endregion
+//#region src/bundlers/shared/generator-css/source-resolver/matching.ts
 function normalizeCssSourceForCompare(css) {
 	return stripGeneratorPlaceholderMarkers(stripTailwindBanners(css)).trim();
 }
@@ -4560,6 +4604,107 @@ function scoreTailwindV4CssSourceFileMatch(file, cssSourceFile, sourceOptions) {
 	else if (sourceBase.endsWith(`/${outputBase}`)) bestScore = Math.max(bestScore, 1e3 + outputBase.length);
 	return bestScore;
 }
+//#endregion
+//#region src/bundlers/shared/generator-css/source-resolver/metadata.ts
+function withGeneratorSourceMetadata(source, metadata) {
+	return {
+		...source,
+		__weappTailwindcssMeta: metadata
+	};
+}
+function withMatchedSourceSideMetadata(source, resolvedEntrySource) {
+	return resolvedEntrySource.file ? withGeneratorSourceMetadata(source, {
+		isolateCssSource: true,
+		matchedCssSourceFile: resolvedEntrySource.file,
+		sourceBase: resolvedEntrySource.base,
+		sourceCss: resolvedEntrySource.css
+	}) : source;
+}
+//#endregion
+//#region src/bundlers/shared/generator-css/source-resolver/postcss-source.ts
+function resolvePostcssFromOption(cssHandlerOptions) {
+	const from = cssHandlerOptions.postcssOptions?.options?.from;
+	return typeof from === "string" && from.length > 0 ? from : void 0;
+}
+function resolvePostcssSourceFile(cssHandlerOptions) {
+	const from = resolvePostcssFromOption(cssHandlerOptions);
+	if (!from || !node_path.default.isAbsolute(from)) return;
+	return from.replace(/[?#].*$/, "");
+}
+function resolveCssHandlerSourceOptions(cssHandlerOptions) {
+	return cssHandlerOptions.sourceOptions;
+}
+function resolveCssSourceBase(file, cssHandlerOptions) {
+	const normalized = (resolvePostcssFromOption(cssHandlerOptions) ?? file).replace(/[?#].*$/, "");
+	return node_path.default.dirname(node_path.default.resolve(normalized));
+}
+//#endregion
+//#region src/bundlers/shared/generator-css/source-resolver.ts
+function createCssEntrySources(cssEntries) {
+	return cssEntries?.filter((entry) => typeof entry === "string" && entry.length > 0 && node_path.default.isAbsolute(entry)).map((entry) => ({ file: node_path.default.resolve(entry) }));
+}
+function mergeCssSources(cssSources, cssEntrySources) {
+	const merged = [];
+	const seenFiles = /* @__PURE__ */ new Set();
+	const addSource = (cssSource) => {
+		const file = typeof cssSource.file === "string" && cssSource.file.length > 0 ? node_path.default.resolve(cssSource.file) : void 0;
+		if (file) {
+			if (seenFiles.has(file)) return;
+			seenFiles.add(file);
+		}
+		merged.push(cssSource);
+	};
+	for (const cssSource of cssSources ?? []) addSource(cssSource);
+	for (const cssSource of cssEntrySources ?? []) addSource(cssSource);
+	return merged.length > 0 ? merged : void 0;
+}
+function createSingleTailwindV4SourceOptions(sourceOptions, options) {
+	return omitUndefined({
+		projectRoot: sourceOptions.projectRoot,
+		baseFallbacks: sourceOptions.baseFallbacks,
+		packageName: sourceOptions.packageName,
+		base: options.base,
+		css: options.css
+	});
+}
+async function resolveTailwindV4CssEntrySource(cssEntry, sourceOptions) {
+	const { cssEntries: _cssEntries, cssSources: _cssSources, ...singleEntrySourceOptions } = sourceOptions;
+	if (!(0, node_fs.existsSync)(cssEntry)) return resolveTailwindV4Source({
+		...omitUndefined(singleEntrySourceOptions),
+		cssEntries: [cssEntry]
+	});
+	const css = (0, node_fs.readFileSync)(cssEntry, "utf8");
+	const base = node_path.default.dirname(node_path.default.resolve(cssEntry));
+	const entrySource = resolveCssEntrySource(css, base, { removeConfig: false });
+	const config = resolveExistingConfigPath(entrySource?.config, entrySource?.configRequest, cssEntry, {
+		...sourceOptions,
+		sourceFile: sourceOptions.sourceFile ?? cssEntry
+	});
+	return withGeneratorSourceMetadata(await resolveTailwindV4Source({
+		...omitUndefined(singleEntrySourceOptions),
+		base,
+		css: normalizeConfigDirective(css, config),
+		cssEntries: [cssEntry]
+	}), {
+		matchedCssSourceFile: cssEntry,
+		sourceBase: base,
+		sourceCss: css
+	});
+}
+function canResolveSourceSideCssEntry(file, cssHandlerOptions, sourceOptions) {
+	const from = resolvePostcssFromOption(cssHandlerOptions);
+	if (!from || !node_path.default.isAbsolute(from)) return node_path.default.isAbsolute(file) || Boolean(sourceOptions?.sourceFile) || Boolean(sourceOptions?.cssSources?.length);
+	return true;
+}
+function shouldResolveSourceSideCssEntry(rawSource) {
+	return rawSource.includes("@apply") || hasTailwindRootDirectives(rawSource, { importFallback: true }) || hasTailwindSourceDirectives(rawSource, { importFallback: true }) || hasTailwindGeneratedCss(rawSource) || hasTailwindGeneratedCssMarkers(rawSource);
+}
+function shouldPreferTailwindV3SourceSideEntry(rawSource, sourceSideEntrySource) {
+	return Boolean(sourceSideEntrySource) && !hasTailwindSourceDirectives(rawSource, { importFallback: true });
+}
+function shouldPreferResolvedSourceSideEntry(cssEntrySource, sourceSideEntrySource) {
+	return Boolean(sourceSideEntrySource?.config) && (Boolean(cssEntrySource?.configRequest) || !cssEntrySource?.config) && (!cssEntrySource?.config || !(0, node_fs.existsSync)(cssEntrySource.config));
+}
 function resolveMatchingTailwindV4CssEntry(rawSource, file, sourceOptions) {
 	const cssEntries = sourceOptions.cssEntries;
 	if (!cssEntries?.length) return;
@@ -4737,12 +4882,6 @@ async function resolveTailwindV4SourceSideEntrySource(resolvedEntrySource, sourc
 		css
 	})), resolvedEntrySource);
 }
-function withGeneratorSourceMetadata(source, metadata) {
-	return {
-		...source,
-		__weappTailwindcssMeta: metadata
-	};
-}
 function resolveTailwindV3SourceEntries(source) {
 	if (!("version" in source) || source.version !== 3) return;
 	const entries = normalizeLegacyContentEntries(source.configObject?.content, source.cwd, { relativeBase: source.config ? node_path.default.dirname(source.config) : source.cwd });
@@ -4752,35 +4891,6 @@ function withTailwindV3SourceMetadata(source) {
 	const sourceEntries = resolveTailwindV3SourceEntries(source);
 	return sourceEntries ? withGeneratorSourceMetadata(source, { sourceEntries }) : source;
 }
-function withMatchedSourceSideMetadata(source, resolvedEntrySource) {
-	return resolvedEntrySource.file ? withGeneratorSourceMetadata(source, {
-		matchedCssSourceFile: resolvedEntrySource.file,
-		sourceBase: resolvedEntrySource.base,
-		sourceCss: resolvedEntrySource.css
-	}) : source;
-}
-function createTailwindV4ApplyReferenceSource(css, sourceOptions) {
-	if (!hasTailwindApplyDirective(css) || hasTailwindRootDirectives(css)) return css;
-	const utilities = collectTailwindApplyUtilities(css);
-	return [
-		`@import "${sourceOptions.packageName ?? "tailwindcss"}" source(none);`,
-		utilities.length > 0 ? `@source inline(${JSON.stringify(utilities.join(" "))});` : void 0,
-		css
-	].filter(Boolean).join("\n");
-}
-function collectTailwindApplyUtilities(css) {
-	let root;
-	try {
-		root = _weapp_tailwindcss_postcss.postcss.parse(css);
-	} catch {
-		return [];
-	}
-	const utilities = /* @__PURE__ */ new Set();
-	root.walkAtRules("apply", (rule) => {
-		for (const utility of (0, tailwindcss_patch.splitCandidateTokens)(rule.params)) utilities.add(utility);
-	});
-	return [...utilities].sort();
-}
 async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions) {
 	const base = resolveCssSourceBase(file, cssHandlerOptions);
 	const cssEntrySource = resolveCssEntrySource(rawSource, base, {
@@ -4813,15 +4923,19 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 			css: normalizeTailwindV3CssEntrySource(resolvedEntrySource.css),
 			...config ? { config } : {}
 		}));
+		const cssEntrySourceEntries = await resolveTailwindConfigEntriesFromCssCached(rawSource, resolvedEntrySource.base);
+		const sourceMetadata = sourceWithMetadata.__weappTailwindcssMeta;
+		const matchedSourceFile = resolvedEntrySource.file ?? sourceSideEntrySource?.file;
 		return withGeneratorSourceMetadata(sourceWithMetadata, {
-			...sourceWithMetadata.__weappTailwindcssMeta,
-			matchedCssSourceFile: resolvedEntrySource.file
+			...sourceMetadata,
+			matchedCssSourceFile: matchedSourceFile,
+			sourceEntries: cssEntrySourceEntries?.entries ?? sourceMetadata?.sourceEntries
 		});
 	}
 	const sourceOptions = tryResolveTailwindV4SourceOptions(runtimeState);
 	const resolvedSourceOptions = sourceOptions ? omitUndefined({
 		...sourceOptions,
-		sourceFile: resolvePostcssSourceFile(cssHandlerOptions),
+		sourceFile: sourceOptions.sourceFile ?? resolvePostcssSourceFile(cssHandlerOptions),
 		...resolveCssHandlerSourceOptions(cssHandlerOptions),
 		cssEntries: selectionOptions?.cssEntries ?? sourceOptions.cssEntries,
 		cssSources: mergeCssSources(sourceOptions.cssSources, sourceOptions.cssSources?.length ? void 0 : createCssEntrySources(selectionOptions?.cssEntries ?? sourceOptions.cssEntries))
@@ -4835,17 +4949,18 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 		}));
 	}
 	const shouldPreferSourceSideEntry = shouldResolveSourceSideCssEntry(rawSource) || Boolean(cssEntrySource?.css.includes("weapp-tailwindcss generator-placeholder")) && (sourceOptions?.cssEntries?.length ?? 0) <= 1;
-	const sourceSideEntrySource = normalizedSourceOptions && shouldPreferSourceSideEntry && canResolveSourceSideCssEntry(file, cssHandlerOptions, normalizedSourceOptions) ? resolveSourceSideCssEntrySource(file, normalizedSourceOptions, { removeConfig: false }) : void 0;
+	const sourceSideEntrySource = normalizedSourceOptions && (shouldPreferSourceSideEntry || normalizedSourceOptions.sourceFile !== void 0) && canResolveSourceSideCssEntry(file, cssHandlerOptions, normalizedSourceOptions) ? resolveSourceSideCssEntrySource(file, normalizedSourceOptions, { removeConfig: false }) : void 0;
 	const matchedCssEntrySource = normalizedSourceOptions ? await resolveMatchingTailwindV4CssEntry(rawSource, file, normalizedSourceOptions) : void 0;
 	const matchedCssSource = normalizedSourceOptions && !matchedCssEntrySource ? await resolveMatchingTailwindV4CssSource(rawSource, file, cssHandlerOptions, normalizedSourceOptions) : void 0;
 	const candidateMatchedCssSource = normalizedSourceOptions && !matchedCssEntrySource ? await resolveCandidateMatchedTailwindV4CssSource(rawSource, cssHandlerOptions, normalizedSourceOptions, selectionOptions) : void 0;
-	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? await resolveTailwindV4Source(normalizedSourceOptions) : void 0;
+	const singleConfiguredCssSource = normalizedSourceOptions?.cssSources?.length === 1 ? await resolveSingleTailwindV4CssSource(normalizedSourceOptions.cssSources[0], normalizedSourceOptions, { matched: true }) : void 0;
+	const configuredCssSource = normalizedSourceOptions && hasConfiguredTailwindV4CssSource(normalizedSourceOptions) && hasTailwindGeneratedCssMarkers(rawSource) ? matchedCssSource ?? candidateMatchedCssSource ?? singleConfiguredCssSource ?? await resolveTailwindV4Source(normalizedSourceOptions) : void 0;
 	if (configuredCssSource) return generatorOptions?.config ? {
 		...configuredCssSource,
 		css: prependConfigDirective(configuredCssSource.css, generatorOptions.config)
 	} : configuredCssSource;
 	const mainCssEntrySource = normalizedSourceOptions && cssHandlerOptions.isMainChunk && normalizedSourceOptions.cssEntries?.length === 1 ? await resolveTailwindV4CssEntrySource(normalizedSourceOptions.cssEntries[0], normalizedSourceOptions) : void 0;
-	const preferredCssEntrySource = matchedCssEntrySource ?? matchedCssSource ?? candidateMatchedCssSource ?? mainCssEntrySource;
+	const preferredCssEntrySource = matchedCssEntrySource ?? matchedCssSource ?? candidateMatchedCssSource ?? mainCssEntrySource ?? singleConfiguredCssSource;
 	if (preferredCssEntrySource) return generatorOptions?.config ? {
 		...preferredCssEntrySource,
 		css: prependConfigDirective(preferredCssEntrySource.css, generatorOptions.config)
@@ -4885,7 +5000,7 @@ async function resolveGeneratorSources(majorVersion, runtimeState, rawSource, fi
 			sourceFile: resolvePostcssSourceFile(cssHandlerOptions),
 			...resolveCssHandlerSourceOptions(cssHandlerOptions),
 			cssEntries,
-			cssSources: mergeCssSources(sourceOptionsFromPatcher.cssSources, sourceOptionsFromPatcher.cssSources?.length ? void 0 : createCssEntrySources(cssEntries))
+			cssSources: mergeCssSources(mergeCssSources(sourceOptionsFromPatcher.cssSources, selectionOptions?.cssSources), sourceOptionsFromPatcher.cssSources?.length || selectionOptions?.cssSources?.length ? void 0 : createCssEntrySources(cssEntries))
 		});
 	} catch {
 		const resolved = await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions);
@@ -4896,7 +5011,7 @@ async function resolveGeneratorSources(majorVersion, runtimeState, rawSource, fi
 		...matchedCssEntrySource,
 		css: prependConfigDirective(matchedCssEntrySource.css, generatorOptions.config)
 	} : matchedCssEntrySource];
-	const sourceSideCssSource = await resolveTailwindV4SourceSideEntrySource((shouldResolveSourceSideCssEntry(rawSource) || Boolean(cssEntrySource?.css.includes("weapp-tailwindcss generator-placeholder")) && (sourceOptions.cssEntries?.length ?? 0) <= 1) && canResolveSourceSideCssEntry(file, cssHandlerOptions, sourceOptions) ? resolveSourceSideCssEntrySource(file, sourceOptions, { removeConfig: false }) : void 0, sourceOptions, generatorOptions, file);
+	const sourceSideCssSource = await resolveTailwindV4SourceSideEntrySource(canResolveSourceSideCssEntry(file, cssHandlerOptions, sourceOptions) ? resolveSourceSideCssEntrySource(file, sourceOptions, { removeConfig: false }) : void 0, sourceOptions, generatorOptions, file);
 	if (sourceSideCssSource) return [sourceSideCssSource];
 	const matchedCssSource = await resolveMatchingTailwindV4CssSource(rawSource, file, cssHandlerOptions, sourceOptions);
 	const candidateMatchedCssSource = await resolveCandidateMatchedTailwindV4CssSource(rawSource, cssHandlerOptions, sourceOptions, selectionOptions);
@@ -4931,6 +5046,10 @@ async function resolveGeneratorSourceEntries(source, runtimeState) {
 	if (sourceMetadata?.sourceEntries) return sourceMetadata.sourceEntries;
 	if (!("css" in source) || !("base" in source) || !("baseFallbacks" in source)) return;
 	const resolved = await resolveTailwindV4EntriesFromCss(sourceMetadata?.sourceCss ?? source.css, sourceMetadata?.sourceBase ?? source.base);
+	if (resolved?.entries.length === 0 && !resolved.inlineCandidates.included.size && !resolved.inlineCandidates.excluded.size && !resolved.dependencies.length) {
+		if (sourceMetadata?.matchedCssSourceFile) return [];
+		return;
+	}
 	if (resolved?.entries.length || !resolved?.explicit && !sourceMetadata?.matchedCssSourceFile || !runtimeState) return resolved?.entries;
 	const matchingCssSource = tryResolveTailwindV4SourceOptions(runtimeState)?.cssSources?.find((cssSource) => {
 		if (sourceMetadata?.matchedCssSourceFile && typeof cssSource.file === "string" && node_path.default.resolve(cssSource.file) === node_path.default.resolve(sourceMetadata.matchedCssSourceFile)) return true;
@@ -5354,6 +5473,16 @@ function isCommentOnlyCss(source) {
 		return false;
 	}
 }
+function unwrapMiniProgramCascadeLayers(source) {
+	if (!source.includes("@layer")) return source;
+	try {
+		const root = _weapp_tailwindcss_postcss.postcss.parse(source);
+		(0, _weapp_tailwindcss_postcss.removeUnsupportedCascadeLayers)(root);
+		return root.toString();
+	} catch {
+		return source;
+	}
+}
 function stripTailwindSourceMediaFragments(source) {
 	let removedSourceMediaStart = false;
 	return source.split(/\r?\n/).filter((line) => {
@@ -5521,7 +5650,7 @@ async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
 	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 })));
+	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindApplyAtRules(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(unwrapMiniProgramCascadeLayers(cleanedSource)) : cleanedSource)), { importFallback: options.importFallback })));
 	if (userSource.trim().length === 0) return "";
 	if (isCommentOnlyCss(userSource)) return userSource;
 	if (options.generatorTarget !== "weapp") return userSource;
@@ -5671,6 +5800,7 @@ async function generateCssByGenerator(options) {
 		const runtimeWithCurrentCss = createRuntimeWithCurrentCssCandidates(runtime, currentCssCandidates, isolateCurrentCssCandidates);
 		const sources = await resolveGeneratorSources(majorVersion, runtimeState, generatorRawSource, file, cssHandlerOptions, generatorOptions, {
 			cssEntries: opts.cssEntries,
+			cssSources: options.cssSources,
 			getSourceCandidatesForEntries,
 			runtime: runtimeWithCurrentCss
 		});
@@ -5680,18 +5810,22 @@ async function generateCssByGenerator(options) {
 		const generated = mergeGeneratorResults((await runWithConcurrency(sources.map((source) => async () => {
 			const generator = createWeappTailwindcssGenerator(source);
 			const sourceEntries = getSourceCandidatesForEntries && (majorVersion === 3 || majorVersion === 4) ? await resolveGeneratorSourceEntries(source, runtimeState) : void 0;
-			const scopedRuntime = sourceEntries ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
-			const isolateCssSource = shouldIsolateScopedCssSource(source, sourceEntries);
+			const scopedRuntime = sourceEntries && sourceEntries.length > 0 ? getSourceCandidatesForEntries?.(sourceEntries) : void 0;
+			const isolateCssSource = shouldIsolateScopedCssSource(majorVersion, source, sourceEntries, {
+				cssHandlerOptions,
+				target: generatorOptions.target
+			});
 			const sourceMetadata = source.__weappTailwindcssMeta;
 			const matchedCssSourceFile = Boolean(sourceMetadata?.matchedCssSourceFile);
 			if (options.deferEmptyScopedCssSource && isolateCssSource && scopedRuntime?.size === 0 && currentCssCandidates.length === 0 && !cssHandlerOptions.isMainChunk) {
 				debug("defer empty scoped css source generation: %s", file);
 				return;
 			}
-			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? isolateCurrentCssCandidates ? runtimeWithCurrentCss : mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtimeWithCurrentCss, {
+			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) || isolateCssSource ? isolateCurrentCssCandidates ? runtimeWithCurrentCss : mergeScopedRuntimeWithCurrentRuntime(scopedRuntime ?? /* @__PURE__ */ new Set(), runtimeWithCurrentCss, {
 				currentCssCandidates,
 				cssHandlerOptions,
 				isolateCssSource,
+				majorVersion,
 				matchedCssSourceFile
 			}) : runtimeWithCurrentCss;
 			const generatorRuntime = majorVersion === 4 && generatorOptions.target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(sourceRuntime) : sourceRuntime;
@@ -5711,7 +5845,10 @@ async function generateCssByGenerator(options) {
 		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = stripTailwindBanner(generated.incrementalCss);
 			return {
-				css: restoreLocalCssImports(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: false })) : options.previousCss, localImportParts?.imports),
+				css: restoreLocalCssImports(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
+					injectPreflight: false,
+					styleOptions: generatorStyleOptions
+				})) : options.previousCss, localImportParts?.imports),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -5743,7 +5880,8 @@ async function generateCssByGenerator(options) {
 			const beforeUserCss = await transformGeneratorUserCss(orderedExtraCss.before, userCssOptions);
 			const afterLayerUserCss = await transformGeneratorUserCss(afterLayerParts.layer, userCssOptions);
 			const afterUserCss = await transformGeneratorUserCss(afterLayerParts.rest, userCssOptions);
-			css = createCssSourceOrderAppend$1(createCssSourceOrderAppend$1(createCssSourceOrderAppend$1(beforeUserCss, generated.target === "weapp" ? wrapUserLayerComponentsCss(afterLayerUserCss) : afterLayerUserCss), css), afterUserCss);
+			const fallbackLayerUserCss = generated.target === "weapp" && afterLayerParts.layer.trim().length === 0 && hasUserCssLayerBlocks(userCssRawSource) ? await transformGeneratorUserCss(splitUserCssLayerBlocks(userCssRawSource).layer, userCssOptions) : "";
+			css = createCssSourceOrderAppend$1(createCssSourceOrderAppend$1(createCssSourceOrderAppend$1(beforeUserCss, generated.target === "weapp" ? wrapUserLayerComponentsCss(createCssSourceOrderAppend$1(afterLayerUserCss, fallbackLayerUserCss)) : afterLayerUserCss), css), afterUserCss);
 			if (isEmptyCssSourceOrderParts(orderedExtraCss) && shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
@@ -5759,11 +5897,14 @@ async function generateCssByGenerator(options) {
 				}
 			} else if (generated.target === "weapp" && shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 			return {
-				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-					cssHandlerOptions,
-					isolateCurrentCssCandidates,
-					localImports: localImportParts?.imports
-				}) }), localImportParts?.imports),
+				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+					injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+						cssHandlerOptions,
+						isolateCurrentCssCandidates,
+						localImports: localImportParts?.imports
+					}),
+					styleOptions: generatorStyleOptions
+				}), localImportParts?.imports),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies
@@ -5802,6 +5943,18 @@ async function generateCssByGenerator(options) {
 					importFallback: generatorOptions.importFallback
 				});
 				css = createCssSourceOrderAppend$1(css, userCss);
+			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasUserCssLayerBlocks(userCssRawSource)) {
+				const layerUserCss = await transformGeneratorUserCss(splitUserCssLayerBlocks(userCssRawSource).layer, {
+					generatorTarget: generated.target,
+					generatorStyleOptions,
+					cssUserHandlerOptions,
+					styleHandler,
+					importFallback: generatorOptions.importFallback
+				});
+				if (layerUserCss.trim().length > 0) {
+					css = createCssSourceOrderAppend$1(css, wrapUserLayerComponentsCss(layerUserCss));
+					if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+				}
 			}
 			if (hasMatchedCssSourceFile && generated.target === "weapp") {
 				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
@@ -5820,11 +5973,14 @@ async function generateCssByGenerator(options) {
 				css = createCssSourceOrderAppend$1(css, userCss);
 			}
 			return {
-				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-					cssHandlerOptions,
-					isolateCurrentCssCandidates,
-					localImports: localImportParts?.imports
-				}) }), localImportParts?.imports),
+				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+					injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+						cssHandlerOptions,
+						isolateCurrentCssCandidates,
+						localImports: localImportParts?.imports
+					}),
+					styleOptions: generatorStyleOptions
+				}), localImportParts?.imports),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies
@@ -5835,11 +5991,14 @@ async function generateCssByGenerator(options) {
 			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, {
-				cssHandlerOptions,
-				isolateCurrentCssCandidates,
-				localImports: localImportParts?.imports
-			}) }), localImportParts?.imports),
+			css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports: localImportParts?.imports
+				}),
+				styleOptions: generatorStyleOptions
+			}), localImportParts?.imports),
 			target: generated.target,
 			source: "generator",
 			dependencies: generated.dependencies
@@ -5897,6 +6056,7 @@ async function generateCssForWebpackPipeline(source, loaderContext, options) {
 	if (!compilerOptions || !runtimeState || !getRuntimeSet) return;
 	await runtimeState.readyPromise;
 	const runtime = await getRuntimeSet();
+	if (compilerOptions.generator?.target !== "web") return;
 	const file = loaderContext.resourcePath;
 	const normalizedSource = normalizeCssConfigDirectives(source, file);
 	const cssHandlerOptions = createCssHandlerOptions(compilerOptions, runtimeState.twPatcher.majorVersion, file, rewriteOptions.appType);