weapp-tailwindcss 5.1.3 → 5.1.4

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

@@ -151,14 +151,14 @@ function parseConfigRequest$1(params) {
 function isPackageJsonImportRequest$2(request) {
 	return typeof request === "string" && request.startsWith("#");
 }
-function isWeappTailwindcssImportRequest$1(request) {
+function isWeappTailwindcssImportRequest(request) {
 	return request === "weapp-tailwindcss" || request?.startsWith("weapp-tailwindcss/");
 }
 function isTailwindImportRequest$1(request) {
 	return request === "tailwindcss" || request === "tailwindcss4" || request?.startsWith("tailwindcss/") || request?.startsWith("tailwindcss4/");
 }
 function normalizeTailwindImportRequest$1(request, options = {}) {
-	if (options.importFallback && isWeappTailwindcssImportRequest$1(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
+	if (options.importFallback && isWeappTailwindcssImportRequest(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
 	return request;
 }
 function replaceImportRequest$1(params, request, replacement) {
@@ -170,7 +170,7 @@ function normalizeTailwindDirectiveLine(line, options = {}) {
 	const trimmed = line.trimStart();
 	if (/^@(?:use|forward)\b/.test(trimmed)) {
 		const request = parseImportRequest$1(trimmed.replace(/^@(?:use|forward)\b/, ""));
-		if (isTailwindImportRequest$1(request) || options.importFallback && isWeappTailwindcssImportRequest$1(request)) {
+		if (isTailwindImportRequest$1(request) || options.importFallback && isWeappTailwindcssImportRequest(request)) {
 			const normalizedRequest = normalizeTailwindImportRequest$1(request, options);
 			return replaceImportRequest$1(line.replace(/^(\s*)@(?:use|forward)\b/, "$1@import"), request, normalizedRequest);
 		}
@@ -178,7 +178,7 @@ function normalizeTailwindDirectiveLine(line, options = {}) {
 	}
 	if (!options.importFallback || !trimmed.startsWith("@import")) return line;
 	const request = parseImportRequest$1(trimmed.replace(/^@import\b/, ""));
-	if (!request || !isWeappTailwindcssImportRequest$1(request)) return line;
+	if (!request || !isWeappTailwindcssImportRequest(request)) return line;
 	return replaceImportRequest$1(line, request, request.replace(/^weapp-tailwindcss/, "tailwindcss"));
 }
 function extractTailwindDirectiveLines(rawSource, options = {}) {
@@ -310,32 +310,18 @@ const TAILWIND_REMOVABLE_SOURCE_DIRECTIVE_NAMES = /* @__PURE__ */ new Set([
 	"utility",
 	"variant"
 ]);
-const TAILWIND_ROOT_DIRECTIVE_NAMES = /* @__PURE__ */ new Set([
-	"config",
-	"custom-variant",
-	"plugin",
-	"source",
-	"tailwind",
-	"theme",
-	"utility",
-	"variant"
-]);
 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/;
 function parseImportRequest(params) {
-	return /^(?:url\(\s*)?(["']?)([^"')\s]+)\1\s*\)?/.exec(params.trim())?.[2];
+	return (0, _weapp_tailwindcss_postcss.parseTailwindCssDirectiveRequest)(params);
 }
 function parseConfigRequest(params) {
-	return /^(["'])(.+)\1\s*;?$/.exec(params.trim())?.[2];
+	return (0, _weapp_tailwindcss_postcss.parseTailwindCssConfigRequest)(params);
 }
 function isPackageJsonImportRequest$1(request) {
-	return typeof request === "string" && request.startsWith("#");
-}
-function isWeappTailwindcssImportRequest(request) {
-	return request === "weapp-tailwindcss" || request?.startsWith("weapp-tailwindcss/");
+	return (0, _weapp_tailwindcss_postcss.isTailwindCssPackageJsonImportRequest)(request);
 }
 function normalizeTailwindImportRequest(request, options = {}) {
-	if (options.importFallback && isWeappTailwindcssImportRequest(request)) return request.replace(/^weapp-tailwindcss/, "tailwindcss");
-	return request;
+	return (0, _weapp_tailwindcss_postcss.normalizeTailwindCssImportRequest)(request, options);
 }
 function replaceImportRequest(params, request, replacement) {
 	const index = params.indexOf(request);
@@ -391,12 +377,11 @@ function normalizeTailwindSourceDirectives(rawSource, options = {}) {
 	}
 }
 function isTailwindImportRequest(request) {
-	return request === "tailwindcss" || request === "tailwindcss4" || request?.startsWith("tailwindcss/") || request?.startsWith("tailwindcss4/");
+	const normalized = normalizeTailwindImportRequest(request);
+	return normalized === "tailwindcss" || normalized === "tailwindcss4" || normalized?.startsWith("tailwindcss/") === true || normalized?.startsWith("tailwindcss4/") === true;
 }
 function isTailwindImportAtRule(node, options = {}) {
-	if (node.name === "tailwind") return true;
-	if (node.name !== "import" && node.name !== "use" && node.name !== "forward") return false;
-	return isTailwindImportRequest(normalizeTailwindImportRequest(parseImportRequest(node.params), options));
+	return (0, _weapp_tailwindcss_postcss.isTailwindCssImportAtRule)(node, options);
 }
 function isTailwindSourceDirective(node, options = {}) {
 	if (node.type !== "atrule") return false;
@@ -410,10 +395,18 @@ function hasGeneratedCssArtifacts(rawSource) {
 	return hasTailwindGeneratedCssMarkers(rawSource) && !GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource);
 }
 function isTailwindGenerationDirective(node, options = {}) {
-	if (node.type !== "atrule") return false;
-	const atRule = node;
-	const request = atRule.name === "import" ? parseImportRequest(atRule.params) : atRule.name === "config" || atRule.name === "plugin" || atRule.name === "reference" ? parseConfigRequest(atRule.params) : void 0;
-	return isTailwindImportAtRule(atRule, options) || isPackageJsonImportRequest$1(request) || atRule.name === "apply" || !options.ignoreLayer && atRule.name === "layer" || atRule.name === "config" || atRule.name === "source";
+	return (0, _weapp_tailwindcss_postcss.isTailwindCssGenerationDirective)(node, options);
+}
+function analyzeParseableTailwindDirectives(rawSource, options = {}) {
+	try {
+		const ignoreLayer = options.ignoreLayer ?? hasGeneratedCssArtifacts(rawSource);
+		return (0, _weapp_tailwindcss_postcss.analyzeTailwindCssDirectives)(_weapp_tailwindcss_postcss.postcss.parse(rawSource), {
+			...options,
+			ignoreLayer
+		});
+	} catch {
+		return;
+	}
 }
 function removeTailwindSourceDirectives(rawSource, options = {}) {
 	try {
@@ -433,56 +426,19 @@ function removeTailwindSourceDirectives(rawSource, options = {}) {
 	}
 }
 function hasTailwindSourceDirectives(rawSource, options = {}) {
-	try {
-		if (GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		const ignoreLayer = hasGeneratedCssArtifacts(rawSource);
-		root.walk((node) => {
-			if (isTailwindGenerationDirective(node, {
-				...options,
-				ignoreLayer
-			})) {
-				found = true;
-				return false;
-			}
-		});
-		return found;
-	} catch {
-		return extractTailwindDirectiveLines(rawSource, options).length > 0;
-	}
+	if (GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource)) return true;
+	return analyzeParseableTailwindDirectives(rawSource, options)?.hasTailwindSourceDirectives ?? extractTailwindDirectiveLines(rawSource, options).length > 0;
 }
 function hasTailwindRootDirectives(rawSource, options = {}) {
 	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		root.walkAtRules((node) => {
-			const request = node.name === "import" ? parseImportRequest(node.params) : node.name === "config" || node.name === "plugin" ? parseConfigRequest(node.params) : void 0;
-			if (isTailwindImportAtRule(node, options) || isPackageJsonImportRequest$1(request) || TAILWIND_ROOT_DIRECTIVE_NAMES.has(node.name)) {
-				found = true;
-				return false;
-			}
-		});
-		return found;
-	} catch {
-		return extractTailwindDirectiveLines(rawSource, options).length > 0;
-	}
+	return analyzeParseableTailwindDirectives(rawSource, options)?.hasTailwindRootDirectives ?? extractTailwindDirectiveLines(rawSource, options).length > 0;
 }
 function hasTailwindApplyDirective(rawSource) {
 	if (!rawSource.includes("@apply")) return false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		root.walkAtRules("apply", () => {
-			found = true;
-			return false;
-		});
-		return found;
-	} catch {
-		const fallback = extractTailwindSourceForPostcssFallback(rawSource);
-		return typeof fallback === "string" && /@apply\s[^;{}]+;/.test(fallback);
-	}
+	const analysis = analyzeParseableTailwindDirectives(rawSource);
+	if (analysis) return analysis.hasTailwindApplyDirective;
+	const fallback = extractTailwindSourceForPostcssFallback(rawSource);
+	return typeof fallback === "string" && /@apply\s[^;{}]+;/.test(fallback);
 }
 function resolveCssEntrySource(rawSource, base, options = {}) {
 	try {
@@ -598,6 +554,15 @@ function filterUnsupportedMiniProgramTailwindV4Candidates(candidates) {
 	return new Set([...candidates].filter((candidate) => !isUnsupportedMiniProgramTailwindV4Candidate(candidate)));
 }
 //#endregion
+//#region src/tailwindcss/v4-engine/css-macro-source.ts
+function resolveCssMacroTailwindV4Source(source) {
+	const css = (0, _weapp_tailwindcss_postcss.transformCssMacroTailwindV4Source)(source.css);
+	return css === source.css ? source : {
+		...source,
+		css
+	};
+}
+//#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v4-default-colors.ts
 const TAILWIND_V4_COLOR_STEPS = [
 	"50",
@@ -1662,7 +1627,7 @@ function createIncrementalStyleOptions(styleOptions) {
 	};
 }
 function resolveStyleOptions(source, options) {
-	return (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4Directive)(source.css) ? (0, _weapp_tailwindcss_postcss.withCssMacroStyleOptions)(options) : options;
+	return (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4Source)(source.css) ? (0, _weapp_tailwindcss_postcss.withCssMacroStyleOptions)(options) : options;
 }
 function collectCustomPropertyValues(css) {
 	const values = /* @__PURE__ */ new Map();
@@ -1715,7 +1680,7 @@ function createTailwindV4Engine(source) {
 	async function generateOnce(generateSource, options = {}) {
 		const { scanSources = true, styleOptions, target = "weapp", ...patchOptions } = options;
 		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const engine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(createCompatibleSource(generateSource, target));
+		const engine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target));
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
 		const delegateSourceScan = shouldDelegateWebSourceScanToTailwind(target, resolvedScanSources);
 		const filesystemCandidates = !delegateSourceScan && Array.isArray(resolvedScanSources) ? new Set(await (0, _tailwindcss_mangle_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
@@ -1738,13 +1703,14 @@ function createTailwindV4Engine(source) {
 	}
 	async function generateWithIncrementalCache(options = {}) {
 		const target = options.target ?? "weapp";
-		const compatibleSource = createCompatibleSource(source, target);
+		const cssMacroSource = resolveCssMacroTailwindV4Source(source);
+		const compatibleSource = createCompatibleSource(cssMacroSource, target);
 		const requestedCandidates = resolveTargetCandidates(options.candidates, target);
 		const styleOptions = resolveStyleOptions(source, options.styleOptions);
-		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(source, options);
+		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(cssMacroSource, options);
 		const cacheKey = createIncrementalGenerateCacheKey(compatibleSource, target, styleOptions);
 		if (options.scanSources === true) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-			const generated = await generateOnce(source, options);
+			const generated = await generateOnce(cssMacroSource, options);
 			if (!seedIncrementalGenerateCache({
 				compatibleSource,
 				generated,
@@ -1757,7 +1723,7 @@ function createTailwindV4Engine(source) {
 		const cached = incrementalGenerateCache.get(cacheKey);
 		if (cached) {
 			if (hasRemovedCandidates(cached.seenCandidates, requestedCandidates)) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-				const generated = await generateOnce(source, options);
+				const generated = await generateOnce(cssMacroSource, options);
 				if (!seedIncrementalGenerateCache({
 					compatibleSource,
 					generated,
@@ -1781,7 +1747,7 @@ function createTailwindV4Engine(source) {
 				target: cached.target
 			};
 			if (shouldRebuildIncrementalEntry(cached, requestedCandidates, missingCandidates)) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-				const generated = await generateOnce(source, options);
+				const generated = await generateOnce(cssMacroSource, options);
 				if (!seedIncrementalGenerateCache({
 					compatibleSource,
 					generated,
@@ -1831,7 +1797,7 @@ function createTailwindV4Engine(source) {
 			});
 		}
 		return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-			const generated = await generateOnce(source, options);
+			const generated = await generateOnce(cssMacroSource, options);
 			seedIncrementalGenerateCache({
 				compatibleSource,
 				generated,
@@ -2262,10 +2228,12 @@ function normalizeWeappTailwindcssGeneratorOptions(options, context = {}) {
 		...context,
 		generatorTarget: target
 	});
+	const hasExplicitTarget = options !== void 0 && Object.hasOwn(options, "target");
+	const webCompat = options?.webCompat ?? (!hasExplicitTarget && branch.isWeb ? true : void 0);
 	if (options == null) return {
 		target,
 		branch,
-		webCompat: void 0,
+		webCompat,
 		importFallback: false,
 		bareArbitraryValues: void 0
 	};
@@ -2274,7 +2242,7 @@ function normalizeWeappTailwindcssGeneratorOptions(options, context = {}) {
 		branch,
 		config: options.config,
 		styleOptions: options.styleOptions,
-		webCompat: options.webCompat,
+		webCompat,
 		importFallback: options.importFallback ?? false,
 		bareArbitraryValues: options.bareArbitraryValues
 	};
@@ -2429,8 +2397,10 @@ function hasMiniProgramTailwindV4PreflightReset(css) {
 }
 function finalizeMiniProgramGeneratorCss(css, target, _majorVersion, cssPreflight, options = {}) {
 	if (target !== "weapp") return css;
+	const injectPreflight = options.injectPreflight !== false && !hasMiniProgramTailwindV4PreflightReset(css);
 	return (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCss)(css, {
-		cssPreflight: options.injectPreflight !== false && !hasMiniProgramTailwindV4PreflightReset(css) ? cssPreflight : void 0,
+		cssPreflight: cssPreflight === false ? false : injectPreflight ? cssPreflight : void 0,
+		cssSelectorReplacement: options.styleOptions?.cssOptions?.cssSelectorReplacement ?? options.styleOptions?.cssSelectorReplacement,
 		isTailwindcssV4: true,
 		tailwindcssV4GradientFallback: options.styleOptions?.cssOptions?.tailwindcssV4GradientFallback ?? options.styleOptions?.tailwindcssV4GradientFallback
 	});
@@ -5158,96 +5128,6 @@ function inheritLegacyUnitConvertedDeclarations(css, legacyCss) {
 	}
 }
 //#endregion
-//#region src/bundlers/shared/generator-css/local-imports.ts
-const REMOTE_IMPORT_RE = /^(?:https?:)?\/\//i;
-function createCssSourceOrderAppend(base, extra) {
-	if (!base) return extra;
-	if (!extra) return base;
-	if (/\s$/.test(base) || /^\s/.test(extra)) return `${base}${extra}`;
-	return `${base}\n${extra}`;
-}
-function isLocalImportRequest(request) {
-	return request.length > 0 && !request.startsWith("#") && !request.startsWith("tailwindcss") && !request.startsWith("weapp-tailwindcss") && !request.startsWith("data:") && !REMOTE_IMPORT_RE.test(request);
-}
-function isPureLocalCssImportWrapper(css) {
-	let hasImport = false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		for (const node of root.nodes) {
-			if (node.type === "comment") continue;
-			if (node.type !== "atrule" || node.name !== "import") return false;
-			const request = parseImportRequest(node.params);
-			if (!request || !isLocalImportRequest(request)) return false;
-			hasImport = true;
-		}
-	} catch {
-		return false;
-	}
-	return hasImport;
-}
-function cleanLocalCssImportWrapperTailwindDirectives(css) {
-	let hasLocalImport = false;
-	let hasTailwindDirective = false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		for (const node of root.nodes) {
-			if (node.type === "comment") continue;
-			if (node.type === "atrule" && node.name === "import") {
-				const request = parseImportRequest(node.params);
-				if (!request || !isLocalImportRequest(request)) return;
-				hasLocalImport = true;
-				continue;
-			}
-			if (node.type === "atrule" && node.name === "source") {
-				hasTailwindDirective = true;
-				continue;
-			}
-			return;
-		}
-	} catch {
-		return;
-	}
-	return hasLocalImport && hasTailwindDirective ? prefixLocalCssImportsWithWebpackIgnore(removeTailwindSourceDirectives(css)) : void 0;
-}
-function prefixLocalCssImportsWithWebpackIgnore(css) {
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(css);
-		root.walkAtRules("import", (atRule) => {
-			const request = parseImportRequest(atRule.params);
-			if (request && isLocalImportRequest(request)) atRule.raws.before = `${atRule.raws.before ?? ""}/* webpackIgnore: true */\n`;
-		});
-		return root.toString();
-	} catch {
-		return css;
-	}
-}
-function splitLocalCssImports(source) {
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(source);
-		const importRoot = _weapp_tailwindcss_postcss.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);
-}
-//#endregion
 //#region src/bundlers/shared/generator-css/user-layer-order.ts
 const USER_LAYER_COMPONENTS_START = "/*! weapp-tailwindcss layer components start */";
 const USER_LAYER_COMPONENTS_END = "/*! weapp-tailwindcss layer components end */";
@@ -5354,6 +5234,23 @@ function intersectCandidateSets(left, right) {
 	for (const candidate of small) if (large.has(candidate)) matched.add(candidate);
 	return matched;
 }
+function parseCssSourceRoot(rawSource) {
+	try {
+		return _weapp_tailwindcss_postcss.postcss.parse(rawSource);
+	} catch {
+		return;
+	}
+}
+function cleanLocalCssImportWrapperFromParsedRoot(rawSource, root) {
+	if (!root) return (0, _weapp_tailwindcss_postcss.cleanLocalCssImportWrapperTailwindDirectives)(rawSource);
+	return (0, _weapp_tailwindcss_postcss.cleanLocalCssImportWrapperTailwindDirectivesRoot)(root) ? root.toString() : void 0;
+}
+function isPureLocalCssImportWrapperFromParsedRoot(rawSource, root) {
+	return root ? (0, _weapp_tailwindcss_postcss.isPureLocalCssImportWrapperRoot)(root) : (0, _weapp_tailwindcss_postcss.isPureLocalCssImportWrapper)(rawSource);
+}
+function splitLocalCssImportsFromParsedRoot(rawSource, root) {
+	return root ? (0, _weapp_tailwindcss_postcss.splitLocalCssImportsRoot)(root) : (0, _weapp_tailwindcss_postcss.splitLocalCssImports)(rawSource);
+}
 function collectCssRuleIdentityMarkers(source) {
 	const markers = /* @__PURE__ */ new Set();
 	try {
@@ -5402,20 +5299,8 @@ async function generateCssByGenerator(options) {
 	const majorVersion = runtimeState.tailwindRuntime.majorVersion;
 	if (majorVersion !== 4) throw new Error("weapp-tailwindcss 生成管线仅支持 Tailwind CSS v4。");
 	const effectiveRawSource = stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })));
-	const localImportParts = splitLocalCssImports(effectiveRawSource);
-	const localImports = options.restoreLocalCssImports === false ? void 0 : localImportParts?.imports;
-	const finalizeGeneratorCss = (css, target, finalizeOptions = {}) => {
-		return finalizeWebGeneratorCss(restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, target, majorVersion, opts.cssPreflight, finalizeOptions), localImports), target, generatorOptions.webCompat);
-	};
-	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
-	const rawUserSource = userRawSource === void 0 ? generatorRawSource : userRawSourceProcessed ? userRawSource : stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(userRawSource, { importFallback: generatorOptions.importFallback })));
-	const userSource = splitLocalCssImports(rawUserSource)?.source ?? rawUserSource;
-	const userCssRawSource = removeTailwindV4GeneratorAtRules(userSource);
-	const generatedUserCssOrderSource = hasTailwindGeneratedCss(userSource) ? splitTailwindV4GeneratedCssBySourceOrder(userSource, generatorRawSource) : void 0;
-	const generatedUserCssRawSource = generatedUserCssOrderSource ? createCssAppend(generatedUserCssOrderSource.before, generatedUserCssOrderSource.after) : hasTailwindGeneratedCss(userSource) ? "" : userCssRawSource;
-	const userCssOrderSource = GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : hasTailwindGeneratedCss(userSource) ? userSource : generatedUserCssRawSource;
-	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(generatedUserCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
-	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
+	const effectiveRawSourceRoot = parseCssSourceRoot(effectiveRawSource);
+	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperFromParsedRoot(effectiveRawSource, effectiveRawSourceRoot);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: shouldUseMiniProgramCssBranch(generatorBranch) ? (0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
 		classSet: /* @__PURE__ */ new Set(),
@@ -5427,7 +5312,20 @@ async function generateCssByGenerator(options) {
 			majorVersion
 		}
 	};
-	if (isPureLocalCssImportWrapper(effectiveRawSource)) return;
+	if (isPureLocalCssImportWrapperFromParsedRoot(effectiveRawSource, effectiveRawSourceRoot)) return;
+	const localImportParts = splitLocalCssImportsFromParsedRoot(effectiveRawSource, effectiveRawSourceRoot);
+	const localImports = options.restoreLocalCssImports === false ? void 0 : localImportParts?.imports;
+	const finalizeGeneratorCss = (css, target, finalizeOptions = {}) => {
+		return finalizeWebGeneratorCss((0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(finalizeMiniProgramGeneratorCss(css, target, majorVersion, opts.cssPreflight, finalizeOptions), localImports), target, generatorOptions.webCompat);
+	};
+	const generatorRawSource = localImportParts?.source ?? effectiveRawSource;
+	const rawUserSource = userRawSource === void 0 ? generatorRawSource : userRawSourceProcessed ? userRawSource : stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(userRawSource, { importFallback: generatorOptions.importFallback })));
+	const userSource = (rawUserSource === generatorRawSource ? void 0 : (0, _weapp_tailwindcss_postcss.splitLocalCssImports)(rawUserSource))?.source ?? rawUserSource;
+	const userCssRawSource = removeTailwindV4GeneratorAtRules(userSource);
+	const generatedUserCssOrderSource = hasTailwindGeneratedCss(userSource) ? splitTailwindV4GeneratedCssBySourceOrder(userSource, generatorRawSource) : void 0;
+	const generatedUserCssRawSource = generatedUserCssOrderSource ? createCssAppend(generatedUserCssOrderSource.before, generatedUserCssOrderSource.after) : hasTailwindGeneratedCss(userSource) ? "" : userCssRawSource;
+	const userCssOrderSource = GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : hasTailwindGeneratedCss(userSource) ? userSource : generatedUserCssRawSource;
+	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(generatedUserCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
 	const hasGeneratedCss = hasTailwindGeneratedCss(generatorRawSource);
 	const hasSourceDirectives = hasTailwindSourceDirectives(generatorRawSource, { importFallback: generatorOptions.importFallback });
 	const hasGeneratedMarkers = hasTailwindGeneratedCssMarkers(generatorRawSource);
@@ -5495,7 +5393,7 @@ async function generateCssByGenerator(options) {
 		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(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = stripTailwindBanner(generated.incrementalCss);
-			const finalCss = finalizeWebGeneratorCss(restoreLocalCssImports(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
+			const finalCss = finalizeWebGeneratorCss((0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
 				injectPreflight: false,
 				styleOptions: generatorStyleOptions
 			})) : options.previousCss, localImports), generated.target, generatorOptions.webCompat);

package/dist/{webpack-DEag6ueE.mjs → webpack-Bg6pefpb.mjs}

@@ -1,10 +1,10 @@
-import { C as hasTailwindRootDirectives, F as hasTailwindGeneratedCssMarkers, G as getTailwindV4IncrementalGenerateCacheStats, O as parseImportRequest, P as hasTailwindGeneratedCss, T as normalizeTailwindConfigDirectives, _ as resolveTailwindcssOptions, ct as inferGeneratorTargetFromEnv, k as removeTailwindSourceDirectives, nt as resolveSourceScanPath, o as hasConfiguredTailwindV4CssRoots, s as upsertTailwindV4CssSource, w as hasTailwindSourceDirectives, x as hasTailwindApplyDirective } from "./v4-engine-BklH3CpJ.mjs";
-import { o as resolveRuntimeBranch } from "./generator-DNs6ekoC.mjs";
+import { C as hasTailwindRootDirectives, F as hasTailwindGeneratedCssMarkers, G as getTailwindV4IncrementalGenerateCacheStats, O as parseImportRequest, P as hasTailwindGeneratedCss, T as normalizeTailwindConfigDirectives, _ as resolveTailwindcssOptions, k as removeTailwindSourceDirectives, lt as inferGeneratorTargetFromEnv, nt as resolveSourceScanPath, o as hasConfiguredTailwindV4CssRoots, s as upsertTailwindV4CssSource, w as hasTailwindSourceDirectives, x as hasTailwindApplyDirective } from "./v4-engine-BuuYDXt1.mjs";
+import { o as resolveRuntimeBranch } from "./generator-24-HgU9F.mjs";
 import { r as getGroupedEntries } from "./utils-DodxWHGz.mjs";
-import { C as md5Hash, S as createDebug, b as ensureRuntimeClassSet, f as _defineProperty, i as pluginName, l as shouldSkipJsTransform, n as normalizeStyleHandlerMajorVersion, r as resolveStyleOptionsFromContext, t as getCompilerContext, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-B07Vf584.mjs";
-import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-BwV3_Ryc.mjs";
-import { C as stripTailwindSourceMediaFragments, D as createCssSourceOrderAppend, E as removeGeneratedSelectorCompatCss, F as createCssTokenSourceMap, I as isCssSourceTraceEnabled, L as processCachedTask, M as stripMiniProgramCssSpecificityPlaceholders, N as annotateCssSourceTrace, O as hasMiniProgramTailwindV4PreflightReset, P as createCssSourceTraceCacheSignature, S as removeTailwindV4GeneratorAtRules, T as scoreTailwindV4CssSourceFileMatch, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as removeMiniProgramHoverSelectors, c as collectStrictEscapedRuntimeCandidates, f as pushConcurrentTaskFactories, i as createSourceCandidateStore, j as pruneMiniProgramGeneratedCss, k as finalizeMiniProgramCss, l as createEscapeFragments, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as resolveTaskConcurrency, s as createBundleRuntimeClassSetManager, w as stripUnmatchedTailwindSourceMediaCloseFragments, x as removeTailwindV4GeneratedUserCssArtifacts } from "./hmr-timing-DLYQTCDb.mjs";
-import { A as isSourceStyleRequest, C as resolvePluginDisabledState, N as resolveOutputSpecifier, P as toAbsoluteOutputPath, S as resolvePackageDir, _ as generateTailwindV4Css, d as classifyBundleEntry, f as createBundleBuildState, i as createCandidateSignature, j as stripRequestQuery, m as createRuntimeAffectingSourceSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-pS87mdHZ.mjs";
+import { S as createDebug, b as ensureRuntimeClassSet, f as _defineProperty, i as pluginName, l as shouldSkipJsTransform, n as normalizeStyleHandlerMajorVersion, r as resolveStyleOptionsFromContext, t as getCompilerContext, w as md5Hash, x as refreshTailwindRuntimeState, y as createTailwindRuntimeReadyPromise } from "./context-Bkpmt3ja.mjs";
+import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-D0JF0fuZ.mjs";
+import { C as stripTailwindSourceMediaFragments, D as createCssSourceOrderAppend, E as removeGeneratedSelectorCompatCss, F as createCssTokenSourceMap, I as isCssSourceTraceEnabled, L as processCachedTask, M as stripMiniProgramCssSpecificityPlaceholders, N as annotateCssSourceTrace, O as hasMiniProgramTailwindV4PreflightReset, P as createCssSourceTraceCacheSignature, S as removeTailwindV4GeneratorAtRules, T as scoreTailwindV4CssSourceFileMatch, _ as isPureLocalCssImportWrapper, a as isSourceCandidateRequest, b as removeMiniProgramHoverSelectors, c as collectStrictEscapedRuntimeCandidates, f as pushConcurrentTaskFactories, i as createSourceCandidateStore, j as pruneMiniProgramGeneratedCss, k as finalizeMiniProgramCss, l as createEscapeFragments, n as emitHmrTiming, o as resolveSourceCandidateScanFiles, p as resolveTaskConcurrency, s as createBundleRuntimeClassSetManager, w as stripUnmatchedTailwindSourceMediaCloseFragments, x as removeTailwindV4GeneratedUserCssArtifacts } from "./hmr-timing-BRNaz8Od.mjs";
+import { A as isSourceStyleRequest, C as resolvePluginDisabledState, N as resolveOutputSpecifier, P as toAbsoluteOutputPath, S as resolvePackageDir, _ as generateTailwindV4Css, d as classifyBundleEntry, f as createBundleBuildState, i as createCandidateSignature, j as stripRequestQuery, m as createRuntimeAffectingSourceSignature, p as updateBundleBuildState, r as createScopedGeneratorRuntime, t as createSourceCandidateScanSignature, x as stripBundlerGeneratedCssMarkers, y as hasBundlerGeneratedCssMarker } from "./source-candidate-scan-signature-BB1hvW68.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";
@@ -470,6 +470,7 @@ const WEBPACK_TAILWIND_GENERATED_LAYER_NAMES = /* @__PURE__ */ new Set([
 ]);
 const WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE = /(?:^|[^\w-])\.[^,{]{0,512}(?:\\:|\\\[|\\#)/;
 const WEBPACK_TAILWIND_UTILITY_PREFIX_RE = /^\.(?:-?(?:bg|text|border|ring|shadow|drop-shadow|[pmwhz]|px|py|pt|pr|pb|pl|mx|my|mt|mr|mb|ml|min-w|min-h|max-w|max-h|flex|grid|inline|block|hidden|rounded|opacity|translate|scale|rotate|skew|top|right|bottom|left|inset|gap|font|leading|tracking|underline|container)(?:[\-\\{]|$)|\\\[)/;
+const WEBPACK_TAILWIND_BANNER_RE = /tailwindcss v4\./;
 function parseWebpackCssLayerNames(params) {
 	return params.split(",").map((name) => name.trim()).filter(Boolean);
 }
@@ -478,6 +479,22 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 	try {
 		const root = postcss.parse(cleaned);
 		let changed = false;
+		let removingBannerPrefix = false;
+		for (const node of [...root.nodes]) {
+			if (node.type === "comment" && WEBPACK_TAILWIND_BANNER_RE.test(node.text)) {
+				node.remove();
+				changed = true;
+				removingBannerPrefix = true;
+				continue;
+			}
+			if (!removingBannerPrefix) continue;
+			if (isWebpackTailwindGeneratedPrefixNode(node)) {
+				node.remove();
+				changed = true;
+				continue;
+			}
+			removingBannerPrefix = false;
+		}
 		root.walkAtRules("layer", (rule) => {
 			const names = parseWebpackCssLayerNames(rule.params);
 			const hasGeneratedLayerName = names.some((name) => WEBPACK_TAILWIND_GENERATED_LAYER_NAMES.has(name));
@@ -507,6 +524,20 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 				}
 			}
 		});
+		root.walkRules((rule) => {
+			if (rule.parent?.type === "atrule" && rule.parent.name === "layer") return;
+			const selector = rule.selector.trim();
+			if (WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector)) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		root.walkComments((comment) => {
+			if (WEBPACK_TAILWIND_BANNER_RE.test(comment.text)) {
+				comment.remove();
+				changed = true;
+			}
+		});
 		root.walkAtRules((rule) => {
 			if (rule.nodes !== void 0 && rule.nodes.length === 0) {
 				rule.remove();
@@ -518,6 +549,18 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 		return cleaned;
 	}
 }
+function isWebpackTailwindGeneratedPrefixNode(node) {
+	if (node.type === "rule") return node.selectors.every((selector) => isWebpackTailwindGeneratedUtilitySelector(selector.trim(), true));
+	if (node.type !== "atrule") return false;
+	const names = node.name === "layer" ? parseWebpackCssLayerNames(node.params) : [];
+	if (node.name === "property" && node.params.trim().startsWith("--tw-")) return true;
+	if (names.length > 0 && names.every((name) => WEBPACK_TAILWIND_GENERATED_LAYER_NAMES.has(name))) return true;
+	if (node.nodes === void 0 || node.nodes.length === 0) return false;
+	return node.nodes.every((child) => isWebpackTailwindGeneratedPrefixNode(child));
+}
+function isWebpackTailwindGeneratedUtilitySelector(selector, includePrefix) {
+	return WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector) || includePrefix && WEBPACK_TAILWIND_UTILITY_PREFIX_RE.test(selector);
+}
 function collectWebpackCssRuleIdentityMarkers(source) {
 	const markers = /* @__PURE__ */ new Set();
 	try {

package/dist/{webpack-hvSFaicc.js → webpack-khSwkXP5.js}

@@ -1,11 +1,11 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-CKbS27-o.js");
-const require_generator = require("./generator-CV_0irKO.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+const require_generator = require("./generator-CilgHtxb.js");
 const require_utils = require("./utils-D3h8j7Mk.js");
-const require_context = require("./context-D75pwtBW.js");
-const require_tailwindcss = require("./tailwindcss-BSCvrs1p.js");
-const require_hmr_timing = require("./hmr-timing-DOoHun3i.js");
-const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-DzwebZrf.js");
+const require_context = require("./context-DCVMkTRj.js");
+const require_tailwindcss = require("./tailwindcss-D2xs4OEu.js");
+const require_hmr_timing = require("./hmr-timing-BV6nFPoT.js");
+const require_source_candidate_scan_signature = require("./source-candidate-scan-signature-CaDT0gkj.js");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs);
 let node_path = require("node:path");
@@ -476,6 +476,7 @@ const WEBPACK_TAILWIND_GENERATED_LAYER_NAMES = /* @__PURE__ */ new Set([
 ]);
 const WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE = /(?:^|[^\w-])\.[^,{]{0,512}(?:\\:|\\\[|\\#)/;
 const WEBPACK_TAILWIND_UTILITY_PREFIX_RE = /^\.(?:-?(?:bg|text|border|ring|shadow|drop-shadow|[pmwhz]|px|py|pt|pr|pb|pl|mx|my|mt|mr|mb|ml|min-w|min-h|max-w|max-h|flex|grid|inline|block|hidden|rounded|opacity|translate|scale|rotate|skew|top|right|bottom|left|inset|gap|font|leading|tracking|underline|container)(?:[\-\\{]|$)|\\\[)/;
+const WEBPACK_TAILWIND_BANNER_RE = /tailwindcss v4\./;
 function parseWebpackCssLayerNames(params) {
 	return params.split(",").map((name) => name.trim()).filter(Boolean);
 }
@@ -484,6 +485,22 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 	try {
 		const root = _weapp_tailwindcss_postcss.postcss.parse(cleaned);
 		let changed = false;
+		let removingBannerPrefix = false;
+		for (const node of [...root.nodes]) {
+			if (node.type === "comment" && WEBPACK_TAILWIND_BANNER_RE.test(node.text)) {
+				node.remove();
+				changed = true;
+				removingBannerPrefix = true;
+				continue;
+			}
+			if (!removingBannerPrefix) continue;
+			if (isWebpackTailwindGeneratedPrefixNode(node)) {
+				node.remove();
+				changed = true;
+				continue;
+			}
+			removingBannerPrefix = false;
+		}
 		root.walkAtRules("layer", (rule) => {
 			const names = parseWebpackCssLayerNames(rule.params);
 			const hasGeneratedLayerName = names.some((name) => WEBPACK_TAILWIND_GENERATED_LAYER_NAMES.has(name));
@@ -513,6 +530,20 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 				}
 			}
 		});
+		root.walkRules((rule) => {
+			if (rule.parent?.type === "atrule" && rule.parent.name === "layer") return;
+			const selector = rule.selector.trim();
+			if (WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector)) {
+				rule.remove();
+				changed = true;
+			}
+		});
+		root.walkComments((comment) => {
+			if (WEBPACK_TAILWIND_BANNER_RE.test(comment.text)) {
+				comment.remove();
+				changed = true;
+			}
+		});
 		root.walkAtRules((rule) => {
 			if (rule.nodes !== void 0 && rule.nodes.length === 0) {
 				rule.remove();
@@ -524,6 +555,18 @@ function removeWebpackTailwindGeneratedAssetCss(source) {
 		return cleaned;
 	}
 }
+function isWebpackTailwindGeneratedPrefixNode(node) {
+	if (node.type === "rule") return node.selectors.every((selector) => isWebpackTailwindGeneratedUtilitySelector(selector.trim(), true));
+	if (node.type !== "atrule") return false;
+	const names = node.name === "layer" ? parseWebpackCssLayerNames(node.params) : [];
+	if (node.name === "property" && node.params.trim().startsWith("--tw-")) return true;
+	if (names.length > 0 && names.every((name) => WEBPACK_TAILWIND_GENERATED_LAYER_NAMES.has(name))) return true;
+	if (node.nodes === void 0 || node.nodes.length === 0) return false;
+	return node.nodes.every((child) => isWebpackTailwindGeneratedPrefixNode(child));
+}
+function isWebpackTailwindGeneratedUtilitySelector(selector, includePrefix) {
+	return WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector) || includePrefix && WEBPACK_TAILWIND_UTILITY_PREFIX_RE.test(selector);
+}
 function collectWebpackCssRuleIdentityMarkers(source) {
 	const markers = /* @__PURE__ */ new Set();
 	try {
@@ -1807,7 +1850,7 @@ function setupWebpackV5ProcessAssetsHook(options) {
 								}),
 								sourceCssProcessed
 							}), registeredUserRawSource);
-							if (require_hmr_timing.isPureLocalCssImportWrapper(currentRawSource)) return { result: new ConcatSource(require_v4_engine.removeTailwindSourceDirectives(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(currentRawSource), { importFallback: true })) };
+							if ((0, _weapp_tailwindcss_postcss.isPureLocalCssImportWrapper)(currentRawSource)) return { result: new ConcatSource(require_v4_engine.removeTailwindSourceDirectives(require_source_candidate_scan_signature.stripBundlerGeneratedCssMarkers(currentRawSource), { importFallback: true })) };
 							const fallbackGeneratorRuntimeSet = getGeneratorRuntimeSet();
 							const hasExplicitTailwindV4SourceCss = sourceCss !== void 0 && (require_v4_engine.hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || sourceCss.includes("@config"));
 							const currentAssetHasTailwindDirectives = require_v4_engine.hasTailwindRootDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindSourceDirectives(generatorRawSource, { importFallback: true }) || require_v4_engine.hasTailwindApplyDirective(generatorRawSource);