weapp-tailwindcss 5.1.16 → 5.2.0

package/dist/{gulp-CKSklPlH.mjs → gulp-DNXQvDUw.js}

@@ -1,8 +1,8 @@
-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-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 { Pt as getTailwindV4IncrementalGenerateCacheStats, Q as hasTailwindRootDirectives, _ as upsertTailwindV4CssSource, et as normalizeTailwindConfigDirectives, g as removeTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, nt as normalizeTailwindSourceForGenerator, vt as prependConfigDirective } from "./generator-CDdzqf1S.js";
+import { l as getRuntimeClassSetSignature, p as resolveSourceScanEntries } from "./tailwindcss-D7TGiZR2.js";
+import { $ as createCompilationDependencyChanges, C as createBundlerGeneratedCssMarker, D as annotateCssSourceTrace, E as stripBundlerGeneratedCssMarkers, G as createRuntimeAffectingSourceSignature, H as removeRuntimeCompilationBuildStateFiles, I as rewriteLocalCssImportRequestsForOutput, J as getCompilerShadowRunSnapshot, K as disposeCompilerOwner, L as splitLocalCssImports, M as createRuntimeClassSetManager, O as createCssSourceTraceCacheSignature, Q as recordCompilationDependencyChanges, R as finalizeCompilerShadowRun, V as createRuntimeCompilationBuildState, W as updateRuntimeCompilationBuildState, X as getCompilationScopeDependencyRevision, Y as AssetEmissionPlan, Z as invalidateCompilationScope, et as createSourceCandidateCollector, j as processCachedTask, k as createCssTokenSourceMap, n as emitHmrTiming, q as beginCompilerShadowRun, r as generateTailwindV4Css, w as hasBundlerGeneratedCssMarker, y as finalizeMiniProgramGeneratorCss, z as buildRuntimeCompilationSnapshot } from "./hmr-timing-CuJwQzDc.js";
+import { h as createDebug } from "./wxml-IBzZSaQC.js";
+import { l as createTailwindRuntimeReadyPromise, n as normalizeStyleHandlerMajorVersion, o as shouldSkipJsTransform, t as getCompilerContext, u as ensureRuntimeClassSet } from "./context-oTkxC5aZ.js";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -60,47 +60,17 @@ function createGulpModuleGraphOptions(opts) {
 }
 //#endregion
 //#region src/bundlers/gulp/runtime-snapshot.ts
-function createGulpRuntimeSnapshot(runtimeSourcesByFile, changedFiles) {
-	const runtimeAffectingChangedByType = {
-		html: /* @__PURE__ */ new Set(),
-		js: /* @__PURE__ */ new Set(),
-		css: /* @__PURE__ */ new Set(),
-		other: /* @__PURE__ */ new Set()
-	};
-	for (const file of changedFiles) {
-		const entry = runtimeSourcesByFile.get(file);
-		if (entry) runtimeAffectingChangedByType[entry.type].add(file);
-	}
-	return {
-		entries: [...runtimeSourcesByFile.entries()].map(([file, entry]) => ({
-			file,
-			output: {
-				fileName: file,
-				source: entry.source,
-				type: "asset"
-			},
-			source: entry.source,
-			type: entry.type
-		})),
-		jsEntries: /* @__PURE__ */ new Map(),
-		sourceHashByFile: /* @__PURE__ */ new Map(),
-		runtimeAffectingSignatureByFile: /* @__PURE__ */ new Map(),
-		runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
-		hasOmittedKnownFiles: false,
-		changedByType: {
-			html: /* @__PURE__ */ new Set(),
-			js: /* @__PURE__ */ new Set(),
-			css: /* @__PURE__ */ new Set(),
-			other: /* @__PURE__ */ new Set()
-		},
-		runtimeAffectingChangedByType,
-		processFiles: {
-			html: /* @__PURE__ */ new Set(),
-			js: /* @__PURE__ */ new Set(),
-			css: /* @__PURE__ */ new Set()
-		},
-		linkedImpactsByEntry: /* @__PURE__ */ new Map()
-	};
+function createGulpRuntimeSnapshot(runtimeSourcesByFile, state, computeHash, options = {}) {
+	return buildRuntimeCompilationSnapshot([...runtimeSourcesByFile.entries()].map(([file, entry]) => ({
+		file,
+		runtimeCandidate: true,
+		source: entry.source,
+		type: entry.type
+	})), state, {
+		computeHash,
+		createRuntimeAffectingSignature: createRuntimeAffectingSourceSignature,
+		removedFiles: options.removedFiles
+	});
 }
 //#endregion
 //#region src/bundlers/gulp/shared/create-native-framework-plugins/cache-state.ts
@@ -113,13 +83,15 @@ function touchMapEntry(map, key, value) {
 	map.delete(key);
 	map.set(key, value);
 }
-function pruneGulpRuntimeSourceCaches(sourceHashByFile, sourcesByFile) {
+function pruneGulpRuntimeSourceCaches(sourcesByFile) {
+	const removedFiles = [];
 	while (sourcesByFile.size > GULP_RUNTIME_SOURCE_CACHE_MAX) {
 		const oldestKey = sourcesByFile.keys().next().value;
 		if (typeof oldestKey !== "string") break;
 		sourcesByFile.delete(oldestKey);
-		sourceHashByFile.delete(oldestKey);
+		removedFiles.push(oldestKey);
 	}
+	return removedFiles;
 }
 function rememberGulpProcessCacheKey(cacheKeys, key) {
 	cacheKeys.delete(key);
@@ -165,6 +137,29 @@ function resolveGulpMemoryDebugStats(context) {
 	};
 }
 //#endregion
+//#region src/bundlers/gulp/asset-emission-plan.ts
+function applyGulpAssetEmissionPlan(plan, options) {
+	for (const operation of plan.operations()) {
+		if (operation.kind === "delete") {
+			options.deleteAsset(operation.assetId);
+			continue;
+		}
+		options.writeAsset(operation.assetId, typeof operation.source === "string" ? Buffer.from(operation.source) : Buffer.from(operation.source));
+	}
+}
+function writeGulpFileAsset(file, source) {
+	const plan = new AssetEmissionPlan();
+	plan.write(file.path, source);
+	applyGulpAssetEmissionPlan(plan, {
+		deleteAsset(assetId) {
+			if (assetId === file.path) file.contents = null;
+		},
+		writeAsset(assetId, contents) {
+			if (assetId === file.path) file.contents = contents;
+		}
+	});
+}
+//#endregion
 //#region src/bundlers/gulp/vinyl-transform.ts
 const Transform = stream.Transform;
 function createVinylTransform(phase, handler, getTimingDetails) {
@@ -188,7 +183,7 @@ function createVinylTransform(phase, handler, getTimingDetails) {
 //#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 { cache, createRuntimeSetHash, debug, generatedCssPreflightModeByFile, getCompilationDependencyRevision, getSourceCandidateGetter, getSourceCandidateSourceGetter, getRuntimeSet, gulpProcessCacheKeys, opts, refreshGulpV4SourceCandidates, refreshRuntimeSet, refreshRuntimeSetForSource, registerAutoCssSource, rememberCompilationScope, resolveGulpStyleOutputExtension, resolveGulpTransformTimingDetails, resolveModuleGraphOptions, resolveWxmlHandlerOptions, resolveWxssFileHandlerOptions, resolveWxssUserHandlerOptions, runtimeState } = context;
 	const { templateHandler, styleHandler, jsHandler } = opts;
 	function createWxssTransform(options, stage) {
 		return createVinylTransform(`css:${stage}`, async (file) => {
@@ -208,26 +203,35 @@ function createGulpFileTransforms(context) {
 			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}`;
+			const cssHandlerOptions = resolveWxssFileHandlerOptions(file, rawSource, options);
+			const outputFile = (file.relative || path.basename(file.path)).replaceAll(path.sep, "/");
+			const compilationScope = {
+				id: outputFile,
+				kind: cssHandlerOptions.isMainChunk ? "global" : "component"
+			};
+			rememberCompilationScope(file.path, compilationScope.id);
+			const compilationDependencyRevision = getCompilationDependencyRevision(compilationScope.id);
+			const outputSignature = `${styleOutputExtension ? `gulp-output:1:${stage}:${styleOutputExtension}` : `gulp-output:0:${stage}`}:compiler-dependencies:${compilationDependencyRevision}`;
 			await processCachedTask({
 				cache,
 				cacheKey: file.path,
 				hash: createRuntimeSetHash(rawSource, nextRuntimeSet, sourceTraceSignature, sourceCandidateSignature, outputSignature),
 				applyResult(source) {
-					file.contents = Buffer.from(source);
+					writeGulpFileAsset(file, 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({
+					const generated = shouldUseGenerator ? await generateTailwindV4Css({
 						opts,
 						runtimeState,
 						runtime: nextRuntimeSet,
 						rawSource,
 						file: file.path,
+						outputFile,
+						scope: compilationScope,
 						cssHandlerOptions,
 						cssUserHandlerOptions: resolveWxssUserHandlerOptions(options),
 						getSourceCandidatesForEntries: gulpSourceCandidateGetter,
@@ -266,12 +270,11 @@ function createGulpFileTransforms(context) {
 		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, {
+		writeGulpFileAsset(file, rewriteLocalCssImportRequestsForOutput(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 }));
+		}) : handled.css, { styleOutputExtension }));
 		debug("css adapt: %s", file.path);
 	}, () => resolveGulpTransformTimingDetails("css:adapt"));
 	const transformJs = (options = {}) => createVinylTransform("js", async (file) => {
@@ -297,7 +300,7 @@ function createGulpFileTransforms(context) {
 			cacheKey: file.path,
 			rawSource,
 			applyResult(source) {
-				file.contents = Buffer.from(source);
+				writeGulpFileAsset(file, source);
 			},
 			onCacheHit() {
 				debug("js cache hit: %s", file.path);
@@ -327,7 +330,7 @@ function createGulpFileTransforms(context) {
 			cacheKey: file.path,
 			rawSource,
 			applyResult(source) {
-				file.contents = Buffer.from(source);
+				writeGulpFileAsset(file, source);
 			},
 			onCacheHit() {
 				debug("html cache hit: %s", file.path);
@@ -353,6 +356,7 @@ function createGulpFileTransforms(context) {
 //#endregion
 //#region src/bundlers/gulp/shared/create-native-framework-plugins.ts
 const debug = createDebug();
+const GULP_COMPILATION_SCOPE_CACHE_MAX = 512;
 /**
 * @name weapp-tw-gulp
 * @description native framework 的插件组合实现
@@ -382,12 +386,13 @@ function createNativeGulpPlugins(options = {}) {
 	let cachedGulpSourceCandidateSourceGetter;
 	let runtimeSetInitialized = false;
 	let runtimeSetDirty = false;
-	const runtimeSourceHashByFile = /* @__PURE__ */ new Map();
 	const runtimeSourcesByFile = /* @__PURE__ */ new Map();
+	const runtimeSnapshotState = createRuntimeCompilationBuildState();
 	const generatedCssPreflightModeByFile = /* @__PURE__ */ new Map();
+	const compilationScopeBySourceFile = /* @__PURE__ */ new Map();
 	let cachedGulpSourceCandidateSignature;
 	const gulpProcessCacheKeys = /* @__PURE__ */ new Set();
-	const bundleRuntimeClassSetManager = options.__internalGulpRuntimeClassSetManager ?? createBundleRuntimeClassSetManager();
+	const bundleRuntimeClassSetManager = options.__internalGulpRuntimeClassSetManager ?? createRuntimeClassSetManager();
 	function invalidateGulpSourceCandidates() {
 		cachedGulpSourceCandidateSignature = void 0;
 		cachedGulpSourceCandidateGetter = void 0;
@@ -415,19 +420,18 @@ function createNativeGulpPlugins(options = {}) {
 	}
 	async function refreshRuntimeSetForSource(file, rawSource, type) {
 		const filename = path.resolve(file.path);
-		const hash = cache.computeHash(rawSource);
-		const changed = runtimeSourceHashByFile.get(filename) !== hash;
-		runtimeSourceHashByFile.delete(filename);
-		runtimeSourceHashByFile.set(filename, hash);
 		touchMapEntry(runtimeSourcesByFile, filename, {
 			source: rawSource,
 			type
 		});
-		pruneGulpRuntimeSourceCaches(runtimeSourceHashByFile, runtimeSourcesByFile);
+		removeRuntimeCompilationBuildStateFiles(runtimeSnapshotState, pruneGulpRuntimeSourceCaches(runtimeSourcesByFile));
+		const snapshot = createGulpRuntimeSnapshot(runtimeSourcesByFile, runtimeSnapshotState, (source) => cache.computeHash(source));
+		const changed = snapshot.changedByType[type].has(filename);
+		updateRuntimeCompilationBuildState(runtimeSnapshotState, snapshot, /* @__PURE__ */ new Map());
 		if (changed) invalidateGulpSourceCandidates();
 		if (!changed && runtimeSetInitialized) return runtimeSet;
 		if (!runtimeSetDirty) try {
-			runtimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.tailwindRuntime, createGulpRuntimeSnapshot(runtimeSourcesByFile, [filename]));
+			runtimeSet = await bundleRuntimeClassSetManager.sync(runtimeState.tailwindRuntime, snapshot);
 			runtimeSetInitialized = true;
 			return runtimeSet;
 		} catch (error) {
@@ -438,7 +442,7 @@ function createNativeGulpPlugins(options = {}) {
 	}
 	async function refreshGulpV4SourceCandidates(forceRefresh = false) {
 		const root = opts.tailwindcssBasedir ?? process.cwd();
-		const sourceScan = await resolveViteSourceScanEntries(opts, runtimeState.tailwindRuntime, { root });
+		const sourceScan = await resolveSourceScanEntries(opts, runtimeState.tailwindRuntime, { root });
 		const nextSignature = cache.computeHash(JSON.stringify({
 			root,
 			entries: sourceScan?.entries,
@@ -578,32 +582,79 @@ function createNativeGulpPlugins(options = {}) {
 			gulpProcessCacheKeys,
 			phase,
 			runtimeSet,
-			runtimeSourceHashByFile,
+			runtimeSourceHashByFile: runtimeSnapshotState.sourceHashByFile,
 			runtimeSourcesByFile
 		}) };
 	}
-	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
-	});
+	function rememberCompilationScope(sourceFile, scopeId) {
+		touchMapEntry(compilationScopeBySourceFile, path.resolve(sourceFile), scopeId);
+		while (compilationScopeBySourceFile.size > GULP_COMPILATION_SCOPE_CACHE_MAX) {
+			const oldestSourceFile = compilationScopeBySourceFile.keys().next().value;
+			if (typeof oldestSourceFile !== "string") break;
+			compilationScopeBySourceFile.delete(oldestSourceFile);
+		}
+	}
+	/** 记录 Gulp watcher 提交的源码或生成依赖变化。 */
+	async function watchChange(id, change = { event: "update" }) {
+		beginCompilerShadowRun(runtimeState);
+		const file = path.resolve(id);
+		const affectedScopes = recordCompilationDependencyChanges(runtimeState, createCompilationDependencyChanges([file]));
+		invalidateGulpSourceCandidates();
+		if (change.event === "delete") {
+			const removedRuntimeSource = runtimeSourcesByFile.delete(file);
+			const removedCssSource = removeTailwindV4CssSource(opts, file);
+			const removedScopeId = compilationScopeBySourceFile.get(file);
+			if (removedScopeId) {
+				invalidateCompilationScope(runtimeState, removedScopeId);
+				compilationScopeBySourceFile.delete(file);
+			}
+			removeRuntimeCompilationBuildStateFiles(runtimeSnapshotState, [file]);
+			generatedCssPreflightModeByFile.delete(file);
+			gulpProcessCacheKeys.delete(file);
+			cache.instance.delete(file);
+			cache.hashMap.delete(file);
+			if (removedRuntimeSource || removedCssSource) {
+				runtimeSetInitialized = false;
+				runtimeSetDirty = true;
+				await bundleRuntimeClassSetManager.reset();
+			}
+		}
+		return affectedScopes;
+	}
+	return {
+		...createGulpFileTransforms({
+			cache,
+			createRuntimeSetHash,
+			debug,
+			generatedCssPreflightModeByFile,
+			getCompilationDependencyRevision: (scopeId) => getCompilationScopeDependencyRevision(runtimeState, scopeId),
+			getSourceCandidateGetter: () => cachedGulpSourceCandidateGetter,
+			getSourceCandidateSourceGetter: () => cachedGulpSourceCandidateSourceGetter,
+			getRuntimeSet: () => runtimeSet,
+			gulpProcessCacheKeys,
+			opts,
+			refreshGulpV4SourceCandidates,
+			refreshRuntimeSet,
+			refreshRuntimeSetForSource,
+			registerAutoCssSource,
+			rememberCompilationScope,
+			resolveGulpStyleOutputExtension,
+			resolveGulpTransformTimingDetails,
+			resolveModuleGraphOptions,
+			resolveWxmlHandlerOptions,
+			resolveWxssFileHandlerOptions,
+			resolveWxssUserHandlerOptions,
+			runtimeState
+		}),
+		beginCompilerShadowRun: () => beginCompilerShadowRun(runtimeState),
+		completeCompilerShadowRun: (revision) => finalizeCompilerShadowRun(runtimeState, { revision }),
+		async dispose() {
+			await disposeCompilerOwner(runtimeState);
+			await bundleRuntimeClassSetManager.reset();
+		},
+		getCompilerShadowRunSnapshot: () => getCompilerShadowRunSnapshot(runtimeState),
+		watchChange
+	};
 }
 //#endregion
 //#region src/bundlers/gulp/frameworks/native/index.ts

package/dist/gulp.cjs

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

package/dist/gulp.d.ts

@@ -1,4 +1,4 @@
-export * from './bundlers/gulp/index';
-export { createPlugins as WeappTailwindcss } from './bundlers/gulp/index';
-export { createPlugins as weappTailwindcss } from './bundlers/gulp/index';
-export type { UserDefinedOptions } from './types';
+export * from './bundlers/gulp/index.js';
+export { createPlugins as WeappTailwindcss } from './bundlers/gulp/index.js';
+export { createPlugins as weappTailwindcss } from './bundlers/gulp/index.js';
+export type { UserDefinedOptions } from './types/index.js';

package/dist/gulp.js

@@ -1,5 +1,2 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_gulp = require("./gulp-Q1wITegn.js");
-exports.WeappTailwindcss = require_gulp.createPlugins;
-exports.createPlugins = require_gulp.createPlugins;
-exports.weappTailwindcss = require_gulp.createPlugins;
+import { t as createPlugins } from "./gulp-DNXQvDUw.js";
+export { createPlugins as WeappTailwindcss, createPlugins, createPlugins as weappTailwindcss };