weapp-tailwindcss 5.0.13 → 5.1.1

package/dist/{gulp-DfOQERcV.mjs → gulp-DNU10Vtc.mjs}

@@ -1,7 +1,7 @@
-import { D as hasTailwindRootDirectives, Y as getTailwindV4IncrementalGenerateCacheStats, a as getTailwindV3IncrementalGenerateCacheStats, h as resolveViteSourceScanEntries, j as normalizeTailwindSourceForGenerator, k as normalizeTailwindConfigDirectives, ot as createDebug, u as getRuntimeClassSetSignature } from "./v3-engine-C6eJ0YzK.mjs";
-import { n as getCompilerContext, t as shouldSkipJsTransform, v as createTailwindRuntimeReadyPromise, y as ensureRuntimeClassSet } from "./precheck-CRI90iL1.mjs";
-import { c as hasConfiguredTailwindV4CssRoots, l as upsertTailwindV4CssSource } from "./tailwindcss-DTq3uYBK.mjs";
-import { _ as createCssSourceTraceCacheSignature, a as createTailwindV3DefaultExtractor, b as processCachedTask, g as annotateCssSourceTrace, n as emitHmrTiming, o as createBundleRuntimeClassSetManager, r as createSourceCandidateCollector, s as generateCssByGenerator, v as createCssTokenSourceMap } from "./hmr-timing-DQIP_8qP.mjs";
+import { C as hasTailwindRootDirectives, D as normalizeTailwindSourceForGenerator, G as getTailwindV4IncrementalGenerateCacheStats, T as normalizeTailwindConfigDirectives, U as prependConfigDirective, o as hasConfiguredTailwindV4CssRoots, s as upsertTailwindV4CssSource } from "./v4-engine-C3qSwQ-e.mjs";
+import { S as createDebug, b as ensureRuntimeClassSet, l as shouldSkipJsTransform, n as normalizeStyleHandlerMajorVersion, t as getCompilerContext, y as createTailwindRuntimeReadyPromise } from "./context-DlpKD7aN.mjs";
+import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-B5mRo0-M.mjs";
+import { F as createCssTokenSourceMap, L as processCachedTask, N as annotateCssSourceTrace, P as createCssSourceTraceCacheSignature, n as emitHmrTiming, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, u as generateCssByGenerator, v as rewriteLocalCssImportRequestsForOutput, y as splitLocalCssImports } from "./hmr-timing-B0KuWDjV.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -182,10 +182,7 @@ function resolveGulpMemoryDebugStats(context) {
 			maxCacheKeys: GULP_PROCESS_CACHE_MAX
 		},
 		gulpOptions: { defaultStyleHandlerOptions: context.defaultStyleHandlerOptionsCache.size },
-		tailwind: {
-			v3: getTailwindV3IncrementalGenerateCacheStats(),
-			v4: getTailwindV4IncrementalGenerateCacheStats()
-		}
+		tailwind: { v4: getTailwindV4IncrementalGenerateCacheStats() }
 	};
 }
 /**
@@ -199,13 +196,15 @@ function createPlugins(options = {}) {
 		...options,
 		__internalDeferMissingCssEntriesWarning: true
 	});
-	const { templateHandler, styleHandler, jsHandler, cache, twPatcher: initialTwPatcher, refreshTailwindcssPatcher } = opts;
-	const readyPromise = createTailwindRuntimeReadyPromise(initialTwPatcher);
+	const { templateHandler, styleHandler, jsHandler, cache } = opts;
+	const initialTailwindRuntime = opts.tailwindRuntime;
+	const refreshTailwindcssRuntime = opts.refreshTailwindcssRuntime;
+	const readyPromise = createTailwindRuntimeReadyPromise(initialTailwindRuntime);
 	let runtimeSet = /* @__PURE__ */ new Set();
 	const runtimeState = {
-		twPatcher: initialTwPatcher,
+		tailwindRuntime: initialTailwindRuntime,
 		readyPromise,
-		refreshTailwindcssPatcher
+		refreshTailwindcssRuntime
 	};
 	const defaultStyleHandlerOptionsCache = /* @__PURE__ */ new Map();
 	let cachedDefaultTemplateHandlerOptions;
@@ -217,13 +216,10 @@ function createPlugins(options = {}) {
 	let runtimeSetDirty = false;
 	const runtimeSourceHashByFile = /* @__PURE__ */ new Map();
 	const runtimeSourcesByFile = /* @__PURE__ */ new Map();
-	let cachedGulpSourceCandidates;
 	let cachedGulpSourceCandidateSignature;
 	const gulpProcessCacheKeys = /* @__PURE__ */ new Set();
-	const sourceCandidateExtractor = initialTwPatcher.majorVersion === 3 ? createTailwindV3DefaultExtractor() : void 0;
 	const bundleRuntimeClassSetManager = options.__internalGulpRuntimeClassSetManager ?? createBundleRuntimeClassSetManager();
 	function invalidateGulpSourceCandidates() {
-		cachedGulpSourceCandidates = void 0;
 		cachedGulpSourceCandidateSignature = void 0;
 		cachedGulpSourceCandidateGetter = void 0;
 		cachedGulpSourceCandidateSourceGetter = void 0;
@@ -261,8 +257,8 @@ function createPlugins(options = {}) {
 		pruneGulpRuntimeSourceCaches(runtimeSourceHashByFile, runtimeSourcesByFile);
 		if (changed) invalidateGulpSourceCandidates();
 		if (!changed && runtimeSetInitialized) return runtimeSet;
-		if (runtimeState.twPatcher.majorVersion === 4 && !runtimeSetDirty) try {
-			runtimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.twPatcher, createGulpRuntimeSnapshot(runtimeSourcesByFile, [filename]));
+		if (!runtimeSetDirty) try {
+			runtimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.tailwindRuntime, createGulpRuntimeSnapshot(runtimeSourcesByFile, [filename]));
 			runtimeSetInitialized = true;
 			return runtimeSet;
 		} catch (error) {
@@ -271,44 +267,9 @@ function createPlugins(options = {}) {
 		}
 		return refreshRuntimeSet({ forceCollect: true });
 	}
-	async function refreshGulpSourceCandidates(forceRefresh = false) {
-		if (runtimeState.twPatcher.majorVersion !== 3) return /* @__PURE__ */ new Set();
-		const root = opts.tailwindcssBasedir ?? process.cwd();
-		const sourceScan = await resolveViteSourceScanEntries(opts, runtimeState.twPatcher, { root });
-		const nextSignature = cache.computeHash(JSON.stringify({
-			root,
-			entries: sourceScan?.entries,
-			inlineCandidates: sourceScan?.inlineCandidates ? {
-				included: [...sourceScan.inlineCandidates.included].sort(),
-				excluded: [...sourceScan.inlineCandidates.excluded].sort()
-			} : void 0,
-			explicit: sourceScan?.explicit ?? false,
-			dependencies: [...sourceScan?.dependencies ?? []].sort()
-		}));
-		if (!forceRefresh && cachedGulpSourceCandidateSignature === nextSignature && cachedGulpSourceCandidates) return cachedGulpSourceCandidates;
-		const collector = createSourceCandidateCollector({
-			bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues,
-			extractor: sourceCandidateExtractor
-		});
-		await collector.scanRoot({
-			entries: sourceScan?.entries,
-			root
-		});
-		collector.syncInline(sourceScan?.inlineCandidates);
-		cachedGulpSourceCandidateSignature = nextSignature;
-		cachedGulpSourceCandidateGetter = (entries) => collector.valuesForEntries(entries);
-		cachedGulpSourceCandidateSourceGetter = (entries) => collector.sourcesForEntries(entries);
-		cachedGulpSourceCandidates = sourceScan?.entries ? collector.valuesForEntries(sourceScan.entries) : collector.values();
-		return cachedGulpSourceCandidates;
-	}
 	async function refreshGulpV4SourceCandidates(forceRefresh = false) {
-		if (runtimeState.twPatcher.majorVersion !== 4) {
-			cachedGulpSourceCandidateGetter = void 0;
-			cachedGulpSourceCandidateSourceGetter = void 0;
-			return;
-		}
 		const root = opts.tailwindcssBasedir ?? process.cwd();
-		const sourceScan = await resolveViteSourceScanEntries(opts, runtimeState.twPatcher, { root });
+		const sourceScan = await resolveViteSourceScanEntries(opts, runtimeState.tailwindRuntime, { root });
 		const nextSignature = cache.computeHash(JSON.stringify({
 			root,
 			entries: sourceScan?.entries,
@@ -332,23 +293,26 @@ function createPlugins(options = {}) {
 		cachedGulpSourceCandidateSourceGetter = (entries) => collector.sourcesForEntries(entries);
 		return cachedGulpSourceCandidateGetter;
 	}
-	function createRuntimeSetHash(rawSource, nextRuntimeSet, sourceTraceSignature, sourceCandidateSignature) {
+	function createRuntimeSetHash(rawSource, nextRuntimeSet, sourceTraceSignature, sourceCandidateSignature, outputSignature) {
 		return cache.computeHash([
 			rawSource,
-			getRuntimeClassSetSignature(runtimeState.twPatcher),
+			getRuntimeClassSetSignature(runtimeState.tailwindRuntime),
 			[...nextRuntimeSet].sort().join("\n"),
 			sourceTraceSignature ?? "css-source-trace:0",
-			sourceCandidateSignature ?? "gulp-source-candidates:0"
+			sourceCandidateSignature ?? "gulp-source-candidates:0",
+			outputSignature ?? "gulp-output:0"
 		].join("\n\n"));
 	}
 	async function registerAutoCssSource(file, rawSource) {
-		if (hasInitialTailwindCssRoots || (runtimeState.twPatcher.majorVersion ?? 0) < 4 || !file.path || !hasTailwindRootDirectives(rawSource)) return false;
+		if (hasInitialTailwindCssRoots || (runtimeState.tailwindRuntime.majorVersion ?? 0) < 4 || !file.path || !hasTailwindRootDirectives(rawSource)) return false;
 		const sourceFile = path.resolve(file.path);
 		const sourceCss = normalizeTailwindSourceForGenerator(normalizeTailwindConfigDirectives(rawSource, path.dirname(sourceFile)), { importFallback: true });
+		const config = runtimeState.tailwindRuntime.options?.tailwindcss?.config;
+		const generatorSourceCss = prependConfigDirective(splitLocalCssImports(sourceCss)?.source ?? sourceCss, config);
 		if (!upsertTailwindV4CssSource(opts, {
 			file: sourceFile,
 			base: path.dirname(sourceFile),
-			css: sourceCss
+			css: generatorSourceCss
 		})) return false;
 		runtimeSetInitialized = false;
 		runtimeSetDirty = true;
@@ -362,20 +326,24 @@ function createPlugins(options = {}) {
 		return cachedDefaultModuleGraphOptions;
 	}
 	function resolveWxssHandlerOptions(options) {
-		const majorVersion = runtimeState.twPatcher.majorVersion ?? "unknown";
+		const styleHandlerMajorVersion = normalizeStyleHandlerMajorVersion(runtimeState.tailwindRuntime.majorVersion);
+		const majorVersion = styleHandlerMajorVersion ?? "unknown";
 		if (!options || Object.keys(options).length === 0) {
 			let cached = defaultStyleHandlerOptionsCache.get(majorVersion);
 			if (!cached) {
-				cached = runtimeState.twPatcher.majorVersion === void 0 ? {} : { majorVersion: runtimeState.twPatcher.majorVersion };
+				cached = styleHandlerMajorVersion === void 0 ? {} : { majorVersion: styleHandlerMajorVersion };
 				defaultStyleHandlerOptionsCache.set(majorVersion, cached);
 			}
 			return cached;
 		}
-		return runtimeState.twPatcher.majorVersion === void 0 ? { ...options } : {
-			majorVersion: runtimeState.twPatcher.majorVersion,
+		return styleHandlerMajorVersion === void 0 ? { ...options } : {
+			majorVersion: styleHandlerMajorVersion,
 			...options
 		};
 	}
+	function resolveGulpStyleOutputExtension(file) {
+		return typeof opts.cssMatcher === "function" && opts.cssMatcher(path.basename(file.path)) ? path.extname(file.path) : void 0;
+	}
 	function resolveGulpMatcherName(file) {
 		return (file.relative || path.basename(file.path)).replaceAll(path.sep, "/");
 	}
@@ -445,30 +413,23 @@ function createPlugins(options = {}) {
 		if (!file.contents) return;
 		const rawSource = file.contents.toString();
 		const cssSourceChanged = await registerAutoCssSource(file, rawSource);
-		const isMainChunk = opts.mainCssChunkMatcher(resolveGulpMatcherName(file), opts.appType);
-		const shouldUseGenerator = runtimeState.twPatcher.majorVersion !== 3 || hasTailwindRootDirectives(rawSource);
+		const shouldUseGenerator = runtimeState.tailwindRuntime.majorVersion === 4;
 		let gulpSourceCandidateGetter;
-		if (shouldUseGenerator && runtimeState.twPatcher.majorVersion === 4) gulpSourceCandidateGetter = await refreshGulpV4SourceCandidates(cssSourceChanged);
-		let nextRuntimeSet = await refreshRuntimeSet({
+		if (shouldUseGenerator) gulpSourceCandidateGetter = await refreshGulpV4SourceCandidates(cssSourceChanged);
+		const nextRuntimeSet = await refreshRuntimeSet({
 			forceRefresh: cssSourceChanged,
-			forceCollect: cssSourceChanged || runtimeState.twPatcher.majorVersion !== 4 && isMainChunk,
+			forceCollect: cssSourceChanged,
 			clearCache: cssSourceChanged
 		});
-		if (runtimeState.twPatcher.majorVersion === 3 && shouldUseGenerator) {
-			const sourceCandidates = await refreshGulpSourceCandidates(cssSourceChanged || isMainChunk);
-			gulpSourceCandidateGetter = cachedGulpSourceCandidateGetter;
-			if (sourceCandidates.size > 0) {
-				nextRuntimeSet = new Set([...nextRuntimeSet, ...sourceCandidates]);
-				runtimeSet = nextRuntimeSet;
-			}
-		}
 		const sourceTraceTokenSources = cachedGulpSourceCandidateSourceGetter ? createCssTokenSourceMap(cachedGulpSourceCandidateSourceGetter(void 0), opts) : void 0;
 		const sourceTraceSignature = createCssSourceTraceCacheSignature(sourceTraceTokenSources, opts);
 		const sourceCandidateSignature = cachedGulpSourceCandidateGetter ? `gulp-source-candidates:1:${[...cachedGulpSourceCandidateGetter(void 0)].sort().join("\n")}` : void 0;
+		const styleOutputExtension = resolveGulpStyleOutputExtension(file);
+		const outputSignature = styleOutputExtension ? `gulp-output:1:${styleOutputExtension}` : "gulp-output:0";
 		await processCachedTask({
 			cache,
 			cacheKey: file.path,
-			hash: createRuntimeSetHash(rawSource, nextRuntimeSet, sourceTraceSignature, sourceCandidateSignature),
+			hash: createRuntimeSetHash(rawSource, nextRuntimeSet, sourceTraceSignature, sourceCandidateSignature, outputSignature),
 			applyResult(source) {
 				file.contents = Buffer.from(source);
 			},
@@ -478,7 +439,7 @@ function createPlugins(options = {}) {
 			async transform() {
 				await runtimeState.readyPromise;
 				const cssHandlerOptions = resolveWxssFileHandlerOptions(file, rawSource, options);
-				const css = annotateCssSourceTrace((shouldUseGenerator ? await generateCssByGenerator({
+				const outputCss = rewriteLocalCssImportRequestsForOutput(annotateCssSourceTrace((shouldUseGenerator ? await generateCssByGenerator({
 					opts,
 					runtimeState,
 					runtime: nextRuntimeSet,
@@ -492,9 +453,9 @@ function createPlugins(options = {}) {
 				}) : void 0)?.css ?? (await styleHandler(rawSource, cssHandlerOptions)).css, {
 					opts,
 					tokenSources: sourceTraceTokenSources
-				});
+				}), { styleOutputExtension });
 				debug("css handle: %s", file.path);
-				return { result: css };
+				return { result: outputCss };
 			}
 		});
 		rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
@@ -509,6 +470,7 @@ function createPlugins(options = {}) {
 		const moduleGraph = resolveModuleGraphOptions(options.moduleGraph);
 		const handlerOptions = {
 			...options,
+			generateMap: false,
 			filename,
 			moduleGraph,
 			babelParserOptions: {
@@ -516,7 +478,7 @@ function createPlugins(options = {}) {
 				sourceFilename: filename
 			}
 		};
-		if (runtimeState.twPatcher.majorVersion !== void 0) handlerOptions.tailwindcssMajorVersion = runtimeState.twPatcher.majorVersion;
+		if (runtimeState.tailwindRuntime.majorVersion !== void 0) handlerOptions.tailwindcssMajorVersion = runtimeState.tailwindRuntime.majorVersion;
 		await processCachedTask({
 			cache,
 			cacheKey: file.path,

package/dist/gulp.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_gulp = require("./gulp-XT8Jc7lH.js");
+const require_gulp = require("./gulp-BtGq6LP9.js");
 exports.WeappTailwindcss = require_gulp.createPlugins;
 exports.createPlugins = require_gulp.createPlugins;
 exports.weappTailwindcss = require_gulp.createPlugins;

package/dist/gulp.mjs

@@ -1,2 +1,2 @@
-import { t as createPlugins } from "./gulp-DfOQERcV.mjs";
+import { t as createPlugins } from "./gulp-DNU10Vtc.mjs";
 export { createPlugins as WeappTailwindcss, createPlugins, createPlugins as weappTailwindcss };