weapp-tailwindcss 5.0.0-next.22 → 5.0.0-next.24

package/dist/{vite-BcXuBYy3.mjs → vite-BthAm8kt.mjs}

@@ -1,11 +1,11 @@
-import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, G as omitUndefined, K as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-DyIcbpZm.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DPX8vA2P.mjs";
-import { a as validateCandidatesByGenerator, c as hasTailwindSourceDirectives, i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, n as createHmrTimingRecorder, o as processCachedTask, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager, u as hasTailwindGeneratedCssMarkers } from "./incremental-runtime-class-set-Cwpw6aZK.mjs";
-import { a as analyzeSource, c as isClassContextLiteralPath, g as createTailwindRuntimeReadyPromise, h as collectRuntimeClassSet, i as createAttributeMatcher, l as replaceWxml, m as toCustomAttributesEntities, n as getCompilerContext, o as JsTokenUpdater, p as vitePluginName, r as generateCode, s as _defineProperty, t as shouldSkipJsTransform, u as babelParse, v as refreshTailwindRuntimeState } from "./precheck-D1O5AWzy.mjs";
+import { B as createDebug, E as filterUnsupportedMiniProgramTailwindV4Candidates, G as omitUndefined, K as findNearestPackageRoot, U as findTailwindConfig, W as resolveTailwindcssOptions, _ as resolveViteSourceScanEntries, g as resolveTailwindV4EntriesFromCssCached, l as getRuntimeClassSetSignature, m as discoverTailwindV4CssEntries, p as createViteSourceScanMatcher, v as resolveViteTailwindV4CssDependencies } from "./v3-engine-CXqgQZUc.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions } from "./generator-DdEgn8nG.mjs";
+import { a as validateCandidatesByGenerator, c as hasTailwindSourceDirectives, i as generateCssByGenerator, l as normalizeTailwindSourceForGenerator, n as createHmrTimingRecorder, o as processCachedTask, s as hasTailwindRootDirectives, t as createBundleRuntimeClassSetManager, u as hasTailwindGeneratedCssMarkers } from "./incremental-runtime-class-set-Bux7viee.mjs";
+import { a as analyzeSource, c as isClassContextLiteralPath, g as createTailwindRuntimeReadyPromise, h as collectRuntimeClassSet, i as createAttributeMatcher, l as replaceWxml, m as toCustomAttributesEntities, n as getCompilerContext, o as JsTokenUpdater, p as vitePluginName, r as generateCode, s as _defineProperty, t as shouldSkipJsTransform, u as babelParse, v as refreshTailwindRuntimeState } from "./precheck-DreRGvYH.mjs";
 import { o as resolveUniUtsPlatform } from "./utils-CGBVVNm6.mjs";
-import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-B_JAdOQf.mjs";
-import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-CnD4vyic.mjs";
-import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-CLnuf2CW.mjs";
+import { c as upsertTailwindV4CssSource, i as resolveUniAppXOptions, r as isUniAppXEnabled, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-DO-VVR5k.mjs";
+import { n as isSourceCandidateRequest, t as createSourceCandidateCollector } from "./source-candidates-B7wmEa-G.mjs";
+import { a as createBundleModuleGraphOptions, b as toAbsoluteOutputPath, c as hasBundlerGeneratedCssMarker, d as resolvePluginDisabledState, f as cleanUrl, g as isSourceStyleRequest, h as slash, i as applyLinkedResults, l as stripBundlerGeneratedCssMarkers, m as isCSSRequest, n as createBundleBuildState, o as pushConcurrentTaskFactories, p as formatPostcssSourceMap, r as updateBundleBuildState, s as createBundlerGeneratedCssMarker, t as buildBundleSnapshot, u as resolvePackageDir, v as normalizeOutputPathKey } from "./bundle-state-CP_BWXfx.mjs";
 import { t as logger$1 } from "./logger-CZUxvJJD.mjs";
 import fs, { existsSync, readFileSync } from "node:fs";
 import postcss from "postcss";
@@ -559,7 +559,7 @@ function createCssHandlerOptions(opts, majorVersion, file) {
 }
 function shouldGenerateCssByGenerator(opts, file, rawSource, processed) {
 	const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(opts.generator);
-	if (generatorOptions.target === "web") return false;
+	if (generatorOptions.target === "web" && opts.twPatcher.majorVersion !== 3) return false;
 	if (hasTailwindGeneratedCssMarkers(rawSource) || hasTailwindSourceDirectives(rawSource, { importFallback: generatorOptions.importFallback })) return true;
 	if (opts.twPatcher.majorVersion === 3) return false;
 	return processed && shouldFinalizeProcessedCssAsset(opts, file);
@@ -635,7 +635,7 @@ function createViteCssFinalizerOutputPlugin(context) {
 						styleHandler: opts.styleHandler,
 						debug
 					}) : void 0;
-					const nextCss = generated?.css ?? (await opts.styleHandler(rawSource, cssHandlerOptions)).css;
+					const nextCss = generated?.css ?? (generatorOptions.target === "web" ? rawSource : (await opts.styleHandler(rawSource, cssHandlerOptions)).css);
 					if (generated) {
 						registerGeneratorDependencies$1(this, generated.dependencies);
 						debug("css finalizer generated result: %s bytes=%d", file, nextCss.length);
@@ -991,6 +991,7 @@ function createGenerateBundleHook(context) {
 		const { cache, onEnd, onStart, onUpdate, styleHandler, templateHandler, jsHandler, uniAppX } = opts;
 		const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(opts.generator);
 		const isWebGeneratorTarget = generatorOptions.target === "web";
+		const shouldGenerateWebCssByGenerator = isWebGeneratorTarget && runtimeState.twPatcher.majorVersion === 3;
 		const { getCssHandlerOptions, getCssUserHandlerOptions } = cssHandlerOptions;
 		await runtimeState.readyPromise;
 		debug("start");
@@ -1032,7 +1033,7 @@ function createGenerateBundleHook(context) {
 		const snapshotStart = performance.now();
 		const snapshot = buildBundleSnapshot(bundle, opts, outDir, state, disableDirtyOptimization || !useIncrementalMode);
 		recordTimingDetail("snapshot", snapshotStart);
-		const useBundleRuntimeClassSet = useIncrementalMode || runtimeState.twPatcher.majorVersion === 4;
+		const useBundleRuntimeClassSet = !isWebGeneratorTarget && (useIncrementalMode || runtimeState.twPatcher.majorVersion === 4);
 		const forceRuntimeRefreshBySource = useIncrementalMode && hasRuntimeAffectingSourceChanges(snapshot.runtimeAffectingChangedByType);
 		const processFiles = snapshot.processFiles;
 		logBundleProcessPlan({
@@ -1052,7 +1053,7 @@ function createGenerateBundleHook(context) {
 		const hasRuntimeAffectingChanges = hasRuntimeAffectingSourceChanges(snapshot.runtimeAffectingChangedByType);
 		const useV3OxideSourceRuntime = runtimeState.twPatcher.majorVersion === 3 && sourceCandidates.size > 0 && hasCssAssetEntry && !forceRuntimeRefreshByEnv && !disableV3OxideSourceRuntime;
 		const runtimeStart = performance.now();
-		const runtime = useV3OxideSourceRuntime ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv, {
+		const runtime = isWebGeneratorTarget && !shouldGenerateWebCssByGenerator ? /* @__PURE__ */ new Set() : useV3OxideSourceRuntime ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv, {
 			allowBaselineOnlyInitialSync: true,
 			baseClassSet: sourceCandidates
 		}) : useBundleRuntimeClassSet ? await ensureBundleRuntimeClassSet(snapshot, forceRuntimeRefreshByEnv, { allowBaselineOnlyInitialSync: buildCommand }) : await context.ensureRuntimeClassSet(forceRuntimeRefreshByEnv);
@@ -1113,6 +1114,10 @@ function createGenerateBundleHook(context) {
 			const { file, output: originalSource, source: originalEntrySource, type } = entry;
 			if (type === "html" && originalSource.type === "asset") {
 				metrics.html.total++;
+				if (isWebGeneratorTarget) {
+					debug("html skip web target: %s", file);
+					continue;
+				}
 				if (!processFiles.html.has(file)) continue;
 				const rawSource = originalEntrySource;
 				tasks.push(timeTask("html", () => processCachedTask({
@@ -1177,7 +1182,7 @@ function createGenerateBundleHook(context) {
 					debug("css skip vite-processed asset: %s", outputFile);
 					continue;
 				}
-				if (isWebGeneratorTarget) {
+				if (isWebGeneratorTarget && !shouldGenerateWebCssByGenerator) {
 					applyCssResult(rawSource);
 					markCssAssetProcessed?.(originalSource, outputFile);
 					onUpdate(outputFile, rawSource, rawSource);
@@ -1254,6 +1259,12 @@ function createGenerateBundleHook(context) {
 								debug("css handle via tailwind v%s engine(%s): %s", runtimeState.twPatcher.majorVersion, generated.target, outputFile);
 								return generated.css;
 							}
+							if (isWebGeneratorTarget) {
+								metrics.css.elapsed += measureElapsed(start);
+								metrics.css.transformed++;
+								debug("css preserve web target: %s", outputFile);
+								return rawSource;
+							}
 							const { css } = await styleHandler(rawSource, getCssHandlerOptions(file));
 							if (debugCssDiff) debug("css diff %s: %s", file, summarizeStringDiff(rawSource, css));
 							metrics.css.elapsed += measureElapsed(start);
@@ -1272,6 +1283,10 @@ function createGenerateBundleHook(context) {
 			}
 			if (type !== "js") continue;
 			metrics.js.total++;
+			if (isWebGeneratorTarget) {
+				debug("js skip web target: %s", file);
+				continue;
+			}
 			const shouldTransformJs = !useIncrementalMode || processFiles.js.has(file);
 			if (!shouldTransformJs) debug("js skip transform (clean), replay cache: %s", file);
 			if (originalSource.type === "chunk") {
@@ -1621,13 +1636,14 @@ function stripTailwindConfigDirectives(code) {
 	return code.replace(/^\s*@config\s+(?:"[^"]+"|'[^']+')[^;\n]*;\s*$/gm, "");
 }
 function createRewriteCssImportsPlugins(options) {
-	if (!options.shouldRewrite) return [];
+	if (!options.shouldRewrite && !options.shouldOwnTailwindGeneration) return [];
 	const { appType, getAppType, rootImport, shouldOwnTailwindGeneration, weappTailwindcssDirPosix } = options;
 	const resolveAppType = () => getAppType?.() ?? appType;
 	return [{
 		name: `${vitePluginName}:rewrite-css-imports`,
 		enforce: "pre",
 		resolveId(id, importer) {
+			if (!options.shouldRewrite) return null;
 			const replacement = resolveTailwindcssImport(id, weappTailwindcssDirPosix, {
 				join: joinPosixPath,
 				appType: resolveAppType(),
@@ -1649,6 +1665,7 @@ function createRewriteCssImportsPlugins(options) {
 					};
 				}
 			}
+			if (!options.shouldRewrite) return null;
 			const rewritten = rewriteTailwindcssImportsInCode(code, weappTailwindcssDirPosix, {
 				join: joinPosixPath,
 				appType: resolveAppType(),
@@ -1858,7 +1875,9 @@ function WeappTailwindcss(options = {}) {
 	const tailwindcssMajorVersion = initialTwPatcher.majorVersion ?? 0;
 	const shouldOwnTailwindGeneration = !disabledOptions.plugin;
 	const shouldRewriteCssImports = tailwindcssMajorVersion >= 4;
-	const shouldInferAppType = !hasExplicitAppType && opts.generator?.target !== "web";
+	const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(opts.generator);
+	const isWebGeneratorTarget = generatorOptions.target === "web";
+	const shouldInferAppType = !hasExplicitAppType && generatorOptions.target !== "web";
 	const hasInitialTailwindCssRoots = hasConfiguredTailwindV4CssRoots({
 		...options,
 		cssEntries: opts.cssEntries ?? options.cssEntries
@@ -1933,6 +1952,7 @@ function WeappTailwindcss(options = {}) {
 	const viteProcessedCssAssetResults = /* @__PURE__ */ new Map();
 	const rememberedMainCssSources = /* @__PURE__ */ new Map();
 	const rememberedMainCssSignatureByFile = /* @__PURE__ */ new Map();
+	const tailwindRootCssModuleIds = /* @__PURE__ */ new Set();
 	const { runtimeState, refreshRuntimeState, ensureRuntimeClassSet, ensureBundleRuntimeClassSet } = createViteRuntimeClassSet({
 		opts,
 		initialTwPatcher,
@@ -1957,6 +1977,9 @@ function WeappTailwindcss(options = {}) {
 		recordedGeneratorCandidates = new Set(candidates);
 	};
 	const getRecordedGeneratorCandidates = () => recordedGeneratorCandidates;
+	const invalidateRecordedGeneratorCandidates = () => {
+		recordedGeneratorCandidates = void 0;
+	};
 	const getSourceCandidates = () => sourceCandidateCollector.values();
 	const getSourceCandidatesForEntries = (entries) => sourceCandidateCollector.valuesForEntries(entries);
 	const isWatchBuild = () => resolvedConfig?.command === "build" && resolvedConfig.build.watch != null;
@@ -2114,6 +2137,28 @@ function WeappTailwindcss(options = {}) {
 	const markViteProcessedCssSource = (file) => {
 		viteProcessedCssSourceFiles.add(normalizeViteProcessedCssFile(file));
 	};
+	const rememberTailwindRootCssModule = (id) => {
+		if (!shouldOwnTailwindGeneration) return;
+		tailwindRootCssModuleIds.add(id);
+		tailwindRootCssModuleIds.add(cleanUrl(id));
+	};
+	const resolveHotTailwindCssModules = (ctx) => {
+		const modules = [];
+		const seenModules = /* @__PURE__ */ new Set();
+		for (const id of tailwindRootCssModuleIds) {
+			const candidates = [ctx.server.moduleGraph.getModuleById(id), ...ctx.server.moduleGraph.getModulesByFile(id) ?? []].filter((mod) => {
+				if (mod == null) return false;
+				return isSourceStyleRequest(mod.id ?? mod.url);
+			});
+			for (const mod of candidates) {
+				if (seenModules.has(mod)) continue;
+				seenModules.add(mod);
+				ctx.server.moduleGraph.invalidateModule(mod);
+				modules.push(mod);
+			}
+		}
+		return modules;
+	};
 	const matchesViteProcessedCssSource = (candidate) => {
 		const normalized = normalizeViteProcessedCssFile(candidate);
 		return viteProcessedCssSourceFiles.has(normalized);
@@ -2155,6 +2200,7 @@ function WeappTailwindcss(options = {}) {
 		for (const dependency of generated.dependencies) hookContext?.addWatchFile?.(dependency);
 		viteGeneratedCssByFile.set(file, generated.css);
 		markViteProcessedCssSource(file);
+		rememberTailwindRootCssModule(id);
 		recordGeneratorCandidates(runtime);
 		rememberMainCssSource(file, code);
 		debug("css generated for vite postcss pipeline: %s bytes=%d", file, generated.css.length);
@@ -2213,6 +2259,7 @@ function WeappTailwindcss(options = {}) {
 	});
 	const isIosPlatform = resolveUniUtsPlatform().isAppIos;
 	const prepareTailwindGeneration = async () => {
+		if (isWebGeneratorTarget && runtimeState.twPatcher.majorVersion !== 3) return;
 		if (shouldDiscoverAutoCssSources()) await discoverAndRegisterAutoCssSources();
 		await syncSourceCandidateScan();
 	};
@@ -2263,8 +2310,11 @@ function WeappTailwindcss(options = {}) {
 				}, { emit: false });
 			},
 			async handleHotUpdate(ctx) {
-				await hmrTimingRecorder.measure("sourceCandidates.handleHotUpdate", async () => {
+				return hmrTimingRecorder.measure("sourceCandidates.handleHotUpdate", async () => {
 					await syncChangedSourceCandidateFile(ctx.file);
+					invalidateRecordedGeneratorCandidates();
+					const cssModules = resolveHotTailwindCssModules(ctx);
+					return cssModules.length > 0 ? [...ctx.modules, ...cssModules] : void 0;
 				}, { emit: false });
 			},
 			async buildStart() {

package/dist/vite.js

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

package/dist/vite.mjs

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

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

@@ -1378,6 +1378,37 @@ function createTailwindV4DefaultColorThemeCss() {
 //#region src/tailwindcss/v4-engine/generator.ts
 const incrementalGenerateCache$1 = /* @__PURE__ */ new Map();
 const incrementalGenerateTaskCache = /* @__PURE__ */ new Map();
+const BARE_RPX_TEXT_CANDIDATE_RE = /(^|:)text-\[([-+]?(?:\d+|\d*\.\d+)rpx)\](.*)$/u;
+const RPX_TEXT_LENGTH_SELECTOR_RE = /text-\\\[length\\:((?:\\[.+-]|[+\-.\d])+rpx)\\\]/g;
+const TAILWIND_V4_DEFAULT_IGNORED_SOURCE_PATTERNS = [
+	"**/.git/**",
+	"**/.hg/**",
+	"**/.jj/**",
+	"**/.next/**",
+	"**/.parcel-cache/**",
+	"**/.pnpm-store/**",
+	"**/.svelte-kit/**",
+	"**/.svn/**",
+	"**/.turbo/**",
+	"**/.venv/**",
+	"**/.vercel/**",
+	"**/.yarn/**",
+	"**/__pycache__/**",
+	"**/node_modules/**",
+	"**/venv/**",
+	"**/*.less",
+	"**/*.lock",
+	"**/*.sass",
+	"**/*.scss",
+	"**/*.styl",
+	"**/*.log",
+	"**/package-lock.json",
+	"**/pnpm-lock.yaml",
+	"**/bun.lockb",
+	"**/.gitignore",
+	"**/.env",
+	"**/.env.*"
+];
 function findLeadingImportInsertionIndex(css) {
 	const importPattern = /(?:^|\n)\s*@import\b[^;]*;/g;
 	let insertionIndex = 0;
@@ -1397,6 +1428,38 @@ function applyMiniProgramTailwindV4DefaultColorCss(css) {
 function collectCandidates$1(candidates) {
 	return new Set(candidates ?? []);
 }
+function normalizeRpxTextCandidate(candidate) {
+	return candidate.replace(BARE_RPX_TEXT_CANDIDATE_RE, "$1text-[length:$2]$3");
+}
+function normalizeRpxTextCandidates(candidates) {
+	const normalized = /* @__PURE__ */ new Set();
+	const restoreCandidates = /* @__PURE__ */ new Map();
+	for (const candidate of candidates) {
+		const normalizedCandidate = normalizeRpxTextCandidate(candidate);
+		normalized.add(normalizedCandidate);
+		if (normalizedCandidate !== candidate) restoreCandidates.set(normalizedCandidate, candidate);
+	}
+	return {
+		candidates: normalized,
+		restoreCandidates
+	};
+}
+function restoreRpxTextCandidates(candidates, restoreCandidates) {
+	if (restoreCandidates.size === 0) return new Set(candidates);
+	return new Set([...candidates].map((candidate) => restoreCandidates.get(candidate) ?? candidate));
+}
+function normalizeCssEscapedRpxSelectorValue(value) {
+	return value.replace(/\\([.+-])/g, "$1");
+}
+function restoreRpxTextCssSelectors(css, restoreCandidates) {
+	if (restoreCandidates.size === 0 || !css.includes("text-\\[length\\:")) return css;
+	const restoredValues = new Set([...restoreCandidates.keys()].map((candidate) => {
+		return BARE_RPX_TEXT_CANDIDATE_RE.exec(candidate.replace("[length:", "["))?.[2];
+	}).filter((value) => Boolean(value)));
+	return css.replace(RPX_TEXT_LENGTH_SELECTOR_RE, (match, value) => {
+		return restoredValues.has(normalizeCssEscapedRpxSelectorValue(value)) ? `text-\\[${value}\\]` : match;
+	});
+}
 function createStableJson$2(value) {
 	if (value === void 0) return "undefined";
 	if (value === null || typeof value !== "object") return JSON.stringify(value);
@@ -1553,6 +1616,20 @@ function removeUnlayeredTailwindV4PreflightImports(css) {
 function resolveSourceBase$1(base, sourcePath) {
 	return node_path.default.isAbsolute(sourcePath) ? sourcePath : node_path.default.resolve(base, sourcePath);
 }
+function createDefaultIgnoredScanSources(base) {
+	return TAILWIND_V4_DEFAULT_IGNORED_SOURCE_PATTERNS.map((pattern) => ({
+		base,
+		pattern,
+		negated: true
+	}));
+}
+function normalizeCssDefinedScanSources(base, entries) {
+	return entries.length > 0 && entries.every((entry) => entry.negated) ? [{
+		base,
+		pattern: "**/*",
+		negated: false
+	}, ...entries] : entries;
+}
 async function resolveCssDefinedScanSources(source) {
 	let importSourceBase;
 	let hasSourceNone = false;
@@ -1573,11 +1650,15 @@ async function resolveCssDefinedScanSources(source) {
 	});
 	const sourcePatterns = await resolveCssSourceEntries(root, source.base, "**/*");
 	if (!importSourceBase) {
-		if (sourcePatterns.length > 0) return sourcePatterns;
+		if (sourcePatterns.length > 0) return [...normalizeCssDefinedScanSources(source.base, sourcePatterns), ...createDefaultIgnoredScanSources(source.base)];
 		if (hasSourceNone) return false;
 		return;
 	}
-	return [await resolveTailwindSourceEntry(".", importSourceBase, false, "**/*"), ...sourcePatterns];
+	return [
+		await resolveTailwindSourceEntry(".", importSourceBase, false, "**/*"),
+		...sourcePatterns,
+		...createDefaultIgnoredScanSources(importSourceBase)
+	];
 }
 async function resolveScanSources(source, scanSources) {
 	if (scanSources !== true) return scanSources;
@@ -1617,16 +1698,18 @@ function createTailwindV4Engine(source) {
 		const engine = (0, tailwindcss_patch.createTailwindV4Engine)(createCompatibleSource(generateSource, target, tailwindcssV3Compatibility));
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
 		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, tailwindcss_patch.extractRawCandidates)(resolvedScanSources)) : void 0;
-		const resolvedCandidates = resolveTargetCandidates(new Set([...collectCandidates$1(patchOptions.candidates), ...filesystemCandidates ?? []]), target);
+		const normalizedCandidates = normalizeRpxTextCandidates(resolveTargetCandidates(new Set([...collectCandidates$1(patchOptions.candidates), ...filesystemCandidates ?? []]), target));
 		const result = await engine.generate(omitUndefined({
 			scanSources: false,
 			...patchOptions,
-			candidates: resolvedCandidates
+			candidates: normalizedCandidates.candidates
 		}));
-		const rawCss = result.css;
+		const rawCss = restoreRpxTextCssSelectors(result.css, normalizedCandidates.restoreCandidates);
 		const css = await transformTailwindV4CssByTarget(rawCss, target, styleOptions);
 		return {
 			...result,
+			classSet: restoreRpxTextCandidates(result.classSet, normalizedCandidates.restoreCandidates),
+			rawCandidates: restoreRpxTextCandidates(result.rawCandidates, normalizedCandidates.restoreCandidates),
 			css,
 			rawCss,
 			target
@@ -1666,15 +1749,18 @@ function createTailwindV4Engine(source) {
 				target: cached.target
 			};
 			return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
-				const cssByCandidate = (await cached.designSystemPromise).candidatesToCss(missingCandidates);
+				const designSystem = await cached.designSystemPromise;
+				const normalizedMissing = normalizeRpxTextCandidates(missingCandidates);
+				const normalizedMissingCandidates = [...normalizedMissing.candidates];
+				const cssByCandidate = designSystem.candidatesToCss(normalizedMissingCandidates);
 				const rawCssParts = [];
 				const classSet = /* @__PURE__ */ new Set();
-				for (let index = 0; index < missingCandidates.length; index += 1) {
-					const candidate = missingCandidates[index];
+				for (let index = 0; index < normalizedMissingCandidates.length; index += 1) {
+					const candidate = normalizedMissingCandidates[index];
 					const css = cssByCandidate[index];
 					if (candidate && typeof css === "string" && css.trim().length > 0) {
-						rawCssParts.push(css);
-						classSet.add(candidate);
+						rawCssParts.push(restoreRpxTextCssSelectors(css, normalizedMissing.restoreCandidates));
+						classSet.add(normalizedMissing.restoreCandidates.get(candidate) ?? candidate);
 					}
 				}
 				const rawCss = rawCssParts.join("\n");
@@ -2090,6 +2176,7 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 	let hasTailwindCssImport = false;
 	const [sourceEntries, configEntries] = await Promise.all([resolveCssSourceEntries(root, base, VITE_SOURCE_CANDIDATE_PATTERN), resolveConfigContentEntries(root, base)]);
 	const entries = [...configEntries.entries, ...sourceEntries];
+	const hasPositiveEntries = entries.some((entry) => !entry.negated);
 	const inlineCandidates = collectCssInlineSourceCandidates(root);
 	root.walkAtRules("import", (rule) => {
 		if (!isTailwindCssImport(rule.params)) return;
@@ -2114,7 +2201,7 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 		inlineCandidates,
 		dependencies: configEntries.dependencies
 	};
-	if (entries.length > 0) return {
+	if (hasPositiveEntries) return {
 		entries,
 		explicit: true,
 		inlineCandidates,
@@ -2127,7 +2214,7 @@ async function resolveTailwindV4EntriesFromCss(css, base) {
 		dependencies: configEntries.dependencies
 	};
 	return hasTailwindCssImport ? {
-		entries: [],
+		entries,
 		explicit: false,
 		inlineCandidates,
 		dependencies: configEntries.dependencies
@@ -2908,8 +2995,8 @@ const TAILWIND_ROOT_DIRECTIVE_NAMES = new Set([
 	"utility",
 	"variant"
 ]);
-const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
-const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
+const TAILWIND_ROOT_DIRECTIVE_RE = /@(?:import\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|(?:use|forward)\s+(?:url\(\s*)?["']?tailwindcss4?(?:\/[^"')\s]*)?|tailwind|config|custom-variant|plugin|source|theme|utility|variant)\b/;
+const TAILWIND_EXTRACTABLE_DIRECTIVE_RE = /^\s*@(?:import|use|forward|tailwind|config|source|reference|plugin)\b[\s\S]*?(?:;|$)/;
 const TAILWIND_EXTRACTABLE_BLOCK_DIRECTIVE_RE = /^\s*@(?:theme|utility|variant|custom-variant)\b[\s\S]*$/;
 const TAILWIND_EXTRACTABLE_LAYER_STATEMENT_RE = /^\s*@layer\s[^;{]+;\s*$/;
 function parseImportRequest(params) {
@@ -2957,8 +3044,17 @@ function normalizeTailwindImportAtRules(root, options = {}) {
 	return changed;
 }
 function normalizeTailwindDirectiveLine(line, options = {}) {
-	if (!options.importFallback || !line.trimStart().startsWith("@import")) return line;
-	const request = parseImportRequest(line.trimStart().replace(/^@import\b/, ""));
+	const trimmed = line.trimStart();
+	if (/^@(?:use|forward)\b/.test(trimmed)) {
+		const request = parseImportRequest(trimmed.replace(/^@(?:use|forward)\b/, ""));
+		if (isTailwindImportRequest(request) || options.importFallback && isWeappTailwindcssImportRequest(request)) {
+			const normalizedRequest = normalizeTailwindImportRequest(request, options);
+			return replaceImportRequest(line.replace(/^(\s*)@(?:use|forward)\b/, "$1@import"), request, normalizedRequest);
+		}
+		return line;
+	}
+	if (!options.importFallback || !trimmed.startsWith("@import")) return line;
+	const request = parseImportRequest(trimmed.replace(/^@import\b/, ""));
 	if (!request || !isWeappTailwindcssImportRequest(request)) return line;
 	return replaceImportRequest(line, request, request.replace(/^weapp-tailwindcss/, "tailwindcss"));
 }
@@ -2973,9 +3069,9 @@ function extractTailwindDirectiveLines(rawSource, options = {}) {
 		const normalized = normalizeTailwindDirectiveLine(directive.trimEnd(), options);
 		const normalizedTrimmed = normalized.trim();
 		if (options.removeConfig && normalizedTrimmed.startsWith("@config")) continue;
-		const request = /^@import\b/.test(normalizedTrimmed) ? parseImportRequest(normalizedTrimmed.replace(/^@import\b/, "")) : void 0;
+		const request = /^@(?:import|use|forward)\b/.test(normalizedTrimmed) ? parseImportRequest(normalizedTrimmed.replace(/^@(?:import|use|forward)\b/, "")) : void 0;
 		if (request && !isTailwindImportRequest(request) && !isPackageJsonImportRequest$1(request)) continue;
-		if (/^@import\b/.test(normalizedTrimmed) && !request) continue;
+		if (/^@(?:import|use|forward)\b/.test(normalizedTrimmed) && !request) continue;
 		if (request && isTailwindImportRequest(request)) {
 			const key = normalizedTrimmed;
 			if (seenImports.has(key)) continue;
@@ -3016,7 +3112,7 @@ function isTailwindImportRequest(request) {
 }
 function isTailwindImportAtRule(node, options = {}) {
 	if (node.name === "tailwind") return true;
-	if (node.name !== "import") return false;
+	if (node.name !== "import" && node.name !== "use" && node.name !== "forward") return false;
 	return isTailwindImportRequest(normalizeTailwindImportRequest(parseImportRequest(node.params), options));
 }
 function isTailwindSourceDirective(node, options = {}) {

package/dist/{webpack-C4pViZ7V.mjs → webpack-hPc8wUAi.mjs}

@@ -1,9 +1,9 @@
-import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-DyIcbpZm.mjs";
-import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-Cwpw6aZK.mjs";
-import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-D1O5AWzy.mjs";
+import { B as createDebug, W as resolveTailwindcssOptions, l as getRuntimeClassSetSignature } from "./v3-engine-CXqgQZUc.mjs";
+import { i as generateCssByGenerator, o as processCachedTask, r as emitHmrTiming, t as createBundleRuntimeClassSetManager } from "./incremental-runtime-class-set-Bux7viee.mjs";
+import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-DreRGvYH.mjs";
 import { r as getGroupedEntries } from "./utils-CGBVVNm6.mjs";
-import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-B_JAdOQf.mjs";
-import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-CLnuf2CW.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-DO-VVR5k.mjs";
+import { _ as stripRequestQuery, b as toAbsoluteOutputPath, d as resolvePluginDisabledState, g as isSourceStyleRequest, l as stripBundlerGeneratedCssMarkers, n as createBundleBuildState, o as pushConcurrentTaskFactories, r as updateBundleBuildState, t as buildBundleSnapshot, u as resolvePackageDir, y as resolveOutputSpecifier } from "./bundle-state-CP_BWXfx.mjs";
 import Module, { createRequire } from "node:module";
 import fs from "node:fs";
 import path from "node:path";

package/dist/{webpack-DC7v6ylA.js → webpack-prCus5xn.js}

@@ -1,10 +1,10 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_v3_engine = require("./v3-engine-CCwvhRrQ.js");
-const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-C6akmwlk.js");
-const require_precheck = require("./precheck-8pQbjqpq.js");
+const require_v3_engine = require("./v3-engine-vHlppqaZ.js");
+const require_incremental_runtime_class_set = require("./incremental-runtime-class-set-CWdfLHON.js");
+const require_precheck = require("./precheck-DtYqujIx.js");
 const require_utils = require("./utils-4ODFyoqD.js");
-const require_tailwindcss = require("./tailwindcss-whZE3HpL.js");
-const require_bundle_state = require("./bundle-state-BnV8o2Yn.js");
+const require_tailwindcss = require("./tailwindcss-BtUBeOes.js");
+const require_bundle_state = require("./bundle-state-DXFq2nEo.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_module = require("node:module");

package/dist/webpack.js

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

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-C4pViZ7V.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-hPc8wUAi.mjs";
 export { UnifiedWebpackPluginV5, UnifiedWebpackPluginV5 as WeappTailwindcss, UnifiedWebpackPluginV5 as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.22",
+  "version": "5.0.0-next.24",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -189,11 +189,11 @@
     "semver": "~7.8.1",
     "tailwindcss-patch": "9.3.7",
     "yaml": "^2.9.0",
-    "@weapp-tailwindcss/reset": "0.1.1-next.0",
     "@weapp-tailwindcss/logger": "1.1.0",
+    "@weapp-tailwindcss/postcss": "3.0.0-next.6",
+    "@weapp-tailwindcss/reset": "0.1.1-next.0",
     "@weapp-tailwindcss/shared": "1.1.3",
-    "tailwindcss-config": "1.1.6-next.1",
-    "@weapp-tailwindcss/postcss": "3.0.0-next.6"
+    "tailwindcss-config": "1.1.6-next.1"
   },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",