weapp-tailwindcss 5.0.0-next.3 → 5.0.0-next.5

package/dist/{generator-css-CRLrHW4F.js → generator-css-CGueCYbX.js}

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_generator = require("./generator-mmhXzZnv.js");
-const require_recorder = require("./recorder-GdTJ3QqX.js");
+const require_generator = require("./generator-9UEp8OoQ.js");
+const require_recorder = require("./recorder-D4BKt75Q.js");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
 let node_path = require("node:path");
@@ -166,7 +166,7 @@ function removeUnsupportedMiniProgramAtRules(css) {
 			if (MINI_PROGRAM_UNSUPPORTED_AT_RULES.has(atRule.name)) atRule.remove();
 		});
 		root.walkAtRules((atRule) => {
-			if (!atRule.nodes || atRule.nodes.length === 0) atRule.remove();
+			if (atRule.nodes && atRule.nodes.length === 0) atRule.remove();
 		});
 		return root.toString();
 	} catch {
@@ -567,6 +567,10 @@ function inheritLegacyUnitConvertedDeclarations(css, legacyCss) {
 	}
 }
 function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOptions) {
+	const tailwindV3StyleOptions = cssHandlerOptions.majorVersion === 3 ? {
+		cssPreflight: opts.cssPreflight,
+		cssPreflightRange: opts.cssPreflightRange
+	} : {};
 	return {
 		cssChildCombinatorReplaceValue: opts.cssChildCombinatorReplaceValue,
 		cssSelectorReplacement: opts.cssSelectorReplacement,
@@ -583,6 +587,7 @@ function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOpt
 		uniAppXCssTarget: opts.uniAppXCssTarget,
 		uniAppXUnsupported: opts.uniAppXUnsupported,
 		...cssHandlerOptions,
+		...tailwindV3StyleOptions,
 		...generatorStyleOptions
 	};
 }
@@ -592,6 +597,9 @@ function parseImportRequest(params) {
 function parseConfigRequest(params) {
 	return /^(["'])(.+)\1\s*;?$/.exec(params.trim())?.[2];
 }
+function isPackageJsonImportRequest(request) {
+	return typeof request === "string" && request.startsWith("#");
+}
 function resolvePostcssFromOption(cssHandlerOptions) {
 	const from = cssHandlerOptions.postcssOptions?.options?.from;
 	return typeof from === "string" && from.length > 0 ? from : void 0;
@@ -609,11 +617,13 @@ function isTailwindImportAtRule(node) {
 function isTailwindSourceDirective(node) {
 	if (node.type !== "atrule") return false;
 	if (isTailwindImportAtRule(node)) return true;
+	if (node.name === "import" && isPackageJsonImportRequest(parseImportRequest(node.params))) return true;
 	return TAILWIND_REMOVABLE_SOURCE_DIRECTIVE_NAMES.has(node.name);
 }
 function isTailwindGenerationDirective(node) {
 	if (node.type !== "atrule") return false;
-	return isTailwindImportAtRule(node) || node.name === "layer" || node.name === "config";
+	const request = node.name === "import" ? parseImportRequest(node.params) : node.name === "config" || node.name === "plugin" || node.name === "reference" ? parseConfigRequest(node.params) : void 0;
+	return isTailwindImportAtRule(node) || isPackageJsonImportRequest(request) || node.name === "apply" || node.name === "layer" || node.name === "config" || node.name === "source";
 }
 function removeTailwindSourceDirectives(rawSource) {
 	try {
@@ -661,7 +671,7 @@ function resolveCssEntrySource(rawSource, base, options = {}) {
 				const configPath = parseConfigRequest(node.params);
 				if (configPath && !config) {
 					configRequest = configPath;
-					config = node_path.default.isAbsolute(configPath) ? configPath : node_path.default.resolve(base, configPath);
+					config = isPackageJsonImportRequest(configPath) ? void 0 : node_path.default.isAbsolute(configPath) ? configPath : node_path.default.resolve(base, configPath);
 				}
 				if (removeConfig) {
 					node.remove();
@@ -700,6 +710,20 @@ function resolveExistingConfigPath(config, configRequest, file, sourceOptions) {
 	}
 	return sourceOptions.config;
 }
+function quoteCssString(value) {
+	return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
+}
+function toCssPath(value) {
+	return value.replaceAll("\\", "/");
+}
+function prependConfigDirective(css, config) {
+	if (!config || /@config\s+/.test(css)) return css;
+	return `@config "${quoteCssString(toCssPath(config))}";\n${css}`;
+}
+function normalizeConfigDirective(css, config) {
+	if (!config || !/@config\s+/.test(css)) return css;
+	return css.replace(/@config\s+(["'])(.+?)\1\s*;?/, `@config "${quoteCssString(toCssPath(config))}";`);
+}
 function stripStyleExtension(file) {
 	return file.replace(/[?#].*$/, "").replace(/\.(?:wx|ac|jx|tt|q|c|ty)?ss$/i, "");
 }
@@ -741,6 +765,11 @@ function createSourceStylePathCandidates(file, sourceOptions) {
 	}
 	return [...candidates];
 }
+function canResolveSourceSideCssEntry(file, cssHandlerOptions) {
+	const from = resolvePostcssFromOption(cssHandlerOptions);
+	if (!from || !node_path.default.isAbsolute(from)) return node_path.default.isAbsolute(file);
+	return true;
+}
 function extractStyleDirectiveSources(source) {
 	const styleSources = [];
 	SFC_STYLE_BLOCK_RE.lastIndex = 0;
@@ -770,6 +799,34 @@ function resolveSourceSideCssEntrySource(file, sourceOptions, resolveOptions = {
 		}
 	}
 }
+function normalizeCssSourceForCompare(css) {
+	return stripGeneratorPlaceholderMarkers(stripTailwindBanners(css)).trim();
+}
+function getOutputFileStem(file) {
+	const normalized = file.replace(/[?#].*$/, "");
+	return node_path.default.basename(normalized, node_path.default.extname(normalized));
+}
+function resolveMatchingTailwindV4CssEntry(rawSource, file, sourceOptions) {
+	const cssEntries = sourceOptions.cssEntries;
+	if (!cssEntries?.length) return;
+	const normalizedRawSource = normalizeCssSourceForCompare(rawSource);
+	const outputStem = getOutputFileStem(file);
+	const matchingEntry = cssEntries.find((cssEntry) => {
+		if (!(0, node_fs.existsSync)(cssEntry)) return false;
+		try {
+			if (normalizeCssSourceForCompare((0, node_fs.readFileSync)(cssEntry, "utf8")) === normalizedRawSource) return true;
+			return outputStem.length > 0 && getOutputFileStem(cssEntry) === outputStem;
+		} catch {
+			return false;
+		}
+	});
+	if (!matchingEntry) return;
+	return require_generator.resolveTailwindV4Source({
+		...sourceOptions,
+		css: void 0,
+		cssEntries: [matchingEntry]
+	});
+}
 function tryResolveTailwindV4SourceOptions(runtimeState) {
 	try {
 		return require_generator.resolveTailwindV4SourceOptionsFromPatcher(runtimeState.twPatcher);
@@ -777,16 +834,20 @@ function tryResolveTailwindV4SourceOptions(runtimeState) {
 		return;
 	}
 }
-async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions) {
+async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions) {
 	const cssEntrySource = resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), { removeConfig: majorVersion === 3 });
 	if (majorVersion === 3) {
 		const sourceOptions = require_generator.resolveTailwindV3SourceOptionsFromPatcher(runtimeState.twPatcher);
-		const sourceSideEntrySource = resolveSourceSideCssEntrySource(file, sourceOptions, { removeConfig: true });
+		const mergedSourceOptions = {
+			...sourceOptions,
+			config: generatorOptions?.config ?? sourceOptions.config
+		};
+		const sourceSideEntrySource = canResolveSourceSideCssEntry(file, cssHandlerOptions) ? resolveSourceSideCssEntrySource(file, mergedSourceOptions, { removeConfig: true }) : void 0;
 		const resolvedEntrySource = cssEntrySource ?? sourceSideEntrySource;
-		if (!resolvedEntrySource) return require_generator.resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
-		const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, sourceOptions);
+		if (!resolvedEntrySource) return generatorOptions?.config ? require_generator.resolveTailwindV3Source(mergedSourceOptions) : require_generator.resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
+		const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, mergedSourceOptions);
 		return require_generator.resolveTailwindV3Source({
-			...sourceOptions,
+			...mergedSourceOptions,
 			base: resolvedEntrySource.base,
 			css: resolvedEntrySource.css,
 			...config ? { config } : {}
@@ -794,29 +855,46 @@ async function resolveGeneratorSource(majorVersion, runtimeState, rawSource, fil
 	}
 	const sourceOptions = tryResolveTailwindV4SourceOptions(runtimeState);
 	const shouldPreferSourceSideEntry = shouldResolveSourceSideCssEntry(rawSource) || Boolean(cssEntrySource?.css.includes("weapp-tailwindcss generator-placeholder"));
-	const resolvedEntrySource = (sourceOptions && shouldPreferSourceSideEntry ? resolveSourceSideCssEntrySource(file, sourceOptions, { removeConfig: false }) : void 0) ?? cssEntrySource;
-	if (!resolvedEntrySource) return require_generator.resolveTailwindV4SourceFromPatcher(runtimeState.twPatcher);
+	const sourceSideEntrySource = sourceOptions && shouldPreferSourceSideEntry ? resolveSourceSideCssEntrySource(file, sourceOptions, { removeConfig: false }) : void 0;
+	const matchedCssEntrySource = sourceOptions && cssEntrySource ? await resolveMatchingTailwindV4CssEntry(rawSource, file, sourceOptions) : void 0;
+	if (matchedCssEntrySource) return generatorOptions?.config ? {
+		...matchedCssEntrySource,
+		css: prependConfigDirective(matchedCssEntrySource.css, generatorOptions.config)
+	} : matchedCssEntrySource;
+	const resolvedEntrySource = sourceSideEntrySource ?? cssEntrySource;
+	if (!resolvedEntrySource) {
+		const source = await require_generator.resolveTailwindV4SourceFromPatcher(runtimeState.twPatcher);
+		return generatorOptions?.config ? {
+			...source,
+			css: prependConfigDirective(source.css, generatorOptions.config)
+		} : source;
+	}
+	const resolvedSourceOptions = sourceOptions ?? {};
+	const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, resolvedSourceOptions);
 	return require_generator.resolveTailwindV4Source({
-		...sourceOptions ?? {},
+		...resolvedSourceOptions,
 		base: resolvedEntrySource.base,
-		css: resolvedEntrySource.css
+		css: normalizeConfigDirective(prependConfigDirective(resolvedEntrySource.css, generatorOptions?.config), config)
 	});
 }
-async function resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions) {
+async function resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions) {
 	const cssEntrySource = resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), { removeConfig: majorVersion === 3 });
-	if (majorVersion !== 4 || cssEntrySource && !cssHandlerOptions.isMainChunk) return [await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions)];
+	if (majorVersion !== 4 || cssEntrySource && !cssHandlerOptions.isMainChunk) return [await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions)];
 	let sourceOptions;
 	try {
 		sourceOptions = require_generator.resolveTailwindV4SourceOptionsFromPatcher(runtimeState.twPatcher);
 	} catch {
-		return [await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions)];
+		return [await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions)];
 	}
-	if (!sourceOptions.cssEntries || sourceOptions.cssEntries.length <= 1) return [await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions)];
+	if (!sourceOptions.cssEntries || sourceOptions.cssEntries.length <= 1) return [await resolveGeneratorSource(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions)];
 	return await Promise.all(sourceOptions.cssEntries.map((cssEntry) => require_generator.resolveTailwindV4Source({
 		...sourceOptions,
 		css: void 0,
 		cssEntries: [cssEntry]
-	})));
+	}).then((source) => generatorOptions?.config ? {
+		...source,
+		css: prependConfigDirective(source.css, generatorOptions.config)
+	} : source)));
 }
 function isLocalImportRequest(request) {
 	return request.length > 0 && !request.startsWith("tailwindcss") && !request.startsWith("weapp-tailwindcss") && !request.startsWith("data:") && !REMOTE_IMPORT_RE.test(request);
@@ -837,8 +915,62 @@ function isPureLocalCssImportWrapper(css) {
 	}
 	return hasImport;
 }
+function cleanLocalCssImportWrapperTailwindDirectives(css) {
+	let hasLocalImport = false;
+	let hasTailwindDirective = false;
+	try {
+		const root = postcss.default.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 = postcss.default.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 resolveLegacyCompatCssSource(rawSource) {
-	return removeUnsupportedMiniProgramAtRules(removeTailwindSourceDirectives(stripTailwindBanners(rawSource)));
+	return removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(removeTailwindSourceDirectives(stripTailwindBanners(rawSource))));
+}
+function removeTailwindApplyRules(rawSource) {
+	try {
+		const root = postcss.default.parse(rawSource);
+		let removed = false;
+		root.walkAtRules("apply", (rule) => {
+			const parent = rule.parent;
+			if (parent?.type === "rule") parent.remove();
+			else rule.remove();
+			removed = true;
+		});
+		root.walkAtRules((rule) => {
+			if (rule.nodes && rule.nodes.length === 0) rule.remove();
+		});
+		return removed ? root.toString() : rawSource;
+	} catch {
+		return rawSource;
+	}
 }
 function hasContainerConfigToken(rawSource) {
 	return rawSource.includes("@config") && /\bcontainer\b/.test(rawSource);
@@ -945,7 +1077,7 @@ function removeGeneratedSelectorCompatCss(css, generatedCss) {
 			}
 		});
 		root.walkAtRules((atRule) => {
-			if (!atRule.nodes || atRule.nodes.length === 0) atRule.remove();
+			if (atRule.nodes && atRule.nodes.length === 0) atRule.remove();
 		});
 		return removed ? root.toString() : css;
 	} catch {
@@ -1018,22 +1150,28 @@ async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, styleHandler, debug } = options;
 	const generatorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions(opts.generator);
 	const majorVersion = runtimeState.twPatcher.majorVersion;
+	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(rawSource);
+	if (cleanedLocalImportWrapper !== void 0) return {
+		css: generatorOptions.target === "weapp" ? removeUnsupportedMiniProgramAtRules(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
+		target: generatorOptions.target,
+		source: "generator",
+		dependencies: []
+	};
 	if (isPureLocalCssImportWrapper(rawSource)) return;
 	const hasGeneratedCss = hasTailwindGeneratedCss(rawSource);
 	const hasSourceDirectives = hasTailwindSourceDirectives(rawSource);
 	const hasGeneratedMarkers = hasTailwindGeneratedCssMarkers(rawSource);
-	const shouldForceGenerateCurrentCss = hasGeneratedCss || hasGeneratedMarkers || hasSourceDirectives || cssHandlerOptions.isMainChunk;
-	const shouldAutoGenerateCurrentCss = hasGeneratedCss || hasGeneratedMarkers || hasSourceDirectives;
-	if (generatorOptions.mode === "off" || !SUPPORTED_GENERATOR_MAJOR_VERSIONS.has(majorVersion ?? 0) || (generatorOptions.mode === "force" ? !shouldForceGenerateCurrentCss : !shouldAutoGenerateCurrentCss) || generatorOptions.mode === "force" && majorVersion === 3 && !hasSourceDirectives && !hasGeneratedCss && !hasGeneratedMarkers || generatorOptions.mode !== "force" && majorVersion === 3) return;
+	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.patchPromise;
-		const sources = await resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions);
+		const sources = await resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions);
 		const generatorStyleOptions = resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorOptions.styleOptions);
 		const configuredContainerCompat = hasConfiguredContainerCompatSources(sources);
 		const generatedResults = await Promise.all(sources.map(async (source) => {
 			return require_generator.createWeappTailwindcssGenerator(source).generate({
 				candidates: runtime,
-				scanSources: false,
+				scanSources: majorVersion === 4,
 				styleOptions: generatorStyleOptions,
 				tailwindcssV3Compatibility: generatorOptions.tailwindcssV3Compatibility,
 				target: generatorOptions.target
@@ -1061,7 +1199,8 @@ async function generateCssByGenerator(options) {
 					if (extraSource.trim().length === 0) return {
 						css: finalizeMiniProgramGeneratorCss(css, generated.target),
 						target: generated.target,
-						source: "generator"
+						source: "generator",
+						dependencies: generated.dependencies
 					};
 					if (generated.target === "weapp") {
 						const { css: userCss } = await styleHandler(extraSource, {
@@ -1072,14 +1211,15 @@ async function generateCssByGenerator(options) {
 					} else css = createCssAppend(css, extraSource);
 				}
 			}
-			if (generated.target === "weapp" && generatorOptions.mode === "force") {
+			if (generated.target === "weapp") {
 				css = await appendLegacyCompatCss(css, rawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				css = await appendLegacyContainerCompatCss(css, rawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
 			return {
 				css: finalizeMiniProgramGeneratorCss(css, generated.target),
 				target: generated.target,
-				source: "generator"
+				source: "generator",
+				dependencies: generated.dependencies
 			};
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
@@ -1090,11 +1230,12 @@ async function generateCssByGenerator(options) {
 		return {
 			css: finalizeMiniProgramGeneratorCss(css, generated.target),
 			target: generated.target,
-			source: generatorOptions.mode === "force" ? "generator-forced" : "generator"
+			source: "generator",
+			dependencies: generated.dependencies
 		};
 	} catch (error) {
-		if (generatorOptions.mode === "force") throw error;
-		debug("tailwind direct css generation failed, fallback to styleHandler: %s %O", file, error);
+		debug("tailwind direct css generation failed: %s %O", file, error);
+		throw error;
 	}
 }
 //#endregion