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

package/dist/{generator-css-B5ejWUMv.mjs → generator-css-MyjZhF0z.mjs}

@@ -1,5 +1,5 @@
-import { a as resolveTailwindV4Source, c as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV3SourceOptionsFromPatcher, i as normalizeWeappTailwindcssGeneratorOptions, m as resolveTailwindV3SourceFromPatcher, p as resolveTailwindV3Source, s as resolveTailwindV4SourceFromPatcher, t as createWeappTailwindcssGenerator, v as removeUnsupportedCascadeLayers } from "./generator-Y-Ikv4Fu.mjs";
-import { l as replaceWxml } from "./recorder-zsgatmkB.mjs";
+import { a as resolveTailwindV4Source, c as resolveTailwindV4SourceOptionsFromPatcher, h as resolveTailwindV3SourceOptionsFromPatcher, i as normalizeWeappTailwindcssGeneratorOptions, m as resolveTailwindV3SourceFromPatcher, p as resolveTailwindV3Source, s as resolveTailwindV4SourceFromPatcher, t as createWeappTailwindcssGenerator, v as removeUnsupportedCascadeLayers } from "./generator-Dpp-5s8z.mjs";
+import { l as replaceWxml } from "./recorder-BIW3Kuke.mjs";
 import postcss from "postcss";
 import path from "node:path";
 import process from "node:process";
@@ -162,7 +162,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 {
@@ -563,6 +563,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,
@@ -579,6 +583,7 @@ function resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorStyleOpt
 		uniAppXCssTarget: opts.uniAppXCssTarget,
 		uniAppXUnsupported: opts.uniAppXUnsupported,
 		...cssHandlerOptions,
+		...tailwindV3StyleOptions,
 		...generatorStyleOptions
 	};
 }
@@ -588,6 +593,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;
@@ -605,11 +613,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 {
@@ -657,7 +667,7 @@ function resolveCssEntrySource(rawSource, base, options = {}) {
 				const configPath = parseConfigRequest(node.params);
 				if (configPath && !config) {
 					configRequest = configPath;
-					config = path.isAbsolute(configPath) ? configPath : path.resolve(base, configPath);
+					config = isPackageJsonImportRequest(configPath) ? void 0 : path.isAbsolute(configPath) ? configPath : path.resolve(base, configPath);
 				}
 				if (removeConfig) {
 					node.remove();
@@ -696,6 +706,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, "");
 }
@@ -737,6 +761,11 @@ function createSourceStylePathCandidates(file, sourceOptions) {
 	}
 	return [...candidates];
 }
+function canResolveSourceSideCssEntry(file, cssHandlerOptions) {
+	const from = resolvePostcssFromOption(cssHandlerOptions);
+	if (!from || !path.isAbsolute(from)) return path.isAbsolute(file);
+	return true;
+}
 function extractStyleDirectiveSources(source) {
 	const styleSources = [];
 	SFC_STYLE_BLOCK_RE.lastIndex = 0;
@@ -766,6 +795,34 @@ function resolveSourceSideCssEntrySource(file, sourceOptions, resolveOptions = {
 		}
 	}
 }
+function normalizeCssSourceForCompare(css) {
+	return stripGeneratorPlaceholderMarkers(stripTailwindBanners(css)).trim();
+}
+function getOutputFileStem(file) {
+	const normalized = file.replace(/[?#].*$/, "");
+	return path.basename(normalized, path.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 (!existsSync(cssEntry)) return false;
+		try {
+			if (normalizeCssSourceForCompare(readFileSync(cssEntry, "utf8")) === normalizedRawSource) return true;
+			return outputStem.length > 0 && getOutputFileStem(cssEntry) === outputStem;
+		} catch {
+			return false;
+		}
+	});
+	if (!matchingEntry) return;
+	return resolveTailwindV4Source({
+		...sourceOptions,
+		css: void 0,
+		cssEntries: [matchingEntry]
+	});
+}
 function tryResolveTailwindV4SourceOptions(runtimeState) {
 	try {
 		return resolveTailwindV4SourceOptionsFromPatcher(runtimeState.twPatcher);
@@ -773,16 +830,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 = 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 resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
-		const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, sourceOptions);
+		if (!resolvedEntrySource) return generatorOptions?.config ? resolveTailwindV3Source(mergedSourceOptions) : resolveTailwindV3SourceFromPatcher(runtimeState.twPatcher);
+		const config = resolveExistingConfigPath(resolvedEntrySource.config, resolvedEntrySource.configRequest, file, mergedSourceOptions);
 		return resolveTailwindV3Source({
-			...sourceOptions,
+			...mergedSourceOptions,
 			base: resolvedEntrySource.base,
 			css: resolvedEntrySource.css,
 			...config ? { config } : {}
@@ -790,29 +851,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 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 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 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 = 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) => 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);
@@ -833,8 +911,62 @@ function isPureLocalCssImportWrapper(css) {
 	}
 	return hasImport;
 }
+function cleanLocalCssImportWrapperTailwindDirectives(css) {
+	let hasLocalImport = false;
+	let hasTailwindDirective = false;
+	try {
+		const root = 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 = 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 resolveLegacyCompatCssSource(rawSource) {
-	return removeUnsupportedMiniProgramAtRules(removeTailwindSourceDirectives(stripTailwindBanners(rawSource)));
+	return removeUnsupportedMiniProgramAtRules(removeTailwindApplyRules(removeTailwindSourceDirectives(stripTailwindBanners(rawSource))));
+}
+function removeTailwindApplyRules(rawSource) {
+	try {
+		const root = postcss.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);
@@ -941,7 +1073,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 {
@@ -1014,21 +1146,28 @@ async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, styleHandler, debug } = options;
 	const generatorOptions = 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;
-	if (generatorOptions.mode === "off" || !SUPPORTED_GENERATOR_MAJOR_VERSIONS.has(majorVersion ?? 0) || generatorOptions.mode === "force" && (!shouldForceGenerateCurrentCss || majorVersion === 3 && !hasSourceDirectives && !hasGeneratedCss && !hasGeneratedMarkers) || generatorOptions.mode !== "force" && majorVersion !== 3 && !hasGeneratedCss || !cssHandlerOptions.isMainChunk && majorVersion !== 3 && generatorOptions.mode !== "force" && !hasGeneratedCss) 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 createWeappTailwindcssGenerator(source).generate({
 				candidates: runtime,
-				scanSources: false,
+				scanSources: majorVersion === 4,
 				styleOptions: generatorStyleOptions,
 				tailwindcssV3Compatibility: generatorOptions.tailwindcssV3Compatibility,
 				target: generatorOptions.target
@@ -1056,7 +1195,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, {
@@ -1067,31 +1207,31 @@ 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"
-			};
-		}
-		if (generatorOptions.mode === "force") {
-			debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
-			let css = stripTailwindBanner(generated.css);
-			if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, rawSource);
-			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-forced"
+				source: "generator",
+				dependencies: generated.dependencies
 			};
 		}
+		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
+		let css = stripTailwindBanner(generated.css);
+		if (generated.target === "weapp") css = inheritLegacyUnitConvertedDeclarations(css, rawSource);
+		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",
+			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

package/dist/generator.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-8l464Juk.js");
-const require_generator = require("./generator-mmhXzZnv.js");
+const require_generator = require("./generator-9UEp8OoQ.js");
 let tailwindcss_patch = require("tailwindcss-patch");
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
 exports.createWeappTailwindcssGeneratorFromPatcher = require_generator.createWeappTailwindcssGeneratorFromPatcher;

package/dist/generator.mjs

@@ -1,2 +1,2 @@
-import { _ as transformTailwindV3CssToWeapp, a as resolveTailwindV4Source, c as resolveTailwindV4SourceOptionsFromPatcher, g as transformTailwindV3CssByTarget, h as resolveTailwindV3SourceOptionsFromPatcher, i as normalizeWeappTailwindcssGeneratorOptions, l as transformTailwindV4CssByTarget, m as resolveTailwindV3SourceFromPatcher, n as createWeappTailwindcssGeneratorFromPatcher, o as resolveTailwindV4SourceFromPatchOptions, p as resolveTailwindV3Source, r as resolveTailwindSourceFromPatcher, s as resolveTailwindV4SourceFromPatcher, t as createWeappTailwindcssGenerator, u as transformTailwindV4CssToWeapp } from "./generator-Y-Ikv4Fu.mjs";
+import { _ as transformTailwindV3CssToWeapp, a as resolveTailwindV4Source, c as resolveTailwindV4SourceOptionsFromPatcher, g as transformTailwindV3CssByTarget, h as resolveTailwindV3SourceOptionsFromPatcher, i as normalizeWeappTailwindcssGeneratorOptions, l as transformTailwindV4CssByTarget, m as resolveTailwindV3SourceFromPatcher, n as createWeappTailwindcssGeneratorFromPatcher, o as resolveTailwindV4SourceFromPatchOptions, p as resolveTailwindV3Source, r as resolveTailwindSourceFromPatcher, s as resolveTailwindV4SourceFromPatcher, t as createWeappTailwindcssGenerator, u as transformTailwindV4CssToWeapp } from "./generator-Dpp-5s8z.mjs";
 export { createWeappTailwindcssGenerator, createWeappTailwindcssGeneratorFromPatcher, normalizeWeappTailwindcssGeneratorOptions, resolveTailwindSourceFromPatcher, resolveTailwindV3Source, resolveTailwindV3SourceFromPatcher, resolveTailwindV3SourceOptionsFromPatcher, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveTailwindV4SourceFromPatcher, resolveTailwindV4SourceOptionsFromPatcher, transformTailwindV3CssByTarget, transformTailwindV3CssToWeapp, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp };

package/dist/gulp.js

@@ -1,7 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_recorder = require("./recorder-gYSNLfOP.js");
-const require_generator_css = require("./generator-css-D3OdPRiS.js");
+const require_recorder = require("./recorder-D4BKt75Q.js");
+const require_logger = require("./logger-D9clu_3f.js");
+const require_generator_css = require("./generator-css-CGueCYbX.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
@@ -21,7 +22,6 @@ const Transform = node_stream.default.Transform;
 */
 function createPlugins(options = {}) {
 	const opts = require_recorder.getCompilerContext(options);
-	const hasExplicitGeneratorOptions = options.generator !== void 0;
 	const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
 	const patchRecorderState = require_recorder.setupPatchRecorder(initialTwPatcher, opts.tailwindcssBasedir, {
 		source: "runtime",
@@ -47,9 +47,6 @@ function createPlugins(options = {}) {
 		".jsx"
 	];
 	let runtimeSetInitialized = false;
-	async function refreshRuntimeState(force) {
-		await require_recorder.refreshTailwindRuntimeState(runtimeState, force);
-	}
 	async function refreshRuntimeSet(force = false) {
 		if (!force && runtimeSetInitialized) return runtimeSet;
 		runtimeSet = await require_recorder.ensureRuntimeClassSet(runtimeState, {
@@ -61,6 +58,13 @@ function createPlugins(options = {}) {
 		runtimeSetInitialized = true;
 		return runtimeSet;
 	}
+	function createRuntimeSetHash(rawSource, nextRuntimeSet) {
+		return cache.computeHash([
+			rawSource,
+			require_logger.getRuntimeClassSetSignature(runtimeState.twPatcher),
+			[...nextRuntimeSet].sort().join("\n")
+		].join("\n\n"));
+	}
 	function resolveWithExtensions(base) {
 		for (const ext of MODULE_EXTENSIONS) {
 			const candidate = `${base}${ext}`;
@@ -167,13 +171,12 @@ function createPlugins(options = {}) {
 	}
 	const transformWxss = (options = {}) => createVinylTransform(async (file) => {
 		if (!file.contents) return;
-		await refreshRuntimeState(true);
-		await runtimeState.patchPromise;
 		const rawSource = file.contents.toString();
+		const nextRuntimeSet = await refreshRuntimeSet(true);
 		await require_generator_css.processCachedTask({
 			cache,
 			cacheKey: file.path,
-			rawSource,
+			hash: createRuntimeSetHash(rawSource, nextRuntimeSet),
 			applyResult(source) {
 				file.contents = node_buffer.Buffer.from(source);
 			},
@@ -183,17 +186,17 @@ function createPlugins(options = {}) {
 			async transform() {
 				await runtimeState.patchPromise;
 				const cssHandlerOptions = resolveWxssFileHandlerOptions(file, options);
-				const css = (hasExplicitGeneratorOptions ? await require_generator_css.generateCssByGenerator({
+				const css = (await require_generator_css.generateCssByGenerator({
 					opts,
 					runtimeState,
-					runtime: await refreshRuntimeSet(false),
+					runtime: nextRuntimeSet,
 					rawSource,
 					file: file.path,
 					cssHandlerOptions,
 					cssUserHandlerOptions: resolveWxssUserHandlerOptions(options),
 					styleHandler,
 					debug
-				}) : void 0)?.css ?? (await styleHandler(rawSource, cssHandlerOptions)).css;
+				}))?.css ?? (await styleHandler(rawSource, cssHandlerOptions)).css;
 				debug("css handle: %s", file.path);
 				return { result: css };
 			}
@@ -201,7 +204,7 @@ function createPlugins(options = {}) {
 	});
 	const transformJs = (options = {}) => createVinylTransform(async (file) => {
 		if (!file.contents) return;
-		await refreshRuntimeSet(false);
+		await refreshRuntimeSet(true);
 		await runtimeState.patchPromise;
 		const filename = node_path.default.resolve(file.path);
 		const moduleGraph = resolveModuleGraphOptions(options.moduleGraph);
@@ -238,7 +241,7 @@ function createPlugins(options = {}) {
 	});
 	const transformWxml = (options = {}) => createVinylTransform(async (file) => {
 		if (!file.contents) return;
-		await refreshRuntimeSet(false);
+		await refreshRuntimeSet(true);
 		await runtimeState.patchPromise;
 		const rawSource = file.contents.toString();
 		await require_generator_css.processCachedTask({

package/dist/gulp.mjs

@@ -1,5 +1,6 @@
-import { _ as refreshTailwindRuntimeState, g as ensureRuntimeClassSet, n as shouldSkipJsTransform, r as getCompilerContext, t as setupPatchRecorder, v as createDebug } from "./recorder-zsgatmkB.mjs";
-import { i as processCachedTask, t as generateCssByGenerator } from "./generator-css-B5ejWUMv.mjs";
+import { g as ensureRuntimeClassSet, n as shouldSkipJsTransform, r as getCompilerContext, t as setupPatchRecorder, v as createDebug } from "./recorder-BIW3Kuke.mjs";
+import { d as getRuntimeClassSetSignature } from "./logger-1gx9UllH.mjs";
+import { i as processCachedTask, t as generateCssByGenerator } from "./generator-css-MyjZhF0z.mjs";
 import path from "node:path";
 import process from "node:process";
 import { Buffer } from "node:buffer";
@@ -15,7 +16,6 @@ const Transform = stream.Transform;
 */
 function createPlugins(options = {}) {
 	const opts = getCompilerContext(options);
-	const hasExplicitGeneratorOptions = options.generator !== void 0;
 	const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
 	const patchRecorderState = setupPatchRecorder(initialTwPatcher, opts.tailwindcssBasedir, {
 		source: "runtime",
@@ -41,9 +41,6 @@ function createPlugins(options = {}) {
 		".jsx"
 	];
 	let runtimeSetInitialized = false;
-	async function refreshRuntimeState(force) {
-		await refreshTailwindRuntimeState(runtimeState, force);
-	}
 	async function refreshRuntimeSet(force = false) {
 		if (!force && runtimeSetInitialized) return runtimeSet;
 		runtimeSet = await ensureRuntimeClassSet(runtimeState, {
@@ -55,6 +52,13 @@ function createPlugins(options = {}) {
 		runtimeSetInitialized = true;
 		return runtimeSet;
 	}
+	function createRuntimeSetHash(rawSource, nextRuntimeSet) {
+		return cache.computeHash([
+			rawSource,
+			getRuntimeClassSetSignature(runtimeState.twPatcher),
+			[...nextRuntimeSet].sort().join("\n")
+		].join("\n\n"));
+	}
 	function resolveWithExtensions(base) {
 		for (const ext of MODULE_EXTENSIONS) {
 			const candidate = `${base}${ext}`;
@@ -161,13 +165,12 @@ function createPlugins(options = {}) {
 	}
 	const transformWxss = (options = {}) => createVinylTransform(async (file) => {
 		if (!file.contents) return;
-		await refreshRuntimeState(true);
-		await runtimeState.patchPromise;
 		const rawSource = file.contents.toString();
+		const nextRuntimeSet = await refreshRuntimeSet(true);
 		await processCachedTask({
 			cache,
 			cacheKey: file.path,
-			rawSource,
+			hash: createRuntimeSetHash(rawSource, nextRuntimeSet),
 			applyResult(source) {
 				file.contents = Buffer.from(source);
 			},
@@ -177,17 +180,17 @@ function createPlugins(options = {}) {
 			async transform() {
 				await runtimeState.patchPromise;
 				const cssHandlerOptions = resolveWxssFileHandlerOptions(file, options);
-				const css = (hasExplicitGeneratorOptions ? await generateCssByGenerator({
+				const css = (await generateCssByGenerator({
 					opts,
 					runtimeState,
-					runtime: await refreshRuntimeSet(false),
+					runtime: nextRuntimeSet,
 					rawSource,
 					file: file.path,
 					cssHandlerOptions,
 					cssUserHandlerOptions: resolveWxssUserHandlerOptions(options),
 					styleHandler,
 					debug
-				}) : void 0)?.css ?? (await styleHandler(rawSource, cssHandlerOptions)).css;
+				}))?.css ?? (await styleHandler(rawSource, cssHandlerOptions)).css;
 				debug("css handle: %s", file.path);
 				return { result: css };
 			}
@@ -195,7 +198,7 @@ function createPlugins(options = {}) {
 	});
 	const transformJs = (options = {}) => createVinylTransform(async (file) => {
 		if (!file.contents) return;
-		await refreshRuntimeSet(false);
+		await refreshRuntimeSet(true);
 		await runtimeState.patchPromise;
 		const filename = path.resolve(file.path);
 		const moduleGraph = resolveModuleGraphOptions(options.moduleGraph);
@@ -232,7 +235,7 @@ function createPlugins(options = {}) {
 	});
 	const transformWxml = (options = {}) => createVinylTransform(async (file) => {
 		if (!file.contents) return;
-		await refreshRuntimeSet(false);
+		await refreshRuntimeSet(true);
 		await runtimeState.patchPromise;
 		const rawSource = file.contents.toString();
 		await processCachedTask({

package/dist/index.d.ts

@@ -4,5 +4,5 @@ export { createPlugins } from './gulp';
 export { weappTailwindcssPostcssPlugin } from './postcss';
 export type { WeappTailwindcssPostcssPluginOptions } from './postcss';
 export type * from './types';
-export { UnifiedViteWeappTailwindcssPlugin } from './vite';
+export { WeappTailwindcss } from './vite';
 export { UnifiedWebpackPluginV5, weappTailwindcssPackageDir } from './webpack';

package/dist/index.js

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-mmhXzZnv.js");
+const require_generator = require("./generator-9UEp8OoQ.js");
 const require_gulp = require("./gulp.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-BC9U7ahn.js");
-const require_webpack = require("./webpack-DD7A6V0u.js");
-exports.UnifiedViteWeappTailwindcssPlugin = require_vite.UnifiedViteWeappTailwindcssPlugin;
+const require_vite = require("./vite-BkMGwDeH.js");
+const require_webpack = require("./webpack-CICGEKT9.js");
 exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
+exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
 exports.weappTailwindcssPackageDir = require_webpack.weappTailwindcssPackageDir;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-Y-Ikv4Fu.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-Dpp-5s8z.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as UnifiedViteWeappTailwindcssPlugin } from "./vite-CrlzCNqz.mjs";
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-Bu6M-Hbw.mjs";
-export { UnifiedViteWeappTailwindcssPlugin, UnifiedWebpackPluginV5, createPlugins, createWeappTailwindcssGenerator, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };
+import { t as WeappTailwindcss } from "./vite-fDM-UQpR.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-D2Wdk28V.mjs";
+export { UnifiedWebpackPluginV5, WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/js/index.d.ts

@@ -1,4 +1,5 @@
 import type { CreateJsHandlerOptions, JsHandler } from '../types';
 import { jsHandler } from './babel';
 export { jsHandler, };
+export { transformLiteralText } from './literal-transform';
 export declare function createJsHandler(options: CreateJsHandlerOptions): JsHandler;

package/dist/js/literal-transform.d.ts

@@ -0,0 +1,2 @@
+import type { IJsHandlerOptions } from '../types';
+export declare function transformLiteralText(literal: string, options: IJsHandlerOptions): string | undefined;