weapp-tailwindcss 5.1.14 → 5.1.16

package/dist/generator.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-CEnUsjed.js");
+const require_generator = require("./generator-B91GhUJQ.js");
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
 exports.createWeappTailwindcssGeneratorFromRuntime = require_generator.createWeappTailwindcssGeneratorFromRuntime;
 exports.normalizeWeappTailwindcssGeneratorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions;

package/dist/generator.mjs

@@ -1,2 +1,2 @@
-import { bt as transformTailwindV4CssToWeapp, d as resolveTailwindV4SourceFromRuntime, f as resolveTailwindV4SourceFromRuntimeOptions, i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromRuntime, p as resolveTailwindV4SourceOptionsFromRuntime, r as resolveTailwindSourceFromRuntime, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source, yt as transformTailwindV4CssByTarget } from "./generator-B59OA64h.mjs";
+import { At as transformTailwindV4CssByTarget, d as resolveTailwindV4SourceFromRuntime, f as resolveTailwindV4SourceFromRuntimeOptions, i as normalizeWeappTailwindcssGeneratorOptions, jt as transformTailwindV4CssToWeapp, n as createWeappTailwindcssGeneratorFromRuntime, p as resolveTailwindV4SourceOptionsFromRuntime, r as resolveTailwindSourceFromRuntime, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-Bv7myuhY.mjs";
 export { createWeappTailwindcssGenerator, createWeappTailwindcssGeneratorFromRuntime, normalizeWeappTailwindcssGeneratorOptions, resolveTailwindSourceFromRuntime, resolveTailwindV4Source, resolveTailwindV4SourceFromRuntime, resolveTailwindV4SourceFromRuntimeOptions, resolveTailwindV4SourceOptionsFromRuntime, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp };

package/dist/{gulp-DUYWxmZC.mjs → gulp-CKSklPlH.mjs}

@@ -1,8 +1,8 @@
-import { Q as normalizeTailwindConfigDirectives, X as hasTailwindRootDirectives, et as normalizeTailwindSourceForGenerator, g as upsertTailwindV4CssSource, gt as prependConfigDirective, h as hasConfiguredTailwindV4CssRoots, vt as getTailwindV4IncrementalGenerateCacheStats } from "./generator-B59OA64h.mjs";
-import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-DPcKMLxL.mjs";
+import { $ as normalizeTailwindConfigDirectives, Nt as getTailwindV4IncrementalGenerateCacheStats, Z as hasTailwindRootDirectives, _t as prependConfigDirective, g as upsertTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, tt as normalizeTailwindSourceForGenerator } from "./generator-Bv7myuhY.mjs";
+import { l as getRuntimeClassSetSignature, p as resolveViteSourceScanEntries } from "./tailwindcss-BTcXX8Ka.mjs";
 import { y as createDebug } from "./wxml-DdGdeqaH.mjs";
-import { l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-BL8Gy71H.mjs";
-import { A as processCachedTask, D as createCssSourceTraceCacheSignature, E as annotateCssSourceTrace, O as createCssTokenSourceMap, b as rewriteLocalCssImportRequestsForOutput, n as emitHmrTiming, r as createSourceCandidateCollector, s as createBundleRuntimeClassSetManager, u as generateCssByGenerator, x as splitLocalCssImports } from "./hmr-timing-C3ed5vCx.mjs";
+import { l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-JzwzSX36.mjs";
+import { A as processCachedTask, B as rewriteLocalCssImportRequestsForOutput, C as hasBundlerGeneratedCssMarker, D as createCssSourceTraceCacheSignature, E as annotateCssSourceTrace, I as createBundleRuntimeClassSetManager, O as createCssTokenSourceMap, S as createBundlerGeneratedCssMarker, T as stripBundlerGeneratedCssMarkers, V as splitLocalCssImports, i as generateCssByGenerator, j as createSourceCandidateCollector, m as finalizeMiniProgramGeneratorCss, n as emitHmrTiming } from "./hmr-timing-BXg7nI8N.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -103,29 +103,7 @@ function createGulpRuntimeSnapshot(runtimeSourcesByFile, changedFiles) {
 	};
 }
 //#endregion
-//#region src/bundlers/gulp/vinyl-transform.ts
-const Transform = stream.Transform;
-function createVinylTransform(phase, handler, getTimingDetails) {
-	return new Transform({
-		objectMode: true,
-		async transform(file, _encoding, callback) {
-			const hmrTimingStartedAt = performance.now();
-			try {
-				await handler(file);
-				emitHmrTiming("gulp", phase, performance.now() - hmrTimingStartedAt, {
-					file: file.relative || path.basename(file.path),
-					...getTimingDetails?.(file)
-				});
-				callback(null, file);
-			} catch (error) {
-				callback(error, file);
-			}
-		}
-	});
-}
-//#endregion
-//#region src/bundlers/gulp/shared/create-native-framework-plugins.ts
-const debug = createDebug();
+//#region src/bundlers/gulp/shared/create-native-framework-plugins/cache-state.ts
 const GULP_RUNTIME_SOURCE_CACHE_MAX = 256;
 const GULP_PROCESS_CACHE_MAX = 512;
 function toMb(bytes) {
@@ -186,6 +164,195 @@ function resolveGulpMemoryDebugStats(context) {
 		tailwind: { v4: getTailwindV4IncrementalGenerateCacheStats() }
 	};
 }
+//#endregion
+//#region src/bundlers/gulp/vinyl-transform.ts
+const Transform = stream.Transform;
+function createVinylTransform(phase, handler, getTimingDetails) {
+	return new Transform({
+		objectMode: true,
+		async transform(file, _encoding, callback) {
+			const hmrTimingStartedAt = performance.now();
+			try {
+				await handler(file);
+				emitHmrTiming("gulp", phase, performance.now() - hmrTimingStartedAt, {
+					file: file.relative || path.basename(file.path),
+					...getTimingDetails?.(file)
+				});
+				callback(null, file);
+			} catch (error) {
+				callback(error, file);
+			}
+		}
+	});
+}
+//#endregion
+//#region src/bundlers/gulp/shared/create-native-framework-plugins/file-transforms.ts
+function createGulpFileTransforms(context) {
+	const { cache, createRuntimeSetHash, debug, generatedCssPreflightModeByFile, getSourceCandidateGetter, getSourceCandidateSourceGetter, getRuntimeSet, gulpProcessCacheKeys, opts, refreshGulpV4SourceCandidates, refreshRuntimeSet, refreshRuntimeSetForSource, registerAutoCssSource, resolveGulpStyleOutputExtension, resolveGulpTransformTimingDetails, resolveModuleGraphOptions, resolveWxmlHandlerOptions, resolveWxssFileHandlerOptions, resolveWxssUserHandlerOptions, runtimeState } = context;
+	const { templateHandler, styleHandler, jsHandler } = opts;
+	function createWxssTransform(options, stage) {
+		return createVinylTransform(`css:${stage}`, async (file) => {
+			if (!file.contents) return;
+			const rawSource = file.contents.toString();
+			const cssSourceChanged = await registerAutoCssSource(file, rawSource);
+			const shouldUseGenerator = runtimeState.tailwindRuntime.majorVersion === 4;
+			let gulpSourceCandidateGetter = getSourceCandidateGetter();
+			if (shouldUseGenerator) gulpSourceCandidateGetter = await refreshGulpV4SourceCandidates(cssSourceChanged);
+			const nextRuntimeSet = await refreshRuntimeSet({
+				forceRefresh: cssSourceChanged,
+				forceCollect: cssSourceChanged,
+				clearCache: cssSourceChanged
+			});
+			const sourceCandidateSourceGetter = getSourceCandidateSourceGetter();
+			const sourceTraceTokenSources = sourceCandidateSourceGetter ? createCssTokenSourceMap(sourceCandidateSourceGetter(void 0), opts) : void 0;
+			const sourceTraceSignature = createCssSourceTraceCacheSignature(sourceTraceTokenSources, opts);
+			const sourceCandidateSignature = gulpSourceCandidateGetter ? `gulp-source-candidates:1:${[...gulpSourceCandidateGetter(void 0)].sort().join("\n")}` : void 0;
+			const styleOutputExtension = resolveGulpStyleOutputExtension(file);
+			const outputSignature = styleOutputExtension ? `gulp-output:1:${stage}:${styleOutputExtension}` : `gulp-output:0:${stage}`;
+			await processCachedTask({
+				cache,
+				cacheKey: file.path,
+				hash: createRuntimeSetHash(rawSource, nextRuntimeSet, sourceTraceSignature, sourceCandidateSignature, outputSignature),
+				applyResult(source) {
+					file.contents = Buffer.from(source);
+				},
+				onCacheHit() {
+					debug("css cache hit: %s", file.path);
+				},
+				async transform() {
+					await runtimeState.readyPromise;
+					const cssHandlerOptions = resolveWxssFileHandlerOptions(file, rawSource, options);
+					const generated = shouldUseGenerator ? await generateCssByGenerator({
+						opts,
+						runtimeState,
+						runtime: nextRuntimeSet,
+						rawSource,
+						file: file.path,
+						cssHandlerOptions,
+						cssUserHandlerOptions: resolveWxssUserHandlerOptions(options),
+						getSourceCandidatesForEntries: gulpSourceCandidateGetter,
+						styleHandler,
+						debug,
+						deferCssAdaptation: stage === "generate"
+					}) : void 0;
+					const transformedCss = generated?.css ?? (stage === "generate" ? rawSource : (await styleHandler(rawSource, cssHandlerOptions)).css);
+					if (stage === "generate") {
+						const preflightMode = generated?.metadata?.preflightMode;
+						if (preflightMode) generatedCssPreflightModeByFile.set(file.path, preflightMode);
+						else generatedCssPreflightModeByFile.delete(file.path);
+					}
+					const css = annotateCssSourceTrace(transformedCss, {
+						opts,
+						tokenSources: sourceTraceTokenSources
+					});
+					const generatedCss = stage === "generate" && generated ? `${createBundlerGeneratedCssMarker("gulp", file.path)}\n${css}` : css;
+					const outputCss = stage === "generate" ? generatedCss : rewriteLocalCssImportRequestsForOutput(generatedCss, { styleOutputExtension });
+					debug("css handle: %s", file.path);
+					return { result: outputCss };
+				}
+			});
+			rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
+			pruneGulpProcessCache(cache, gulpProcessCacheKeys);
+		}, () => resolveGulpTransformTimingDetails(`css:${stage}`));
+	}
+	const generateWxss = (options = {}) => createWxssTransform(options, "generate");
+	const transformWxss = (options = {}) => createWxssTransform(options, "transform");
+	const adaptWxss = (options = {}) => createVinylTransform("css:adapt", async (file) => {
+		if (!file.contents) return;
+		const rawSource = file.contents.toString();
+		const generatedCss = hasBundlerGeneratedCssMarker(rawSource);
+		const source = generatedCss ? stripBundlerGeneratedCssMarkers(rawSource) : rawSource;
+		const styleOutputExtension = resolveGulpStyleOutputExtension(file);
+		const cssHandlerOptions = resolveWxssFileHandlerOptions(file, source, options);
+		const handled = await styleHandler(source, cssHandlerOptions);
+		const preflightMode = generatedCssPreflightModeByFile.get(file.path);
+		const finalized = generatedCss ? finalizeMiniProgramGeneratorCss(handled.css, "weapp", runtimeState.tailwindRuntime.majorVersion, opts.cssPreflight, {
+			injectPreflight: preflightMode?.inject ?? cssHandlerOptions.isMainChunk,
+			preservePreflight: preflightMode?.preserve ?? cssHandlerOptions.isMainChunk,
+			styleOptions: cssHandlerOptions
+		}) : handled.css;
+		file.contents = Buffer.from(rewriteLocalCssImportRequestsForOutput(finalized, { styleOutputExtension }));
+		debug("css adapt: %s", file.path);
+	}, () => resolveGulpTransformTimingDetails("css:adapt"));
+	const transformJs = (options = {}) => createVinylTransform("js", async (file) => {
+		if (!file.contents) return;
+		const filename = path.resolve(file.path);
+		const rawSource = file.contents.toString();
+		await refreshRuntimeSetForSource(file, rawSource, "js");
+		await runtimeState.readyPromise;
+		const moduleGraph = resolveModuleGraphOptions(options.moduleGraph);
+		const handlerOptions = {
+			...options,
+			generateMap: false,
+			filename,
+			moduleGraph,
+			babelParserOptions: {
+				...options?.babelParserOptions ?? {},
+				sourceFilename: filename
+			}
+		};
+		if (runtimeState.tailwindRuntime.majorVersion !== void 0) handlerOptions.tailwindcssMajorVersion = runtimeState.tailwindRuntime.majorVersion;
+		await processCachedTask({
+			cache,
+			cacheKey: file.path,
+			rawSource,
+			applyResult(source) {
+				file.contents = Buffer.from(source);
+			},
+			onCacheHit() {
+				debug("js cache hit: %s", file.path);
+			},
+			async transform() {
+				await runtimeState.readyPromise;
+				const currentSource = file.contents?.toString() ?? rawSource;
+				if (shouldSkipJsTransform(currentSource, {
+					...handlerOptions,
+					classNameSet: getRuntimeSet()
+				})) return { result: currentSource };
+				const { code } = await jsHandler(currentSource, getRuntimeSet(), handlerOptions);
+				debug("js handle: %s", file.path);
+				return { result: code };
+			}
+		});
+		rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
+		pruneGulpProcessCache(cache, gulpProcessCacheKeys);
+	}, () => resolveGulpTransformTimingDetails("js"));
+	const transformWxml = (options = {}) => createVinylTransform("html", async (file) => {
+		if (!file.contents) return;
+		const rawSource = file.contents.toString();
+		await refreshRuntimeSetForSource(file, rawSource, "html");
+		await runtimeState.readyPromise;
+		await processCachedTask({
+			cache,
+			cacheKey: file.path,
+			rawSource,
+			applyResult(source) {
+				file.contents = Buffer.from(source);
+			},
+			onCacheHit() {
+				debug("html cache hit: %s", file.path);
+			},
+			async transform() {
+				await runtimeState.readyPromise;
+				const code = await templateHandler(rawSource, resolveWxmlHandlerOptions(options));
+				debug("html handle: %s", file.path);
+				return { result: code };
+			}
+		});
+		rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
+		pruneGulpProcessCache(cache, gulpProcessCacheKeys);
+	}, () => resolveGulpTransformTimingDetails("html"));
+	return {
+		adaptWxss,
+		generateWxss,
+		transformWxss,
+		transformWxml,
+		transformJs
+	};
+}
+//#endregion
+//#region src/bundlers/gulp/shared/create-native-framework-plugins.ts
+const debug = createDebug();
 /**
 * @name weapp-tw-gulp
 * @description native framework 的插件组合实现
@@ -197,7 +364,7 @@ function createNativeGulpPlugins(options = {}) {
 		...options,
 		__internalDeferMissingCssEntriesWarning: true
 	});
-	const { templateHandler, styleHandler, jsHandler, cache } = opts;
+	const { cache } = opts;
 	const initialTailwindRuntime = opts.tailwindRuntime;
 	const refreshTailwindcssRuntime = opts.refreshTailwindcssRuntime;
 	const readyPromise = createTailwindRuntimeReadyPromise(initialTailwindRuntime);
@@ -217,6 +384,7 @@ function createNativeGulpPlugins(options = {}) {
 	let runtimeSetDirty = false;
 	const runtimeSourceHashByFile = /* @__PURE__ */ new Map();
 	const runtimeSourcesByFile = /* @__PURE__ */ new Map();
+	const generatedCssPreflightModeByFile = /* @__PURE__ */ new Map();
 	let cachedGulpSourceCandidateSignature;
 	const gulpProcessCacheKeys = /* @__PURE__ */ new Set();
 	const bundleRuntimeClassSetManager = options.__internalGulpRuntimeClassSetManager ?? createBundleRuntimeClassSetManager();
@@ -414,131 +582,28 @@ function createNativeGulpPlugins(options = {}) {
 			runtimeSourcesByFile
 		}) };
 	}
-	const transformWxss = (options = {}) => createVinylTransform("css", async (file) => {
-		if (!file.contents) return;
-		const rawSource = file.contents.toString();
-		const cssSourceChanged = await registerAutoCssSource(file, rawSource);
-		const shouldUseGenerator = runtimeState.tailwindRuntime.majorVersion === 4;
-		let gulpSourceCandidateGetter;
-		if (shouldUseGenerator) gulpSourceCandidateGetter = await refreshGulpV4SourceCandidates(cssSourceChanged);
-		const nextRuntimeSet = await refreshRuntimeSet({
-			forceRefresh: cssSourceChanged,
-			forceCollect: cssSourceChanged,
-			clearCache: cssSourceChanged
-		});
-		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, outputSignature),
-			applyResult(source) {
-				file.contents = Buffer.from(source);
-			},
-			onCacheHit() {
-				debug("css cache hit: %s", file.path);
-			},
-			async transform() {
-				await runtimeState.readyPromise;
-				const cssHandlerOptions = resolveWxssFileHandlerOptions(file, rawSource, options);
-				const outputCss = rewriteLocalCssImportRequestsForOutput(annotateCssSourceTrace((shouldUseGenerator ? await generateCssByGenerator({
-					opts,
-					runtimeState,
-					runtime: nextRuntimeSet,
-					rawSource,
-					file: file.path,
-					cssHandlerOptions,
-					cssUserHandlerOptions: resolveWxssUserHandlerOptions(options),
-					getSourceCandidatesForEntries: gulpSourceCandidateGetter,
-					styleHandler,
-					debug
-				}) : void 0)?.css ?? (await styleHandler(rawSource, cssHandlerOptions)).css, {
-					opts,
-					tokenSources: sourceTraceTokenSources
-				}), { styleOutputExtension });
-				debug("css handle: %s", file.path);
-				return { result: outputCss };
-			}
-		});
-		rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
-		pruneGulpProcessCache(cache, gulpProcessCacheKeys);
-	}, () => resolveGulpTransformTimingDetails("css"));
-	const transformJs = (options = {}) => createVinylTransform("js", async (file) => {
-		if (!file.contents) return;
-		const filename = path.resolve(file.path);
-		const rawSource = file.contents.toString();
-		await refreshRuntimeSetForSource(file, rawSource, "js");
-		await runtimeState.readyPromise;
-		const moduleGraph = resolveModuleGraphOptions(options.moduleGraph);
-		const handlerOptions = {
-			...options,
-			generateMap: false,
-			filename,
-			moduleGraph,
-			babelParserOptions: {
-				...options?.babelParserOptions ?? {},
-				sourceFilename: filename
-			}
-		};
-		if (runtimeState.tailwindRuntime.majorVersion !== void 0) handlerOptions.tailwindcssMajorVersion = runtimeState.tailwindRuntime.majorVersion;
-		await processCachedTask({
-			cache,
-			cacheKey: file.path,
-			rawSource,
-			applyResult(source) {
-				file.contents = Buffer.from(source);
-			},
-			onCacheHit() {
-				debug("js cache hit: %s", file.path);
-			},
-			async transform() {
-				await runtimeState.readyPromise;
-				const currentSource = file.contents?.toString() ?? rawSource;
-				if (shouldSkipJsTransform(currentSource, {
-					...handlerOptions,
-					classNameSet: runtimeSet
-				})) return { result: currentSource };
-				const { code } = await jsHandler(currentSource, runtimeSet, handlerOptions);
-				debug("js handle: %s", file.path);
-				return { result: code };
-			}
-		});
-		rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
-		pruneGulpProcessCache(cache, gulpProcessCacheKeys);
-	}, () => resolveGulpTransformTimingDetails("js"));
-	const transformWxml = (options = {}) => createVinylTransform("html", async (file) => {
-		if (!file.contents) return;
-		const rawSource = file.contents.toString();
-		await refreshRuntimeSetForSource(file, rawSource, "html");
-		await runtimeState.readyPromise;
-		await processCachedTask({
-			cache,
-			cacheKey: file.path,
-			rawSource,
-			applyResult(source) {
-				file.contents = Buffer.from(source);
-			},
-			onCacheHit() {
-				debug("html cache hit: %s", file.path);
-			},
-			async transform() {
-				await runtimeState.readyPromise;
-				const code = await templateHandler(rawSource, resolveWxmlHandlerOptions(options));
-				debug("html handle: %s", file.path);
-				return { result: code };
-			}
-		});
-		rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
-		pruneGulpProcessCache(cache, gulpProcessCacheKeys);
-	}, () => resolveGulpTransformTimingDetails("html"));
-	return {
-		transformWxss,
-		transformWxml,
-		transformJs
-	};
+	return createGulpFileTransforms({
+		cache,
+		createRuntimeSetHash,
+		debug,
+		generatedCssPreflightModeByFile,
+		getSourceCandidateGetter: () => cachedGulpSourceCandidateGetter,
+		getSourceCandidateSourceGetter: () => cachedGulpSourceCandidateSourceGetter,
+		getRuntimeSet: () => runtimeSet,
+		gulpProcessCacheKeys,
+		opts,
+		refreshGulpV4SourceCandidates,
+		refreshRuntimeSet,
+		refreshRuntimeSetForSource,
+		registerAutoCssSource,
+		resolveGulpStyleOutputExtension,
+		resolveGulpTransformTimingDetails,
+		resolveModuleGraphOptions,
+		resolveWxmlHandlerOptions,
+		resolveWxssFileHandlerOptions,
+		resolveWxssUserHandlerOptions,
+		runtimeState
+	});
 }
 //#endregion
 //#region src/bundlers/gulp/frameworks/native/index.ts