weapp-tailwindcss 5.0.4 → 5.0.6

package/dist/vite.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_vite = require("./vite-tjYalmVX.js");
+const require_vite = require("./vite-Bw6LOXvf.js");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.weappTailwindcss = require_vite.WeappTailwindcss;

package/dist/vite.mjs

@@ -1,2 +1,2 @@
-import { t as WeappTailwindcss } from "./vite-DS4H5d0f.mjs";
+import { t as WeappTailwindcss } from "./vite-ChZ2cbn4.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss };

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

@@ -97,6 +97,9 @@ function resolveUniAppXOptions(option) {
 		uvueUnsupported: "warn"
 	};
 }
+function isUniAppXEnabled(option) {
+	return resolveUniAppXOptions(option).enabled;
+}
 //#endregion
 //#region src/context/style-options.ts
 function resolveStyleOptionsFromContext(ctx) {
@@ -2361,7 +2364,7 @@ const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
 const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|(?:use|forward)\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
 const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|use|forward|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
-const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant)\b[\s\S]*\{/;
+const TAILWIND_EXTRACTABLE_BLOCK_START_RE = /^\s*@(?:layer|theme|utility|variant|custom-variant|plugin)\b[\s\S]*\{/;
 const TAILWIND_V3_SUBPATH_IMPORT_LAYERS = new Map([
 	["tailwindcss/base", "base"],
 	["tailwindcss/components", "components"],
@@ -2434,6 +2437,7 @@ function extractTailwindDirectiveLines(rawSource, options = {}) {
 		if (!trimmed || trimmed.startsWith("//")) continue;
 		const directive = TAILWIND_EXTRACTABLE_DIRECTIVE_RE.exec(line)?.[0] ?? TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE.exec(line)?.[0];
 		if (!directive) continue;
+		if (TAILWIND_EXTRACTABLE_BLOCK_START_RE.test(directive)) continue;
 		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
 		const normalizedTrimmed = normalized.trim();
 		if (options.removeConfig && normalizedTrimmed.startsWith("@config")) continue;
@@ -2776,7 +2780,10 @@ function resolveConfigDir(config, projectRoot) {
 	return node_path.default.dirname(configPath);
 }
 function isBarePackageSpecifier(specifier) {
-	return !specifier.startsWith(".") && !specifier.startsWith("/") && !specifier.includes("\\") && !/^[a-z][a-z\d+.-]*:/i.test(specifier);
+	return !specifier.startsWith(".") && !specifier.startsWith("/") && !specifier.startsWith("#") && !specifier.includes("\\") && !/^[a-z][a-z\d+.-]*:/i.test(specifier);
+}
+function isPackageJsonImportSpecifier(specifier) {
+	return typeof specifier === "string" && specifier.startsWith("#");
 }
 function parseCssImportSpecifier$1(params) {
 	const value = params.trim();
@@ -2818,7 +2825,8 @@ function normalizeTailwindV4CssPackageImports(css, packageName) {
 	}
 	const importSpecifiers = createTailwindV4CssImportSpecifierSet(packageName);
 	let changed = false;
-	root.walkAtRules("import", (rule) => {
+	root.walkAtRules((rule) => {
+		if (rule.name !== "import" && rule.name !== "reference") return;
 		const parsed = parseCssImportSpecifier$1(rule.params);
 		if (!parsed || !importSpecifiers.has(parsed.specifier)) return;
 		const cssEntryPoint = resolvePackageCssEntryPoint(`${parsed.specifier}/index.css`);
@@ -2855,7 +2863,8 @@ function normalizeTailwindV4CssEntrySources(cssEntries, packageName) {
 		}
 		const base = node_path.default.dirname(file);
 		const rawCss = (0, node_fs.readFileSync)(file, "utf8");
-		const css = normalizeTailwindV4CssPackageImports(normalizeConfigDirective(rawCss, resolveCssEntrySource(rawCss, base, { removeConfig: false })?.config), packageName);
+		const entrySource = resolveCssEntrySource(rawCss, base, { removeConfig: false });
+		const css = normalizeTailwindV4CssPackageImports(normalizeConfigDirective(rawCss, entrySource?.config && (0, node_fs.existsSync)(entrySource.config) ? entrySource.config : entrySource?.configRequest && !node_path.default.isAbsolute(entrySource.configRequest) && !isPackageJsonImportSpecifier(entrySource.configRequest) ? node_path.default.resolve(base, entrySource.configRequest) : entrySource?.config), packageName);
 		cssSources.push({
 			file,
 			base,
@@ -4540,7 +4549,10 @@ async function resolveTailwindV4CssEntrySource(cssEntry, sourceOptions) {
 	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);
+	const config = resolveExistingConfigPath(entrySource?.config, entrySource?.configRequest, cssEntry, {
+		...sourceOptions,
+		sourceFile: sourceOptions.sourceFile ?? cssEntry
+	});
 	return withGeneratorSourceMetadata(await resolveTailwindV4Source({
 		...omitUndefined(singleEntrySourceOptions),
 		base,
@@ -4838,7 +4850,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);
@@ -4846,6 +4858,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({
@@ -4856,10 +4872,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;
@@ -4886,6 +4898,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(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;
@@ -4902,7 +4921,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 ? {
@@ -4924,7 +4943,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] : [];
 	}
@@ -5302,6 +5321,15 @@ function reorderMarkedUserLayerComponentsCss(css) {
 //#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 (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
@@ -5310,13 +5338,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 = require_watch_dependencies.postcss_default.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 = require_watch_dependencies.postcss_default.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;
@@ -5344,7 +5417,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 {
@@ -5355,7 +5428,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|$)/, "");
@@ -5462,11 +5547,70 @@ function extractGeneratedCssForUserLayerSelectors(css, userLayerSource) {
 		};
 	}
 }
+function normalizeGeneratedSelector(selector) {
+	return selector.replace(/:not\(#\\#\)/g, "").trim();
+}
+function collectApplyOnlySourceSelectors(source) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		require_watch_dependencies.postcss_default.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 {
+		require_watch_dependencies.postcss_default.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 = require_watch_dependencies.postcss_default.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" ? (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)(cleanedSource) : cleanedSource)), { importFallback: options.importFallback })));
 	if (userSource.trim().length === 0) return "";
 	if (isCommentOnlyCss(userSource)) return userSource;
 	if (options.generatorTarget !== "weapp") return userSource;
@@ -5528,6 +5672,32 @@ function prefixLocalCssImportsWithWebpackIgnore(css) {
 		return css;
 	}
 }
+function splitLocalCssImports(source) {
+	try {
+		const root = require_watch_dependencies.postcss_default.parse(source);
+		const importRoot = require_watch_dependencies.postcss_default.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 = {
@@ -5536,6 +5706,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" ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -5544,16 +5717,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 (0, tailwindcss_patch.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 (0, tailwindcss_patch.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
@@ -5570,17 +5748,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,
@@ -5602,22 +5781,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,
@@ -5637,27 +5821,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,
@@ -5677,7 +5867,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,
@@ -5686,12 +5876,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,
@@ -5701,16 +5893,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

package/dist/{webpack-CA-40WU9.mjs → webpack-CMJ7iqN7.mjs}

@@ -1,10 +1,10 @@
-import { ct as createDebug, ft as resolveTailwindcssOptions, j as removeTailwindSourceDirectives, l as getRuntimeClassSetSignature } from "./v3-engine-BCUGX3gX.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DRHWC1t-.mjs";
-import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-lfenbOTF.mjs";
+import { M as removeTailwindSourceDirectives, l as getRuntimeClassSetSignature, lt as createDebug, pt as resolveTailwindcssOptions } from "./v3-engine-Ji6AXPh2.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-Bgn4m8An.mjs";
+import { b as refreshTailwindRuntimeState, d as _defineProperty, i as pluginName, n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-Copn2SqE.mjs";
 import { r as getGroupedEntries } from "./utils-DsaS975I.mjs";
-import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-D5RogwtV.mjs";
-import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-Dt-FUQB5.mjs";
-import { S as toAbsoluteOutputPath, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, n as createBundleBuildState, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, v as isSourceStyleRequest, x as resolveOutputSpecifier, y as stripRequestQuery } from "./bundle-state-C-p9eFz1.mjs";
+import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-C0Zgo3Es.mjs";
+import { i as generateCssByGenerator, r as emitHmrTiming, s as processCachedTask, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-BEYHQkZc.mjs";
+import { C as toAbsoluteOutputPath, S as resolveOutputSpecifier, b as stripRequestQuery, d as stripBundlerGeneratedCssMarkers, f as resolvePackageDir, n as createBundleBuildState, p as resolvePluginDisabledState, r as updateBundleBuildState, s as pushConcurrentTaskFactories, t as buildBundleSnapshot, y as isSourceStyleRequest } from "./bundle-state-CdNXQl-o.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import process from "node:process";

package/dist/{webpack-0BwLOE_f.js → webpack-nn3P8_S_.js}

@@ -1,11 +1,11 @@
-const require_chunk = require("./chunk-D6vf50IK.js");
-const require_v3_engine = require("./v3-engine-CBahpuIg.js");
-const require_generator = require("./generator-DaPOkJ7W.js");
-const require_precheck = require("./precheck-DgpVCvYk.js");
-const require_utils = require("./utils-nta4tfFs.js");
-const require_tailwindcss = require("./tailwindcss-26ZFr5kv.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-BYV0yQdp.js");
-const require_bundle_state = require("./bundle-state-D3RZHkXz.js");
+const require_chunk = require("./chunk-emK7D4bc.js");
+const require_v3_engine = require("./v3-engine-6FVAcrZl.js");
+const require_generator = require("./generator-C56PJYxA.js");
+const require_precheck = require("./precheck-CyPbGn38.js");
+const require_utils = require("./utils-Dolmt8EO.js");
+const require_tailwindcss = require("./tailwindcss-Tw6CSVHL.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-Bmzdjlk0.js");
+const require_bundle_state = require("./bundle-state-CFgzVHFP.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-0BwLOE_f.js");
+const require_webpack = require("./webpack-nn3P8_S_.js");
 exports.WeappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcss = require_webpack.WeappTailwindcss;
 exports.weappTailwindcssPackageDir = require_webpack.weappTailwindcssPackageDir;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-CA-40WU9.mjs";
+import { n as weappTailwindcssPackageDir, t as WeappTailwindcss } from "./webpack-CMJ7iqN7.mjs";
 export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -173,7 +173,6 @@
     "@babel/traverse": "~7.29.7",
     "@babel/types": "~7.29.7",
     "@vue/compiler-dom": "^3.5.35",
-    "@vue/compiler-sfc": "^3.5.35",
     "@weapp-core/escape": "~8.0.0",
     "comment-json": "^5.0.0",
     "debug": "~4.4.3",
@@ -187,9 +186,9 @@
     "tailwindcss-patch": "9.4.2",
     "yaml": "^2.9.0",
     "@weapp-tailwindcss/logger": "2.0.0",
-    "@weapp-tailwindcss/postcss": "3.0.2",
-    "@weapp-tailwindcss/reset": "0.1.1",
+    "@weapp-tailwindcss/postcss": "3.0.3",
     "@weapp-tailwindcss/shared": "2.0.0",
+    "@weapp-tailwindcss/reset": "0.1.1",
     "tailwindcss-config": "2.0.0"
   },
   "devDependencies": {