weapp-tailwindcss 5.0.4 → 5.0.6

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

@@ -1,6 +1,7 @@
-import { A as parseImportRequest, B as stripGeneratorPlaceholderMarkers, C as hasTailwindApplyDirective, D as normalizeTailwindSourceDirectives, F as hasTailwindGeneratedCss, H as stripTailwindBanners, I as hasTailwindGeneratedCssMarkers, J as filterUnsupportedMiniProgramTailwindV4Candidates, L as splitGeneratorPlaceholderCssBySourceOrder, M as resolveCssEntrySource, N as VITE_MARKER_RE, P as createCssAppend, R as splitTailwindGeneratedCssByBanner, S as resolveTailwindV4SourceOptionsFromPatcher, T as hasTailwindSourceDirectives, U as normalizeConfigDirective, V as stripTailwindBanner, W as prependConfigDirective, Y as loadTailwindV4DesignSystem, ct as createDebug, h as resolveTailwindV4EntriesFromCss, ht as omitUndefined, j as removeTailwindSourceDirectives, k as normalizeTailwindV3CssEntrySource, l as getRuntimeClassSetSignature, n as resolveTailwindV3SourceFromPatcher, nt as normalizeLegacyContentEntries, ot as resolveTailwindV4CssSourceBase, r as resolveTailwindV3SourceOptionsFromPatcher, t as resolveTailwindV3Source, w as hasTailwindRootDirectives, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1, z as splitTailwindV4GeneratedCssBySourceOrder } from "./v3-engine-BCUGX3gX.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DRHWC1t-.mjs";
-import { p as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-lfenbOTF.mjs";
+import { A as normalizeTailwindV3CssEntrySource, B as splitTailwindV4GeneratedCssBySourceOrder, E as hasTailwindSourceDirectives, F as createCssAppend, G as prependConfigDirective, H as stripTailwindBanner, I as hasTailwindGeneratedCss, L as hasTailwindGeneratedCssMarkers, M as removeTailwindSourceDirectives, N as resolveCssEntrySource, O as normalizeTailwindSourceDirectives, P as VITE_MARKER_RE, R as splitGeneratorPlaceholderCssBySourceOrder, S as resolveTailwindV4SourceOptionsFromPatcher, T as hasTailwindRootDirectives, U as stripTailwindBanners, V as stripGeneratorPlaceholderMarkers, W as normalizeConfigDirective, X as loadTailwindV4DesignSystem, Y as filterUnsupportedMiniProgramTailwindV4Candidates, gt as omitUndefined, h as resolveTailwindV4EntriesFromCss, j as parseImportRequest, l as getRuntimeClassSetSignature, lt as createDebug, n as resolveTailwindV3SourceFromPatcher, r as resolveTailwindV3SourceOptionsFromPatcher, rt as normalizeLegacyContentEntries, st as resolveTailwindV4CssSourceBase, t as resolveTailwindV3Source, w as hasTailwindApplyDirective, x as resolveTailwindV4SourceFromPatcher, y as resolveTailwindV4Source$1, z as splitTailwindGeneratedCssByBanner } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-Bgn4m8An.mjs";
+import { p as replaceWxml, r as resolveStyleOptionsFromContext } from "./precheck-Copn2SqE.mjs";
+import { r as isUniAppXEnabled } from "./tailwindcss-C0Zgo3Es.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
 import { extractRawCandidatesWithPositions, extractSourceCandidates, extractValidCandidates, resolveValidTailwindV4Candidates } from "tailwindcss-patch";
@@ -435,7 +436,10 @@ async function resolveTailwindV4CssEntrySource(cssEntry, sourceOptions) {
 	const css = readFileSync(cssEntry, "utf8");
 	const base = path.dirname(path.resolve(cssEntry));
 	const entrySource = resolveCssEntrySource(css, base, { removeConfig: false });
-	const config = resolveExistingConfigPath(entrySource?.config, entrySource?.configRequest, cssEntry, sourceOptions);
+	const config = resolveExistingConfigPath(entrySource?.config, entrySource?.configRequest, cssEntry, {
+		...sourceOptions,
+		sourceFile: sourceOptions.sourceFile ?? cssEntry
+	});
 	return withGeneratorSourceMetadata(await resolveTailwindV4Source$1({
 		...omitUndefined(singleEntrySourceOptions),
 		base,
@@ -733,7 +737,7 @@ function withMatchedSourceSideMetadata(source, resolvedEntrySource) {
 }
 function createTailwindV4ApplyReferenceSource(css, sourceOptions) {
 	if (!hasTailwindApplyDirective(css) || hasTailwindRootDirectives(css)) return css;
-	return `@reference "${sourceOptions.packageName ?? "tailwindcss"}";\n${css}`;
+	return `@import "${sourceOptions.packageName ?? "tailwindcss"}" source(none);\n${css}`;
 }
 async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions) {
 	const base = resolveCssSourceBase(file, cssHandlerOptions);
@@ -741,6 +745,10 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 		importFallback: generatorOptions?.importFallback ?? false,
 		removeConfig: majorVersion === 3
 	});
+	const applyEntrySource = hasTailwindApplyDirective(rawSource) ? {
+		base,
+		css: rawSource
+	} : void 0;
 	if (majorVersion === 3) {
 		const sourceOptions = resolveTailwindV3SourceOptionsFromPatcher(runtimeState.twPatcher);
 		const mergedSourceOptions = omitUndefined({
@@ -751,10 +759,6 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 			cssEntries: selectionOptions?.cssEntries,
 			cssSources: createCssEntrySources(selectionOptions?.cssEntries)
 		});
-		const applyEntrySource = hasTailwindApplyDirective(rawSource) ? {
-			base,
-			css: rawSource
-		} : void 0;
 		const sourceSideEntrySource = canResolveSourceSideCssEntry(file, cssHandlerOptions, mergedSourceOptions) ? resolveSourceSideCssEntrySource(file, mergedSourceOptions, { removeConfig: true }) : void 0;
 		const shouldPreferSourceSideEntry = shouldPreferResolvedSourceSideEntry(cssEntrySource, sourceSideEntrySource);
 		const resolvedEntrySource = shouldResolveSourceSideCssEntry(rawSource) ? shouldPreferSourceSideEntry ? sourceSideEntrySource ?? cssEntrySource ?? applyEntrySource : cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource : shouldPreferTailwindV3SourceSideEntry(rawSource, sourceSideEntrySource) || shouldPreferSourceSideEntry ? sourceSideEntrySource ?? cssEntrySource ?? applyEntrySource : cssEntrySource ?? applyEntrySource ?? sourceSideEntrySource;
@@ -781,6 +785,13 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 		cssSources: mergeCssSources(sourceOptions.cssSources, sourceOptions.cssSources?.length ? void 0 : createCssEntrySources(selectionOptions?.cssEntries ?? sourceOptions.cssEntries))
 	}) : void 0;
 	const normalizedSourceOptions = resolvedSourceOptions ? normalizeTailwindV4CssSourceConfigs(resolvedSourceOptions) : void 0;
+	if (applyEntrySource && !cssHandlerOptions.isMainChunk && !hasTailwindRootDirectives(rawSource, { importFallback: generatorOptions?.importFallback ?? false })) {
+		const css = createTailwindV4ApplyReferenceSource(normalizeConfigDirective(prependConfigDirective(applyEntrySource.css, generatorOptions?.config), void 0), normalizedSourceOptions ?? {});
+		return resolveTailwindV4Source$1(createSingleTailwindV4SourceOptions(normalizedSourceOptions ?? {}, {
+			base: applyEntrySource.base,
+			css
+		}));
+	}
 	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 matchedCssEntrySource = normalizedSourceOptions ? await resolveMatchingTailwindV4CssEntry(rawSource, file, normalizedSourceOptions) : void 0;
@@ -797,7 +808,7 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 		...preferredCssEntrySource,
 		css: prependConfigDirective(preferredCssEntrySource.css, generatorOptions.config)
 	} : preferredCssEntrySource;
-	const resolvedEntrySource = sourceSideEntrySource ?? cssEntrySource;
+	const resolvedEntrySource = sourceSideEntrySource ?? cssEntrySource ?? applyEntrySource;
 	if (!resolvedEntrySource) {
 		const source = await resolveTailwindV4SourceFromPatcher(runtimeState.twPatcher);
 		return generatorOptions?.config ? {
@@ -819,7 +830,7 @@ async function resolveGeneratorSources(majorVersion, runtimeState, rawSource, fi
 		importFallback: generatorOptions?.importFallback ?? false,
 		removeConfig: majorVersion === 3
 	});
-	if (majorVersion !== 4 || cssEntrySource && !cssHandlerOptions.isMainChunk) {
+	if (majorVersion !== 4 || cssEntrySource && !cssHandlerOptions.isMainChunk || !cssHandlerOptions.isMainChunk && hasTailwindApplyDirective(rawSource) && !hasTailwindRootDirectives(rawSource, { importFallback: generatorOptions?.importFallback ?? false })) {
 		const resolved = await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions);
 		return resolved ? [resolved] : [];
 	}
@@ -1251,6 +1262,15 @@ function mergeMarkedUserLayerComponentsCss(baseCss, markedCss) {
 //#region src/bundlers/shared/generator-css.ts
 const SUPPORTED_GENERATOR_MAJOR_VERSIONS = new Set([3, 4]);
 const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
+const TAILWIND_V4_GENERATOR_AT_RULES = new Set([
+	"config",
+	"custom-variant",
+	"plugin",
+	"source",
+	"theme",
+	"utility",
+	"variant"
+]);
 function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
 	return finalizeMiniProgramCss(css, {
@@ -1259,13 +1279,58 @@ function finalizeMiniProgramGeneratorCss(css, target, majorVersion, cssPreflight
 		preservePseudoContentInit: majorVersion === 3
 	});
 }
+function shouldInjectMiniProgramPreflightForGeneratorCss(opts, options) {
+	if (options.cssHandlerOptions.uniAppX === true && options.cssHandlerOptions.uniAppXCssTarget === "uvue") return false;
+	if (!options.isolateCurrentCssCandidates) return true;
+	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;
 	return new Set([...scopedRuntime, ...runtime]);
 }
 function shouldIsolateScopedCssSource(source, sourceEntries) {
-	return sourceEntries !== void 0 && Boolean(source.__weappTailwindcssMeta?.matchedCssSourceFile || sourceEntries.length > 0);
+	return Boolean(source.__weappTailwindcssMeta?.matchedCssSourceFile) || sourceEntries !== void 0 && sourceEntries.length > 0;
+}
+function shouldIsolateCurrentTailwindV4CssCandidates(majorVersion, cssHandlerOptions, options) {
+	return majorVersion === 4 && !cssHandlerOptions.isMainChunk && hasTailwindApplyDirective(options.rawSource) && !hasTailwindRootDirectives(options.rawSource) && !options.hasGeneratedCss && !options.hasGeneratedMarkers;
+}
+function removeTailwindApplyAtRules(source) {
+	if (!source.includes("@apply")) return source;
+	try {
+		const root = postcss.parse(source);
+		let changed = false;
+		root.walkAtRules("apply", (rule) => {
+			rule.remove();
+			changed = true;
+		});
+		root.walk((node) => {
+			if ("nodes" in node && node.nodes?.length === 0) node.remove();
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
+}
+function removeTailwindV4GeneratorAtRules(source) {
+	try {
+		const root = postcss.parse(source);
+		let changed = false;
+		root.walkAtRules((rule) => {
+			if (!TAILWIND_V4_GENERATOR_AT_RULES.has(rule.name)) return;
+			rule.remove();
+			changed = true;
+		});
+		root.walk((node) => {
+			if ("nodes" in node && node.nodes?.length === 0) {
+				node.remove();
+				changed = true;
+			}
+		});
+		return changed ? root.toString() : source;
+	} catch {
+		return source;
+	}
 }
 function shouldScanTailwindV4Sources(majorVersion, target, generatorRuntime, isolateCssSource) {
 	if (majorVersion !== 4 || isolateCssSource) return false;
@@ -1293,7 +1358,7 @@ 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);
+	return request.length > 0 && !request.startsWith("#") && !request.startsWith("tailwindcss") && !request.startsWith("weapp-tailwindcss") && !request.startsWith("data:") && !REMOTE_IMPORT_RE.test(request);
 }
 function isCommentOnlyCss(source) {
 	try {
@@ -1304,7 +1369,19 @@ function isCommentOnlyCss(source) {
 	}
 }
 function stripTailwindSourceMediaFragments(source) {
-	return source.replace(/^\s*@media\s+source\([^)]*\)\s*\{\s*$/gm, "").replace(/^\s*\}\s*(?=@(?:source|theme|config|plugin|utility|variant|custom-variant)\b)/gm, "").replace(/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/gm, "");
+	let removedSourceMediaStart = false;
+	return source.split(/\r?\n/).filter((line) => {
+		if (/^\s*@media\s+source\([^)]*\)\s*\{\s*$/.test(line)) {
+			removedSourceMediaStart = true;
+			return false;
+		}
+		if (/^\s*\}\s*\/\*\s*source\([^)]*\)\s*\*\/\s*$/.test(line)) return false;
+		if (removedSourceMediaStart && /^\s*\}\s*$/.test(line)) {
+			removedSourceMediaStart = false;
+			return false;
+		}
+		return true;
+	}).join("\n").replace(/\}[^\S\r\n]*(?=@(?:config|source)\b)/g, "");
 }
 function stripLeadingTailwindSourceMediaCloseFragment(source) {
 	return source.replace(/^\s*\}\s*(?:\n|$)/, "");
@@ -1411,11 +1488,70 @@ function extractGeneratedCssForUserLayerSelectors(css, userLayerSource) {
 		};
 	}
 }
+function normalizeGeneratedSelector(selector) {
+	return selector.replace(/:not\(#\\#\)/g, "").trim();
+}
+function collectApplyOnlySourceSelectors(source) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		postcss.parse(source).walkRules((rule) => {
+			if (!rule.nodes?.some((node) => node.type === "atrule" && node.name === "apply")) return;
+			for (const selector of rule.selectors ?? [rule.selector]) {
+				const normalized = normalizeGeneratedSelector(selector);
+				if (normalized) selectors.add(normalized);
+			}
+		});
+	} catch {}
+	return selectors;
+}
+function hasOnlyApplyBackedSourceRules(source) {
+	let hasApplyRule = false;
+	let hasNonApplyRule = false;
+	try {
+		postcss.parse(source).walkRules((rule) => {
+			if (rule.nodes?.some((node) => node.type === "atrule" && node.name === "apply")) hasApplyRule = true;
+			else hasNonApplyRule = true;
+		});
+	} catch {
+		return false;
+	}
+	return hasApplyRule && !hasNonApplyRule;
+}
+function filterApplyOnlyGeneratedCss(css, source) {
+	const selectors = collectApplyOnlySourceSelectors(source);
+	if (selectors.size === 0) return css;
+	const selectorList = [...selectors];
+	try {
+		const root = postcss.parse(css);
+		root.walkRules((rule) => {
+			const isApplySelector = (rule.selectors ?? [rule.selector]).some((selector) => {
+				const normalized = normalizeGeneratedSelector(selector);
+				return selectorList.some((sourceSelector) => {
+					if (normalized === sourceSelector) return true;
+					if (!normalized.startsWith(sourceSelector)) return false;
+					const next = normalized[sourceSelector.length];
+					return next === ":" || next === "[" || next === ".";
+				});
+			});
+			const isVariableRule = rule.nodes?.some((node) => node.type === "decl" && node.prop.startsWith("--"));
+			if (!isApplySelector && !isVariableRule) rule.remove();
+		});
+		root.walkAtRules((rule) => {
+			if (rule.nodes !== void 0 && rule.nodes.length === 0) rule.remove();
+		});
+		return root.toString();
+	} catch {
+		return css;
+	}
+}
+function shouldFilterApplyOnlyGeneratedCss(majorVersion, target, source, options) {
+	return majorVersion === 4 && target === "weapp" && hasTailwindApplyDirective(source) && !hasTailwindRootDirectives(source) && !options.hasGeneratedCss && !options.hasGeneratedMarkers && collectApplyOnlySourceSelectors(source).size > 0 && hasOnlyApplyBackedSourceRules(source);
+}
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
-	const cleanedSource = removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source)), { importFallback: options.importFallback });
+	const cleanedSource = removeTailwindSourceDirectives(removeTailwindV4GeneratorAtRules(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source))), { importFallback: options.importFallback });
 	if (cleanedSource.trim().length === 0) return "";
-	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedSource) : cleanedSource)), { importFallback: options.importFallback }));
+	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindApplyAtRules(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;
@@ -1477,6 +1613,32 @@ function prefixLocalCssImportsWithWebpackIgnore(css) {
 		return css;
 	}
 }
+function splitLocalCssImports(source) {
+	try {
+		const root = postcss.parse(source);
+		const importRoot = postcss.root();
+		let changed = false;
+		for (const node of [...root.nodes]) {
+			if (node.type !== "atrule" || node.name !== "import") continue;
+			const request = parseImportRequest(node.params);
+			if (!request || !isLocalImportRequest(request)) continue;
+			importRoot.append(node.clone());
+			node.remove();
+			changed = true;
+		}
+		const imports = importRoot.nodes.filter((node) => node.type === "atrule" && node.name === "import").map((node) => `@import ${node.params};`).join("\n");
+		return changed ? {
+			imports,
+			source: root.toString()
+		} : void 0;
+	} catch {
+		return;
+	}
+}
+function restoreLocalCssImports(css, imports) {
+	if (!imports?.trim()) return css;
+	return createCssSourceOrderAppend(imports, css);
+}
 async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, getSourceCandidatesForEntries, styleHandler, debug } = options;
 	const generatorOptions = {
@@ -1485,6 +1647,9 @@ async function generateCssByGenerator(options) {
 	};
 	const majorVersion = runtimeState.twPatcher.majorVersion;
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
+	const localImportParts = splitLocalCssImports(effectiveRawSource);
+	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
+	const userCssRawSource = majorVersion === 4 ? removeTailwindV4GeneratorAtRules(generatorRawSource) : generatorRawSource;
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: generatorOptions.target === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -1493,16 +1658,21 @@ async function generateCssByGenerator(options) {
 		dependencies: []
 	};
 	if (isPureLocalCssImportWrapper(effectiveRawSource)) return;
-	const hasGeneratedCss = hasTailwindGeneratedCss(effectiveRawSource);
-	const hasSourceDirectives = hasTailwindSourceDirectives(effectiveRawSource, { importFallback: generatorOptions.importFallback });
-	const hasGeneratedMarkers = hasTailwindGeneratedCssMarkers(effectiveRawSource);
+	const hasGeneratedCss = hasTailwindGeneratedCss(generatorRawSource);
+	const hasSourceDirectives = hasTailwindSourceDirectives(generatorRawSource, { importFallback: generatorOptions.importFallback });
+	const hasGeneratedMarkers = hasTailwindGeneratedCssMarkers(generatorRawSource);
 	const shouldGenerateCurrentCss = hasGeneratedCss || hasGeneratedMarkers || hasSourceDirectives || cssHandlerOptions.isMainChunk;
 	if (!SUPPORTED_GENERATOR_MAJOR_VERSIONS.has(majorVersion ?? 0) || !shouldGenerateCurrentCss || majorVersion === 3 && !hasSourceDirectives && !hasGeneratedCss && !hasGeneratedMarkers) return;
 	try {
 		await runtimeState.readyPromise;
-		const currentCssCandidates = majorVersion === 4 ? await extractSourceCandidates(effectiveRawSource, "css", { ...generatorOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: generatorOptions.bareArbitraryValues } }) : [];
-		const runtimeWithCurrentCss = currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
-		const sources = await resolveGeneratorSources(majorVersion, runtimeState, effectiveRawSource, file, cssHandlerOptions, generatorOptions, {
+		const currentCssCandidates = majorVersion === 4 ? await extractSourceCandidates(generatorRawSource, "css", { ...generatorOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: generatorOptions.bareArbitraryValues } }) : [];
+		const isolateCurrentCssCandidates = shouldIsolateCurrentTailwindV4CssCandidates(majorVersion, cssHandlerOptions, {
+			hasGeneratedCss,
+			hasGeneratedMarkers,
+			rawSource: generatorRawSource
+		});
+		const runtimeWithCurrentCss = isolateCurrentCssCandidates ? new Set(currentCssCandidates) : currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
+		const sources = await resolveGeneratorSources(majorVersion, runtimeState, generatorRawSource, file, cssHandlerOptions, generatorOptions, {
 			cssEntries: opts.cssEntries,
 			getSourceCandidatesForEntries,
 			runtime: runtimeWithCurrentCss
@@ -1519,17 +1689,18 @@ async function generateCssByGenerator(options) {
 				debug("defer empty scoped css source generation: %s", file);
 				return;
 			}
-			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtimeWithCurrentCss, {
+			const sourceRuntime = scopedRuntime && (scopedRuntime.size > 0 || isolateCssSource) ? isolateCurrentCssCandidates ? runtimeWithCurrentCss : mergeScopedRuntimeWithCurrentRuntime(scopedRuntime, runtimeWithCurrentCss, {
 				currentCssCandidates,
 				cssHandlerOptions,
 				isolateCssSource,
 				matchedCssSourceFile
 			}) : runtimeWithCurrentCss;
 			const generatorRuntime = majorVersion === 4 && generatorOptions.target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(sourceRuntime) : sourceRuntime;
+			const useIncrementalCache = (majorVersion === 3 || majorVersion === 4) && !(majorVersion === 3 && isolateCssSource);
 			return generator.generate({
 				bareArbitraryValues: generatorOptions.bareArbitraryValues,
 				candidates: generatorRuntime,
-				incrementalCache: majorVersion === 3 || majorVersion === 4,
+				incrementalCache: useIncrementalCache,
 				scanSources: shouldScanTailwindV4Sources(majorVersion, generatorOptions.target, generatorRuntime, isolateCssSource),
 				styleOptions: generatorStyleOptions,
 				tailwindcssV3Compatibility: generatorOptions.tailwindcssV3Compatibility,
@@ -1551,22 +1722,27 @@ async function generateCssByGenerator(options) {
 			sources: generatedResults.flatMap((item) => item.sources)
 		};
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
-		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(effectiveRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
+		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(generatorRawSource)) && 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, { injectPreflight: false })) : options.previousCss,
+				css: restoreLocalCssImports(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: false })) : options.previousCss, localImportParts?.imports),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
 				incremental: true
 			};
 		}
+		const shouldFilterApplyOnlyCss = shouldFilterApplyOnlyGeneratedCss(majorVersion, generated.target, generatorRawSource, {
+			hasGeneratedCss,
+			hasGeneratedMarkers
+		});
+		const generatedCss = shouldFilterApplyOnlyCss ? filterApplyOnlyGeneratedCss(stripTailwindBanner(generated.css), generatorRawSource) : stripTailwindBanner(generated.css);
 		const hasMatchedCssSourceFile = sources.some((source) => source.__weappTailwindcssMeta?.matchedCssSourceFile);
-		const orderedExtraCss = hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(effectiveRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(effectiveRawSource, generated.rawCss);
+		const orderedExtraCss = hasMatchedCssSourceFile ? splitTailwindV4GeneratedCssBySourceOrder(userCssRawSource, generated.rawCss) : splitRawSourceByGeneratedCssOrder(userCssRawSource, generated.rawCss);
 		const shouldAppendMatchedCssSourceCompat = !hasMatchedCssSourceFile || orderedExtraCss !== void 0;
 		if (orderedExtraCss) {
-			let css = stripTailwindBanner(generated.css);
-			if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
+			let css = generatedCss;
+			if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, generatorRawSource);
 			const userCssOptions = {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
@@ -1586,27 +1762,33 @@ async function generateCssByGenerator(options) {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(effectiveRawSource, userCssOptions);
+				const userCss = await transformGeneratorUserCss(userCssRawSource, userCssOptions);
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			if (generated.target === "weapp" && shouldAppendMatchedCssSourceCompat) {
 				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
-				css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-				css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!shouldFilterApplyOnlyCss) {
+					css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				}
 			} else if (generated.target === "weapp" && shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
 			return {
-				css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
+				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports: localImportParts?.imports
+				}) }), localImportParts?.imports),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies
 			};
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
-		let css = stripTailwindBanner(generated.css);
+		let css = generatedCss;
 		if (generated.target === "weapp") {
-			css = inheritLegacyUnitConvertedDeclarations(css, effectiveRawSource);
-			if (hasUserCssLayerBlocks(effectiveRawSource)) {
-				const layerParts = splitUserCssLayerBlocks(effectiveRawSource);
+			css = inheritLegacyUnitConvertedDeclarations(css, generatorRawSource);
+			if (hasUserCssLayerBlocks(generatorRawSource)) {
+				const layerParts = splitUserCssLayerBlocks(generatorRawSource);
 				const layerUserCss = await transformGeneratorUserCss(layerParts.layer, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
@@ -1626,7 +1808,7 @@ async function generateCssByGenerator(options) {
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (hasMatchedCssSourceFile && generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await transformGeneratorUserCss(effectiveRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -1635,12 +1817,14 @@ async function generateCssByGenerator(options) {
 				});
 				css = createCssSourceOrderAppend(css, userCss);
 			}
-			if (hasMatchedCssSourceFile && generated.target === "weapp") css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			if (hasMatchedCssSourceFile && generated.target === "weapp") {
+				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			}
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(effectiveRawSource, {
+				const userCss = await transformGeneratorUserCss(userCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -1650,16 +1834,26 @@ async function generateCssByGenerator(options) {
 				css = createCssSourceOrderAppend(css, userCss);
 			}
 			return {
-				css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
+				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports: localImportParts?.imports
+				}) }), localImportParts?.imports),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies
 			};
 		}
-		css = await appendLegacyCompatCss(css, effectiveRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-		css = await appendLegacyContainerCompatCss(css, effectiveRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+		if (!shouldFilterApplyOnlyCss) {
+			css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+		}
 		return {
-			css: finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight),
+			css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, { injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+				cssHandlerOptions,
+				isolateCurrentCssCandidates,
+				localImports: localImportParts?.imports
+			}) }), localImportParts?.imports),
 			target: generated.target,
 			source: "generator",
 			dependencies: generated.dependencies