weapp-tailwindcss 5.1.16 → 5.2.0

package/dist/{generator-B91GhUJQ.js → generator-C8D5cnbe.cjs}

@@ -1,21 +1,21 @@
-const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_framework = require("./framework.js");
-require("./auto-DtU6f3X6.js");
-const require_object = require("./object-COs_Mw6p.js");
-require("./utils-CuKLf1Zv.js");
+const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
+const require_framework = require("./framework.cjs");
+require("./auto-DtU6f3X6.cjs");
+const require_object = require("./object-C_Vr6_S5.cjs");
+require("./utils-CuKLf1Zv.cjs");
 let node_fs = require("node:fs");
-node_fs = require_rolldown_runtime.__toESM(node_fs);
+node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
 let node_path = require("node:path");
-node_path = require_rolldown_runtime.__toESM(node_path);
+node_path = require_rolldown_runtime.__toESM(node_path, 1);
 let node_process = require("node:process");
-node_process = require_rolldown_runtime.__toESM(node_process);
+node_process = require_rolldown_runtime.__toESM(node_process, 1);
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let lru_cache = require("lru-cache");
 let node_module = require("node:module");
 let node_fs_promises = require("node:fs/promises");
 let micromatch = require("micromatch");
-micromatch = require_rolldown_runtime.__toESM(micromatch);
+micromatch = require_rolldown_runtime.__toESM(micromatch, 1);
 //#region src/runtime-branch/generator-target-env.ts
 const explicitGeneratorTargetEnvKeys = ["WEAPP_TW_TARGET", "WEAPP_TAILWINDCSS_TARGET"];
 const uniWebPlatformEnvKeys = ["UNI_PLATFORM", "UNI_UTS_PLATFORM"];
@@ -136,13 +136,18 @@ function createDependencyFingerprint(files) {
 		}
 	}).join("|");
 }
-function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+function createTailwindV4SourceCacheKey(source) {
 	return [
 		source.projectRoot,
 		source.base,
 		createStableJson(source.baseFallbacks),
 		source.css,
-		createDependencyFingerprint(source.dependencies),
+		createDependencyFingerprint(source.dependencies)
+	].join("\0");
+}
+function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+	return [
+		createTailwindV4SourceCacheKey(source),
 		target,
 		createStableJson(styleOptions)
 	].join("\0");
@@ -179,9 +184,6 @@ function resolveTargetCandidates(candidates, target) {
 function collectSeenCandidates(generated) {
 	return new Set(generated.classSet);
 }
-function shouldDelegateWebSourceScanToTailwind(target, scanSources) {
-	return target === "web" && scanSources !== false;
-}
 function createIncrementalStyleOptions(styleOptions) {
 	return {
 		...styleOptions,
@@ -252,9 +254,6 @@ function normalizeTargetRpxLengthCandidates(candidates, target, styleOptions) {
 		restoreCandidates: /* @__PURE__ */ new Map()
 	};
 }
-function resolveGeneratedSourcePatterns(generatedSources, scanSources) {
-	return Array.isArray(scanSources) ? scanSources : generatedSources;
-}
 //#endregion
 //#region src/tailwindcss/v4-engine/generator/cache-stats.ts
 function getTailwindV4IncrementalGenerateCacheStats() {
@@ -304,7 +303,9 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(normalizeTailwindV4GeneratedUrlValues((0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(options) ? await (0, _weapp_tailwindcss_postcss.transformCssMacroCss)(css, options) : css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
+	const compatibleCss = normalizeTailwindV4GeneratedUrlValues((0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(options) ? await (0, _weapp_tailwindcss_postcss.transformCssMacroCss)(css, options) : css);
+	const customPropertyValues = options?.customPropertyValues;
+	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(compatibleCss, { customPropertyValues });
 	const result = await defaultStyleHandler(protectedCss.css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
@@ -313,6 +314,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 		...options
 	});
 	const pruneOptions = {
+		preserveContentInit: options?.uniAppX === true && options.uniAppXCssTarget === "uvue" ? false : void 0,
 		preservePreflight: true,
 		preserveConditionalComments: (0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(options)
 	};
@@ -822,6 +824,55 @@ function createCompatibleSource(source, target) {
 	};
 }
 //#endregion
+//#region src/tailwindcss/v4-engine/generator/native-session.ts
+var TailwindV4NativeSessionPool = class {
+	constructor(createSession = _tailwindcss_mangle_engine.createTailwindGenerationSession) {
+		this.createSession = createSession;
+		require_object._defineProperty(this, "sessions", /* @__PURE__ */ new Map());
+		require_object._defineProperty(this, "disposed", false);
+	}
+	generate(target, sourceKey, source, request) {
+		const entry = this.getSession(target, sourceKey, source);
+		const generated = entry.pending.then(() => entry.session.generate(request));
+		entry.pending = generated.then(() => void 0, () => void 0);
+		return generated;
+	}
+	dispose() {
+		for (const entry of this.sessions.values()) this.disposeEntry(entry);
+		this.sessions.clear();
+		this.disposed = true;
+	}
+	get size() {
+		return this.sessions.size;
+	}
+	getSession(target, sourceKey, source) {
+		if (this.disposed) throw new Error("TailwindV4NativeSessionPool 已释放。");
+		const cached = this.sessions.get(target);
+		if (cached?.sourceKey === sourceKey) return cached;
+		if (cached) this.disposeEntry(cached);
+		const session = this.createSession(source);
+		const entry = {
+			pending: Promise.resolve(),
+			session,
+			sourceKey
+		};
+		this.sessions.set(target, entry);
+		return entry;
+	}
+	disposeEntry(entry) {
+		entry.pending.then(() => entry.session.dispose());
+	}
+};
+function createEngineSourceEntries(sources, sourceId) {
+	return sources.map((source, index) => ({
+		id: `${sourceId}:candidate-source:${index}`,
+		...source
+	}));
+}
+function serializeTailwindGenerationArtifact(artifact) {
+	return [...artifact.fragments].sort((left, right) => left.order - right.order).map((fragment) => fragment.root.toString()).join("\n");
+}
+//#endregion
 //#region src/tailwindcss/source-scan.ts
 const DEFAULT_SOURCE_SCAN_EXTENSIONS = [
 	"html",
@@ -1182,30 +1233,81 @@ async function resolveScanSources(source, scanSources) {
 	if (scanSources !== true) return scanSources;
 	return await resolveCssDefinedScanSources(source) ?? false;
 }
+function resolveCompiledSourceRoot(source) {
+	let root = null;
+	try {
+		_weapp_tailwindcss_postcss.postcss.parse(source.css).walkAtRules("import", (rule) => {
+			if (!isTailwindCssImport(rule.params)) return;
+			const sourceParam = parseImportSourceParam(rule.params);
+			if (sourceParam?.none) {
+				root = "none";
+				return false;
+			}
+			if (sourceParam?.sourcePath) {
+				root = {
+					base: source.base,
+					pattern: sourceParam.sourcePath
+				};
+				return false;
+			}
+		});
+	} catch {}
+	return root;
+}
 //#endregion
 //#region src/tailwindcss/v4-engine/generator/engine.ts
+function isCssSyntaxError(error) {
+	return error instanceof Error && error.name === "CssSyntaxError";
+}
 function createTailwindV4Engine(source) {
+	const generationSessions = new TailwindV4NativeSessionPool();
+	const incrementalCacheKeys = /* @__PURE__ */ new Set();
+	const validationEngine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(source);
 	async function generateOnce(generateSource, options = {}) {
 		const { scanSources = true, styleOptions, target = "weapp", ...patchOptions } = options;
 		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const engine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target));
+		const compatibleSource = createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target);
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
-		const delegateSourceScan = shouldDelegateWebSourceScanToTailwind(target, resolvedScanSources);
-		const filesystemCandidates = !delegateSourceScan && Array.isArray(resolvedScanSources) ? new Set(await (0, _tailwindcss_mangle_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
+		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, _tailwindcss_mangle_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
 		const normalizedCandidates = normalizeTargetRpxLengthCandidates(resolveTargetCandidates(/* @__PURE__ */ new Set([...collectCandidates(patchOptions.candidates), ...filesystemCandidates ?? []]), target), target, resolvedStyleOptions);
-		const result = await engine.generate(require_object.omitUndefined({
-			scanSources: delegateSourceScan ? resolvedScanSources : false,
-			...patchOptions,
+		const sourceId = compatibleSource.dependencies[0] ?? compatibleSource.base;
+		const generationRequest = {
+			...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
+			...patchOptions.sources === void 0 ? {} : { sourceEntries: createEngineSourceEntries(patchOptions.sources, sourceId) },
 			candidates: normalizedCandidates.candidates
-		}));
-		const sources = resolveGeneratedSourcePatterns(result.sources, resolvedScanSources);
-		const rawCss = restoreRpxLengthCssSelectors(result.css, normalizedCandidates.restoreCandidates);
+		};
+		let generatedCss;
+		let classSet;
+		let rawCandidates;
+		let dependencies;
+		try {
+			const artifact = await generationSessions.generate(target, createTailwindV4SourceCacheKey(compatibleSource), compatibleSource, generationRequest);
+			generatedCss = serializeTailwindGenerationArtifact(artifact);
+			classSet = artifact.classSet;
+			rawCandidates = artifact.rawCandidates;
+			dependencies = artifact.dependencies;
+		} catch (error) {
+			if (!isCssSyntaxError(error)) throw error;
+			const legacyResult = await (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(compatibleSource).generate({
+				...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
+				...patchOptions.sources === void 0 ? {} : { sources: patchOptions.sources },
+				candidates: normalizedCandidates.candidates,
+				scanSources: false
+			});
+			generatedCss = legacyResult.css;
+			classSet = legacyResult.classSet;
+			rawCandidates = legacyResult.rawCandidates;
+			dependencies = legacyResult.dependencies;
+		}
+		const sources = Array.isArray(resolvedScanSources) ? resolvedScanSources : [];
+		const rawCss = restoreRpxLengthCssSelectors(generatedCss, normalizedCandidates.restoreCandidates);
 		const css = await transformTailwindV4CssByTarget(rawCss, target, resolvedStyleOptions);
 		return {
-			...result,
+			classSet: restoreRpxLengthCandidates(classSet, normalizedCandidates.restoreCandidates),
+			rawCandidates: restoreRpxLengthCandidates(rawCandidates, normalizedCandidates.restoreCandidates),
+			dependencies,
+			root: resolveCompiledSourceRoot(compatibleSource),
 			sources,
-			classSet: restoreRpxLengthCandidates(result.classSet, normalizedCandidates.restoreCandidates),
-			rawCandidates: restoreRpxLengthCandidates(result.rawCandidates, normalizedCandidates.restoreCandidates),
 			css,
 			rawCss,
 			target
@@ -1219,6 +1321,7 @@ function createTailwindV4Engine(source) {
 		const styleOptions = resolveStyleOptions(source, options.styleOptions);
 		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(cssMacroSource, options);
 		const cacheKey = createIncrementalGenerateCacheKey(compatibleSource, target, styleOptions);
+		incrementalCacheKeys.add(cacheKey);
 		if (options.scanSources === true) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
 			const generated = await generateOnce(cssMacroSource, options);
 			if (!seedIncrementalGenerateCache({
@@ -1323,9 +1426,14 @@ function createTailwindV4Engine(source) {
 	}
 	return {
 		source,
-		loadDesignSystem: (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(source).loadDesignSystem,
-		validateCandidates: (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(source).validateCandidates,
-		generate
+		loadDesignSystem: validationEngine.loadDesignSystem,
+		validateCandidates: validationEngine.validateCandidates,
+		generate,
+		dispose() {
+			generationSessions.dispose();
+			for (const cacheKey of incrementalCacheKeys) incrementalGenerateCache.delete(cacheKey);
+			incrementalCacheKeys.clear();
+		}
 	};
 }
 //#endregion
@@ -2694,6 +2802,23 @@ function upsertTailwindV4CssSource(opts, source) {
 	};
 	return true;
 }
+function removeTailwindV4CssSource(opts, file) {
+	const tailwindcss = opts.tailwindcss;
+	const v4 = tailwindcss?.v4;
+	const cssSources = v4?.cssSources;
+	if (!cssSources || cssSources.length === 0) return false;
+	const sourceFile = normalizeCssSourceFile(file);
+	const nextCssSources = cssSources.filter((source) => normalizeCssSourceFile(source.file) !== sourceFile);
+	if (nextCssSources.length === cssSources.length) return false;
+	opts.tailwindcss = {
+		...tailwindcss,
+		v4: {
+			...v4,
+			cssSources: nextCssSources
+		}
+	};
+	return true;
+}
 //#endregion
 //#region src/tailwindcss/v4-engine/source.ts
 const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
@@ -3363,6 +3488,12 @@ Object.defineProperty(exports, "removeTailwindSourceDirectives", {
 		return removeTailwindSourceDirectives;
 	}
 });
+Object.defineProperty(exports, "removeTailwindV4CssSource", {
+	enumerable: true,
+	get: function() {
+		return removeTailwindV4CssSource;
+	}
+});
 Object.defineProperty(exports, "removeTailwindV4GeneratedUserCssArtifacts", {
 	enumerable: true,
 	get: function() {

package/dist/{generator-Bv7myuhY.mjs → generator-CDdzqf1S.js}

@@ -1,12 +1,12 @@
-import { resolveUniUtsPlatform as resolveUniUtsPlatform$1 } from "./framework.mjs";
-import { c as withCssMacroStyleOptions, i as hasCssMacroTailwindV4Source, o as transformCssMacroCss, s as transformCssMacroTailwindV4Source, t as hasCssMacroStyleOptions } from "./auto-2dg_uhEJ.mjs";
-import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
-import "./utils-MVwpU07P.mjs";
+import { resolveUniUtsPlatform as resolveUniUtsPlatform$1 } from "./framework.js";
+import { c as withCssMacroStyleOptions, i as hasCssMacroTailwindV4Source, o as transformCssMacroCss, s as transformCssMacroTailwindV4Source, t as hasCssMacroStyleOptions } from "./auto-2dg_uhEJ.js";
+import { n as _defineProperty, t as omitUndefined } from "./object-Bvy6-w9r.js";
+import "./utils-MVwpU07P.js";
 import { createRequire } from "node:module";
 import fs, { existsSync, readFileSync, readdirSync, realpathSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
-import { createTailwindV4Engine, extractRawCandidates, loadTailwindV4DesignSystem, resolveProjectSourceFiles, resolveTailwindV4Source, resolveValidTailwindV4Candidates as resolveValidTailwindV4Candidates$1 } from "@tailwindcss-mangle/engine";
+import { createTailwindGenerationSession, createTailwindV4Engine, extractRawCandidates, loadTailwindV4DesignSystem, resolveProjectSourceFiles, resolveTailwindV4Source, resolveValidTailwindV4Candidates as resolveValidTailwindV4Candidates$1 } from "@tailwindcss-mangle/engine";
 import { analyzeTailwindCssDirectives, createStyleHandler, filterExistingCssRules, finalizeMiniProgramCss, hasMiniProgramCssSpecificityPlaceholders, isTailwindCssGenerationDirective, isTailwindCssImportAtRule, isTailwindCssPackageJsonImportRequest, normalizeTailwindCssImportRequest, normalizeTailwindcssWebRpxDeclarations, parseTailwindCssConfigRequest, parseTailwindCssDirectiveRequest, postcss, protectDynamicColorMixAlpha, pruneMiniProgramGeneratedCss, pruneMiniProgramGeneratedCss as pruneMiniProgramGeneratedCss$1, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, stripMiniProgramCssSpecificityPlaceholders } from "@weapp-tailwindcss/postcss";
 import { LRUCache } from "lru-cache";
 import { stat } from "node:fs/promises";
@@ -131,13 +131,18 @@ function createDependencyFingerprint(files) {
 		}
 	}).join("|");
 }
-function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+function createTailwindV4SourceCacheKey(source) {
 	return [
 		source.projectRoot,
 		source.base,
 		createStableJson(source.baseFallbacks),
 		source.css,
-		createDependencyFingerprint(source.dependencies),
+		createDependencyFingerprint(source.dependencies)
+	].join("\0");
+}
+function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+	return [
+		createTailwindV4SourceCacheKey(source),
 		target,
 		createStableJson(styleOptions)
 	].join("\0");
@@ -174,9 +179,6 @@ function resolveTargetCandidates(candidates, target) {
 function collectSeenCandidates(generated) {
 	return new Set(generated.classSet);
 }
-function shouldDelegateWebSourceScanToTailwind(target, scanSources) {
-	return target === "web" && scanSources !== false;
-}
 function createIncrementalStyleOptions(styleOptions) {
 	return {
 		...styleOptions,
@@ -247,9 +249,6 @@ function normalizeTargetRpxLengthCandidates(candidates, target, styleOptions) {
 		restoreCandidates: /* @__PURE__ */ new Map()
 	};
 }
-function resolveGeneratedSourcePatterns(generatedSources, scanSources) {
-	return Array.isArray(scanSources) ? scanSources : generatedSources;
-}
 //#endregion
 //#region src/tailwindcss/v4-engine/generator/cache-stats.ts
 function getTailwindV4IncrementalGenerateCacheStats() {
@@ -299,7 +298,9 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	const protectedCss = protectDynamicColorMixAlpha(normalizeTailwindV4GeneratedUrlValues(hasCssMacroStyleOptions(options) ? await transformCssMacroCss(css, options) : css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
+	const compatibleCss = normalizeTailwindV4GeneratedUrlValues(hasCssMacroStyleOptions(options) ? await transformCssMacroCss(css, options) : css);
+	const customPropertyValues = options?.customPropertyValues;
+	const protectedCss = protectDynamicColorMixAlpha(compatibleCss, { customPropertyValues });
 	const result = await defaultStyleHandler(protectedCss.css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
@@ -308,6 +309,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 		...options
 	});
 	const pruneOptions = {
+		preserveContentInit: options?.uniAppX === true && options.uniAppXCssTarget === "uvue" ? false : void 0,
 		preservePreflight: true,
 		preserveConditionalComments: hasCssMacroStyleOptions(options)
 	};
@@ -817,6 +819,55 @@ function createCompatibleSource(source, target) {
 	};
 }
 //#endregion
+//#region src/tailwindcss/v4-engine/generator/native-session.ts
+var TailwindV4NativeSessionPool = class {
+	constructor(createSession = createTailwindGenerationSession) {
+		this.createSession = createSession;
+		_defineProperty(this, "sessions", /* @__PURE__ */ new Map());
+		_defineProperty(this, "disposed", false);
+	}
+	generate(target, sourceKey, source, request) {
+		const entry = this.getSession(target, sourceKey, source);
+		const generated = entry.pending.then(() => entry.session.generate(request));
+		entry.pending = generated.then(() => void 0, () => void 0);
+		return generated;
+	}
+	dispose() {
+		for (const entry of this.sessions.values()) this.disposeEntry(entry);
+		this.sessions.clear();
+		this.disposed = true;
+	}
+	get size() {
+		return this.sessions.size;
+	}
+	getSession(target, sourceKey, source) {
+		if (this.disposed) throw new Error("TailwindV4NativeSessionPool 已释放。");
+		const cached = this.sessions.get(target);
+		if (cached?.sourceKey === sourceKey) return cached;
+		if (cached) this.disposeEntry(cached);
+		const session = this.createSession(source);
+		const entry = {
+			pending: Promise.resolve(),
+			session,
+			sourceKey
+		};
+		this.sessions.set(target, entry);
+		return entry;
+	}
+	disposeEntry(entry) {
+		entry.pending.then(() => entry.session.dispose());
+	}
+};
+function createEngineSourceEntries(sources, sourceId) {
+	return sources.map((source, index) => ({
+		id: `${sourceId}:candidate-source:${index}`,
+		...source
+	}));
+}
+function serializeTailwindGenerationArtifact(artifact) {
+	return [...artifact.fragments].sort((left, right) => left.order - right.order).map((fragment) => fragment.root.toString()).join("\n");
+}
+//#endregion
 //#region src/tailwindcss/source-scan.ts
 const DEFAULT_SOURCE_SCAN_EXTENSIONS = [
 	"html",
@@ -1177,30 +1228,81 @@ async function resolveScanSources(source, scanSources) {
 	if (scanSources !== true) return scanSources;
 	return await resolveCssDefinedScanSources(source) ?? false;
 }
+function resolveCompiledSourceRoot(source) {
+	let root = null;
+	try {
+		postcss.parse(source.css).walkAtRules("import", (rule) => {
+			if (!isTailwindCssImport(rule.params)) return;
+			const sourceParam = parseImportSourceParam(rule.params);
+			if (sourceParam?.none) {
+				root = "none";
+				return false;
+			}
+			if (sourceParam?.sourcePath) {
+				root = {
+					base: source.base,
+					pattern: sourceParam.sourcePath
+				};
+				return false;
+			}
+		});
+	} catch {}
+	return root;
+}
 //#endregion
 //#region src/tailwindcss/v4-engine/generator/engine.ts
+function isCssSyntaxError(error) {
+	return error instanceof Error && error.name === "CssSyntaxError";
+}
 function createTailwindV4Engine$1(source) {
+	const generationSessions = new TailwindV4NativeSessionPool();
+	const incrementalCacheKeys = /* @__PURE__ */ new Set();
+	const validationEngine = createTailwindV4Engine(source);
 	async function generateOnce(generateSource, options = {}) {
 		const { scanSources = true, styleOptions, target = "weapp", ...patchOptions } = options;
 		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const engine = createTailwindV4Engine(createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target));
+		const compatibleSource = createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target);
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
-		const delegateSourceScan = shouldDelegateWebSourceScanToTailwind(target, resolvedScanSources);
-		const filesystemCandidates = !delegateSourceScan && Array.isArray(resolvedScanSources) ? new Set(await extractRawCandidates(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
+		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await extractRawCandidates(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
 		const normalizedCandidates = normalizeTargetRpxLengthCandidates(resolveTargetCandidates(/* @__PURE__ */ new Set([...collectCandidates(patchOptions.candidates), ...filesystemCandidates ?? []]), target), target, resolvedStyleOptions);
-		const result = await engine.generate(omitUndefined({
-			scanSources: delegateSourceScan ? resolvedScanSources : false,
-			...patchOptions,
+		const sourceId = compatibleSource.dependencies[0] ?? compatibleSource.base;
+		const generationRequest = {
+			...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
+			...patchOptions.sources === void 0 ? {} : { sourceEntries: createEngineSourceEntries(patchOptions.sources, sourceId) },
 			candidates: normalizedCandidates.candidates
-		}));
-		const sources = resolveGeneratedSourcePatterns(result.sources, resolvedScanSources);
-		const rawCss = restoreRpxLengthCssSelectors(result.css, normalizedCandidates.restoreCandidates);
+		};
+		let generatedCss;
+		let classSet;
+		let rawCandidates;
+		let dependencies;
+		try {
+			const artifact = await generationSessions.generate(target, createTailwindV4SourceCacheKey(compatibleSource), compatibleSource, generationRequest);
+			generatedCss = serializeTailwindGenerationArtifact(artifact);
+			classSet = artifact.classSet;
+			rawCandidates = artifact.rawCandidates;
+			dependencies = artifact.dependencies;
+		} catch (error) {
+			if (!isCssSyntaxError(error)) throw error;
+			const legacyResult = await createTailwindV4Engine(compatibleSource).generate({
+				...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
+				...patchOptions.sources === void 0 ? {} : { sources: patchOptions.sources },
+				candidates: normalizedCandidates.candidates,
+				scanSources: false
+			});
+			generatedCss = legacyResult.css;
+			classSet = legacyResult.classSet;
+			rawCandidates = legacyResult.rawCandidates;
+			dependencies = legacyResult.dependencies;
+		}
+		const sources = Array.isArray(resolvedScanSources) ? resolvedScanSources : [];
+		const rawCss = restoreRpxLengthCssSelectors(generatedCss, normalizedCandidates.restoreCandidates);
 		const css = await transformTailwindV4CssByTarget(rawCss, target, resolvedStyleOptions);
 		return {
-			...result,
+			classSet: restoreRpxLengthCandidates(classSet, normalizedCandidates.restoreCandidates),
+			rawCandidates: restoreRpxLengthCandidates(rawCandidates, normalizedCandidates.restoreCandidates),
+			dependencies,
+			root: resolveCompiledSourceRoot(compatibleSource),
 			sources,
-			classSet: restoreRpxLengthCandidates(result.classSet, normalizedCandidates.restoreCandidates),
-			rawCandidates: restoreRpxLengthCandidates(result.rawCandidates, normalizedCandidates.restoreCandidates),
 			css,
 			rawCss,
 			target
@@ -1214,6 +1316,7 @@ function createTailwindV4Engine$1(source) {
 		const styleOptions = resolveStyleOptions(source, options.styleOptions);
 		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(cssMacroSource, options);
 		const cacheKey = createIncrementalGenerateCacheKey(compatibleSource, target, styleOptions);
+		incrementalCacheKeys.add(cacheKey);
 		if (options.scanSources === true) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
 			const generated = await generateOnce(cssMacroSource, options);
 			if (!seedIncrementalGenerateCache({
@@ -1318,9 +1421,14 @@ function createTailwindV4Engine$1(source) {
 	}
 	return {
 		source,
-		loadDesignSystem: createTailwindV4Engine(source).loadDesignSystem,
-		validateCandidates: createTailwindV4Engine(source).validateCandidates,
-		generate
+		loadDesignSystem: validationEngine.loadDesignSystem,
+		validateCandidates: validationEngine.validateCandidates,
+		generate,
+		dispose() {
+			generationSessions.dispose();
+			for (const cacheKey of incrementalCacheKeys) incrementalGenerateCache.delete(cacheKey);
+			incrementalCacheKeys.clear();
+		}
 	};
 }
 //#endregion
@@ -2689,6 +2797,23 @@ function upsertTailwindV4CssSource(opts, source) {
 	};
 	return true;
 }
+function removeTailwindV4CssSource(opts, file) {
+	const tailwindcss = opts.tailwindcss;
+	const v4 = tailwindcss?.v4;
+	const cssSources = v4?.cssSources;
+	if (!cssSources || cssSources.length === 0) return false;
+	const sourceFile = normalizeCssSourceFile(file);
+	const nextCssSources = cssSources.filter((source) => normalizeCssSourceFile(source.file) !== sourceFile);
+	if (nextCssSources.length === cssSources.length) return false;
+	opts.tailwindcss = {
+		...tailwindcss,
+		v4: {
+			...v4,
+			cssSources: nextCssSources
+		}
+	};
+	return true;
+}
 //#endregion
 //#region src/tailwindcss/v4-engine/source.ts
 const require = createRequire(import.meta.url);
@@ -3064,4 +3189,4 @@ async function createWeappTailwindcssGeneratorFromRuntime(tailwindRuntime) {
 	return createWeappTailwindcssGenerator(await resolveTailwindSourceFromRuntime(tailwindRuntime));
 }
 //#endregion
-export { normalizeTailwindConfigDirectives as $, isCommentOnlyCss as A, transformTailwindV4CssByTarget as At, removeTailwindV4GeneratedUserCssArtifacts as B, findWorkspaceRoot as C, isFileMatchedByTailwindSourceEntries as Ct, normalizeStringListOption as D, resolveSourceScanPath as Dt, resolveTailwindcssOptions as E, resolveCssSourceEntries as Et, finalizeMiniProgramCss as F, loadTailwindV4DesignSystem as Ft, hasUserCssLayerBlocks as G, normalizeEmptyTailwindCustomVariants as H, hasMiniProgramCssSpecificityPlaceholders as I, resolveValidTailwindV4Candidates$1 as It, hasLocalCssImport as J, splitUserCssLayerBlocks as K, pruneMiniProgramGeneratedCss as L, removeTailwindV4GeneratorAtRules as M, resolveCssMacroTailwindV4Source as Mt, stripTailwindSourceMediaFragments as N, getTailwindV4IncrementalGenerateCacheStats as Nt, resolveBooleanObjectOption as O, resolveTailwindV4CssSourceBase as Ot, stripUnmatchedTailwindSourceMediaCloseFragments as P, filterUnsupportedMiniProgramTailwindV4Candidates as Pt, hasTailwindSourceDirectives as Q, removeUnsupportedMiniProgramAtRules as R, findWorkspacePackageDir as S, expandTailwindSourceEntries as St, normalizeTailwindcssRuntimeOptions as T, parseConfigParam as Tt, shouldFilterApplyOnlyGeneratedCss as U, filterApplyOnlyGeneratedCss as V, extractGeneratedCssForUserLayerSelectors as W, hasTailwindNonRootGenerationDirectives as X, hasTailwindApplyDirective as Y, hasTailwindRootDirectives as Z, groupCssEntriesByBase as _, prependConfigDirective as _t, resolveGeneratorRuntimeBranch as a, GENERATOR_PLACEHOLDER_MARKER_RE as at, normalizeCssEntries as b, FULL_SOURCE_SCAN_PATTERN as bt, shouldUseNativeAppCssBranch as c, hasTailwindGeneratedCss as ct, resolveTailwindV4SourceFromRuntime as d, splitTailwindGeneratedCssByBanner as dt, normalizeTailwindSourceDirectives as et, resolveTailwindV4SourceFromRuntimeOptions as f, splitTailwindV4GeneratedCssBySourceOrder as ft, upsertTailwindV4CssSource as g, normalizeConfigDirective as gt, hasConfiguredTailwindV4CssRoots as h, stripTailwindBanners as ht, normalizeWeappTailwindcssGeneratorOptions as i, resolveCssEntrySource as it, removeMiniProgramHoverSelectors as j, transformTailwindV4CssToWeapp as jt, transformGeneratorUserCss as k, toPosixPath as kt, resolveUniUtsPlatform as l, hasTailwindGeneratedCssMarkers as lt, filterTailwindV4CssSourceRoots as m, stripTailwindBanner as mt, createWeappTailwindcssGeneratorFromRuntime as n, parseImportRequest as nt, resolveRuntimeBranch as o, VITE_MARKER_RE as ot, resolveTailwindV4SourceOptionsFromRuntime as p, stripGeneratorPlaceholderMarkers as pt, preferScopedGeneratedCssRules as q, resolveTailwindSourceFromRuntime as r, removeTailwindSourceDirectives as rt, shouldUseMiniProgramCssBranch as s, createCssAppend as st, createWeappTailwindcssGenerator as t, normalizeTailwindSourceForGenerator as tt, resolveTailwindV4Source$1 as u, splitGeneratorPlaceholderCssBySourceOrder as ut, guessBasedirFromEntries as v, createTailwindV4Engine$1 as vt, normalizeExtendLengthUnits as w, normalizeLegacyContentEntries as wt, findNearestPackageRoot as x, createTailwindSourceEntryMatcher as xt, isTailwindV4CssEntry as y, FULL_SOURCE_SCAN_EXTENSION_RE as yt, stripMiniProgramCssSpecificityPlaceholders as z };
+export { hasTailwindSourceDirectives as $, transformGeneratorUserCss as A, toPosixPath as At, stripMiniProgramCssSpecificityPlaceholders as B, findWorkspacePackageDir as C, expandTailwindSourceEntries as Ct, resolveTailwindcssOptions as D, resolveCssSourceEntries as Dt, normalizeTailwindcssRuntimeOptions as E, parseConfigParam as Et, stripUnmatchedTailwindSourceMediaCloseFragments as F, filterUnsupportedMiniProgramTailwindV4Candidates as Ft, extractGeneratedCssForUserLayerSelectors as G, filterApplyOnlyGeneratedCss as H, finalizeMiniProgramCss as I, loadTailwindV4DesignSystem as It, preferScopedGeneratedCssRules as J, hasUserCssLayerBlocks as K, hasMiniProgramCssSpecificityPlaceholders as L, resolveValidTailwindV4Candidates$1 as Lt, removeMiniProgramHoverSelectors as M, transformTailwindV4CssToWeapp as Mt, removeTailwindV4GeneratorAtRules as N, resolveCssMacroTailwindV4Source as Nt, normalizeStringListOption as O, resolveSourceScanPath as Ot, stripTailwindSourceMediaFragments as P, getTailwindV4IncrementalGenerateCacheStats as Pt, hasTailwindRootDirectives as Q, pruneMiniProgramGeneratedCss as R, findNearestPackageRoot as S, createTailwindSourceEntryMatcher as St, normalizeExtendLengthUnits as T, normalizeLegacyContentEntries as Tt, normalizeEmptyTailwindCustomVariants as U, removeTailwindV4GeneratedUserCssArtifacts as V, shouldFilterApplyOnlyGeneratedCss as W, hasTailwindApplyDirective as X, hasLocalCssImport as Y, hasTailwindNonRootGenerationDirectives as Z, upsertTailwindV4CssSource as _, normalizeConfigDirective as _t, resolveGeneratorRuntimeBranch as a, resolveCssEntrySource as at, isTailwindV4CssEntry as b, FULL_SOURCE_SCAN_EXTENSION_RE as bt, shouldUseNativeAppCssBranch as c, createCssAppend as ct, resolveTailwindV4SourceFromRuntime as d, splitGeneratorPlaceholderCssBySourceOrder as dt, normalizeTailwindConfigDirectives as et, resolveTailwindV4SourceFromRuntimeOptions as f, splitTailwindGeneratedCssByBanner as ft, removeTailwindV4CssSource as g, stripTailwindBanners as gt, hasConfiguredTailwindV4CssRoots as h, stripTailwindBanner as ht, normalizeWeappTailwindcssGeneratorOptions as i, removeTailwindSourceDirectives as it, isCommentOnlyCss as j, transformTailwindV4CssByTarget as jt, resolveBooleanObjectOption as k, resolveTailwindV4CssSourceBase as kt, resolveUniUtsPlatform as l, hasTailwindGeneratedCss as lt, filterTailwindV4CssSourceRoots as m, stripGeneratorPlaceholderMarkers as mt, createWeappTailwindcssGeneratorFromRuntime as n, normalizeTailwindSourceForGenerator as nt, resolveRuntimeBranch as o, GENERATOR_PLACEHOLDER_MARKER_RE as ot, resolveTailwindV4SourceOptionsFromRuntime as p, splitTailwindV4GeneratedCssBySourceOrder as pt, splitUserCssLayerBlocks as q, resolveTailwindSourceFromRuntime as r, parseImportRequest as rt, shouldUseMiniProgramCssBranch as s, VITE_MARKER_RE as st, createWeappTailwindcssGenerator as t, normalizeTailwindSourceDirectives as tt, resolveTailwindV4Source$1 as u, hasTailwindGeneratedCssMarkers as ut, groupCssEntriesByBase as v, prependConfigDirective as vt, findWorkspaceRoot as w, isFileMatchedByTailwindSourceEntries as wt, normalizeCssEntries as x, FULL_SOURCE_SCAN_PATTERN as xt, guessBasedirFromEntries as y, createTailwindV4Engine$1 as yt, removeUnsupportedMiniProgramAtRules as z };

package/dist/generator.cjs

@@ -0,0 +1,12 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_generator = require("./generator-C8D5cnbe.cjs");
+exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
+exports.createWeappTailwindcssGeneratorFromRuntime = require_generator.createWeappTailwindcssGeneratorFromRuntime;
+exports.normalizeWeappTailwindcssGeneratorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions;
+exports.resolveTailwindSourceFromRuntime = require_generator.resolveTailwindSourceFromRuntime;
+exports.resolveTailwindV4Source = require_generator.resolveTailwindV4Source;
+exports.resolveTailwindV4SourceFromRuntime = require_generator.resolveTailwindV4SourceFromRuntime;
+exports.resolveTailwindV4SourceFromRuntimeOptions = require_generator.resolveTailwindV4SourceFromRuntimeOptions;
+exports.resolveTailwindV4SourceOptionsFromRuntime = require_generator.resolveTailwindV4SourceOptionsFromRuntime;
+exports.transformTailwindV4CssByTarget = require_generator.transformTailwindV4CssByTarget;
+exports.transformTailwindV4CssToWeapp = require_generator.transformTailwindV4CssToWeapp;

package/dist/generator.d.ts

@@ -1 +1 @@
-export * from './generator/index'
+export * from './generator/index.js'

package/dist/generator.js

@@ -1,12 +1,2 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-B91GhUJQ.js");
-exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
-exports.createWeappTailwindcssGeneratorFromRuntime = require_generator.createWeappTailwindcssGeneratorFromRuntime;
-exports.normalizeWeappTailwindcssGeneratorOptions = require_generator.normalizeWeappTailwindcssGeneratorOptions;
-exports.resolveTailwindSourceFromRuntime = require_generator.resolveTailwindSourceFromRuntime;
-exports.resolveTailwindV4Source = require_generator.resolveTailwindV4Source;
-exports.resolveTailwindV4SourceFromRuntime = require_generator.resolveTailwindV4SourceFromRuntime;
-exports.resolveTailwindV4SourceFromRuntimeOptions = require_generator.resolveTailwindV4SourceFromRuntimeOptions;
-exports.resolveTailwindV4SourceOptionsFromRuntime = require_generator.resolveTailwindV4SourceOptionsFromRuntime;
-exports.transformTailwindV4CssByTarget = require_generator.transformTailwindV4CssByTarget;
-exports.transformTailwindV4CssToWeapp = require_generator.transformTailwindV4CssToWeapp;
+import { Mt as transformTailwindV4CssToWeapp, d as resolveTailwindV4SourceFromRuntime, f as resolveTailwindV4SourceFromRuntimeOptions, i as normalizeWeappTailwindcssGeneratorOptions, jt as transformTailwindV4CssByTarget, n as createWeappTailwindcssGeneratorFromRuntime, p as resolveTailwindV4SourceOptionsFromRuntime, r as resolveTailwindSourceFromRuntime, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-CDdzqf1S.js";
+export { createWeappTailwindcssGenerator, createWeappTailwindcssGeneratorFromRuntime, normalizeWeappTailwindcssGeneratorOptions, resolveTailwindSourceFromRuntime, resolveTailwindV4Source, resolveTailwindV4SourceFromRuntime, resolveTailwindV4SourceFromRuntimeOptions, resolveTailwindV4SourceOptionsFromRuntime, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp };