weapp-tailwindcss 5.1.0 → 5.1.1

package/dist/{tailwindcss-DHIYcqXT.js → tailwindcss-dbrbY4cd.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-D4ubP7N5.js");
+const require_v4_engine = require("./v4-engine-ON_oSLfO.js");
 require("./utils-BCa37Wqj.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -495,12 +495,14 @@ async function resolveViteSourceScanEntries(options, runtime, scanOptions = {})
 		}
 	}
 	const cssSourceInlineCandidates = mergeTailwindInlineSourceCandidates(cssInlineCandidates);
-	const cssSourceScanEntries = createMergedCssEntrySourceScanEntries(entries, { sourceCount: (sourceOptions.cssSources?.length ?? 0) + configuredCssSources.length });
-	if (cssSourceScanEntries.length > 0 || cssSourceInlineCandidates || explicit || sourceOptions.cssSources?.length || configuredCssSources.length > 0) return createResolvedViteSourceScan({
+	const cssSourceCount = (sourceOptions.cssSources?.length ?? 0) + configuredCssSources.length;
+	const cssSourceScanEntries = createMergedCssEntrySourceScanEntries(entries, { sourceCount: cssSourceCount });
+	if (cssSourceScanEntries.length > 0 || cssSourceInlineCandidates || explicit) return createResolvedViteSourceScan({
 		entries: explicit ? cssSourceScanEntries : cssSourceScanEntries.length > 0 ? cssSourceScanEntries : void 0,
 		explicit,
 		inlineCandidates: cssSourceInlineCandidates
 	}, dependencies);
+	if (cssSourceCount > 0) return;
 	const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
 	addSourceScanDependency(dependencies, source.file);
 	addSourceScanDependencies(dependencies, source.dependencies);
@@ -944,9 +946,12 @@ function createEngineTailwindcssRuntime(options) {
 	}
 	async function collectClassSet() {
 		const report = await collectContentTokens();
-		const candidates = new Set(report.entries.map((entry) => {
+		const rawCandidates = new Set(report.entries.map((entry) => {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
+		const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
+		const designSystem = await (0, _tailwindcss_mangle_engine.loadTailwindV4DesignSystem)(source);
+		const candidates = new Set((0, _tailwindcss_mangle_engine.resolveValidTailwindV4Candidates)(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}
@@ -972,12 +977,12 @@ function createEngineTailwindcssRuntime(options) {
 			baseFallbacks: source.baseFallbacks,
 			css: source.css,
 			cwd: source.projectRoot,
-			sources: source.sources
+			...source.sources === void 0 ? {} : { sources: source.sources }
 		});
 		return {
 			entries: report.entries,
 			filesScanned: report.filesScanned,
-			sources: source.sources,
+			sources: source.sources ?? [],
 			skippedFiles: report.skippedFiles
 		};
 	}

package/dist/{transform-tExdt40m.mjs → transform-fRBeuuK-.mjs}

@@ -1,4 +1,4 @@
-import { d as _defineProperty, f as isClassContextLiteralPath, l as analyzeSource, m as babelParse, o as generateCode, p as replaceWxml, s as createAttributeMatcher, u as JsTokenUpdater } from "./context-Mbzkek1q.mjs";
+import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-DlpKD7aN.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";

package/dist/{transform-CQVOgmzM.js → transform-vLwZpiTE.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_context = require("./context-BHxLe743.js");
+const require_context = require("./context-B6hVF7dr.js");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let magic_string = require("magic-string");
 magic_string = require_chunk.__toESM(magic_string);

package/dist/types/user-defined-options/matcher.d.ts

@@ -1,8 +1,15 @@
+import type { ItemOrItemArray } from '../base';
 import type { AppType } from '../shared';
+export type TransformRule = string | RegExp | ((id: string) => boolean);
+export interface TransformOptions {
+    include?: ItemOrItemArray<TransformRule> | undefined;
+    exclude?: ItemOrItemArray<TransformRule> | undefined;
+}
 export interface UserDefinedOptionsMatcherPart {
     htmlMatcher?: ((name: string) => boolean) | undefined;
     cssMatcher?: ((name: string) => boolean) | undefined;
     jsMatcher?: ((name: string) => boolean) | undefined;
+    transform?: TransformOptions | undefined;
     mainCssChunkMatcher?: ((name: string, appType?: AppType) => boolean) | undefined;
     wxsMatcher?: ((name: string) => boolean) | undefined;
     inlineWxs?: boolean | undefined;

package/dist/{v4-engine-CF9zt4Cw.mjs → v4-engine-C3qSwQ-e.mjs}

@@ -3,7 +3,7 @@ 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 } from "@tailwindcss-mangle/engine";
+import { createTailwindV4Engine, extractRawCandidates, loadTailwindV4DesignSystem, resolveProjectSourceFiles, resolveTailwindV4Source, resolveValidTailwindV4Candidates as resolveValidTailwindV4Candidates$1 } from "@tailwindcss-mangle/engine";
 import { createStyleHandler, normalizeTailwindcssWebRpxDeclarations, postcss, protectDynamicColorMixAlpha, pruneMiniProgramGeneratedCss } from "@weapp-tailwindcss/postcss";
 import { LRUCache } from "lru-cache";
 import { stat } from "node:fs/promises";
@@ -1151,12 +1151,8 @@ function resolveTargetCandidates(candidates, target) {
 	const collected = collectCandidates(candidates);
 	return target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(collected) : collected;
 }
-function collectSeenCandidates(generated, requestedCandidates) {
-	return new Set([
-		...requestedCandidates,
-		...generated.rawCandidates,
-		...generated.classSet
-	]);
+function collectSeenCandidates(generated) {
+	return new Set(generated.classSet);
 }
 function shouldDelegateWebSourceScanToTailwind(target, scanSources) {
 	return target === "web" && scanSources !== false;
@@ -1208,7 +1204,7 @@ function seedIncrementalGenerateCache(options) {
 	const customPropertyValues = collectCustomPropertyValues(options.compatibleSource.css);
 	mergeCustomPropertyValues(customPropertyValues, options.generated.css);
 	incrementalGenerateCache.set(cacheKey, {
-		seenCandidates: collectSeenCandidates(options.generated, options.requestedCandidates),
+		seenCandidates: collectSeenCandidates(options.generated),
 		classSet: new Set(options.generated.classSet),
 		css: options.generated.css,
 		rawCss: options.generated.rawCss,
@@ -1828,22 +1824,6 @@ function hasTailwindNonRootGenerationDirectives(rawSource, options = {}) {
 		return GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource) || /@(?:apply|config|custom-variant|plugin|source|theme|utility|variant)\b/.test(rawSource);
 	}
 }
-function hasTailwindRootImportDirectives(rawSource, options = {}) {
-	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
-	try {
-		const root = postcss.parse(rawSource);
-		let found = false;
-		root.walkAtRules((node) => {
-			if (isTailwindImportAtRule(node, options)) {
-				found = true;
-				return false;
-			}
-		});
-		return found;
-	} catch {
-		return extractTailwindDirectiveLines(rawSource, options).some((line) => /@(?:import|use|forward)\b/.test(line));
-	}
-}
 function hasTailwindRootDirectives(rawSource, options = {}) {
 	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
 	try {
@@ -2322,9 +2302,9 @@ function normalizeTailwindV4SourceOptions(options) {
 	if (css === options.css && cssSources === options.cssSources && cssEntries === options.cssEntries) return options;
 	return {
 		...options,
-		css,
+		...css === void 0 ? {} : { css },
 		...cssEntries === void 0 ? {} : { cssEntries },
-		cssSources
+		...cssSources === void 0 ? {} : { cssSources }
 	};
 }
 function resolveTailwindCssImportTarget(runtime) {
@@ -2393,4 +2373,4 @@ async function resolveTailwindV4SourceFromRuntime(runtime) {
 	return resolveTailwindV4Source$1(resolveTailwindV4SourceOptionsFromRuntime(runtime));
 }
 //#endregion
-export { isFileMatchedByTailwindSourceEntries as $, removeTailwindSourceDirectives as A, stripGeneratorPlaceholderMarkers as B, hasTailwindRootDirectives as C, normalizeTailwindSourceDirectives as D, normalizeTailwindConfigDirectives as E, hasTailwindGeneratedCss as F, createTailwindV4Engine$1 as G, stripTailwindBanners as H, hasTailwindGeneratedCssMarkers as I, transformTailwindV4CssToWeapp as J, getTailwindV4IncrementalGenerateCacheStats as K, splitGeneratorPlaceholderCssBySourceOrder as L, GENERATOR_PLACEHOLDER_MARKER_RE as M, VITE_MARKER_RE as N, normalizeTailwindSourceForGenerator as O, createCssAppend as P, expandTailwindSourceEntries as Q, splitTailwindGeneratedCssByBanner as R, hasTailwindNonRootGenerationDirectives as S, hasTailwindSourceDirectives as T, normalizeConfigDirective as U, stripTailwindBanner as V, prependConfigDirective as W, FULL_SOURCE_SCAN_PATTERN as X, FULL_SOURCE_SCAN_EXTENSION_RE as Y, createTailwindSourceEntryMatcher as Z, resolveTailwindcssOptions as _, filterTailwindV4CssSourceRoots as a, toPosixPath as at, hasLocalCssImport as b, groupCssEntriesByBase as c, omitUndefined as ct, normalizeCssEntries as d, normalizeLegacyContentEntries as et, findNearestPackageRoot as f, normalizeTailwindcssRuntimeOptions as g, normalizeExtendLengthUnits as h, resolveTailwindV4SourceOptionsFromRuntime as i, resolveTailwindV4CssSourceBase as it, resolveCssEntrySource as j, parseImportRequest as k, guessBasedirFromEntries as l, inferGeneratorTargetFromEnv as lt, findWorkspaceRoot as m, resolveTailwindV4SourceFromRuntime as n, resolveCssSourceEntries as nt, hasConfiguredTailwindV4CssRoots as o, collectCssInlineSourceCandidates as ot, findWorkspacePackageDir as p, transformTailwindV4CssByTarget as q, resolveTailwindV4SourceFromRuntimeOptions as r, resolveSourceScanPath as rt, upsertTailwindV4CssSource as s, filterUnsupportedMiniProgramTailwindV4Candidates as st, resolveTailwindV4Source$1 as t, parseConfigParam as tt, isTailwindV4CssEntry as u, loadTailwindV4DesignSystem as ut, normalizeStringListOption as v, hasTailwindRootImportDirectives as w, hasTailwindApplyDirective as x, resolveBooleanObjectOption as y, splitTailwindV4GeneratedCssBySourceOrder as z };
+export { normalizeLegacyContentEntries as $, resolveCssEntrySource as A, stripTailwindBanner as B, hasTailwindRootDirectives as C, normalizeTailwindSourceForGenerator as D, normalizeTailwindSourceDirectives as E, hasTailwindGeneratedCssMarkers as F, getTailwindV4IncrementalGenerateCacheStats as G, normalizeConfigDirective as H, splitGeneratorPlaceholderCssBySourceOrder as I, FULL_SOURCE_SCAN_EXTENSION_RE as J, transformTailwindV4CssByTarget as K, splitTailwindGeneratedCssByBanner as L, VITE_MARKER_RE as M, createCssAppend as N, parseImportRequest as O, hasTailwindGeneratedCss as P, isFileMatchedByTailwindSourceEntries as Q, splitTailwindV4GeneratedCssBySourceOrder as R, hasTailwindNonRootGenerationDirectives as S, normalizeTailwindConfigDirectives as T, prependConfigDirective as U, stripTailwindBanners as V, createTailwindV4Engine$1 as W, createTailwindSourceEntryMatcher as X, FULL_SOURCE_SCAN_PATTERN as Y, expandTailwindSourceEntries as Z, resolveTailwindcssOptions as _, filterTailwindV4CssSourceRoots as a, collectCssInlineSourceCandidates as at, hasLocalCssImport as b, groupCssEntriesByBase as c, inferGeneratorTargetFromEnv as ct, normalizeCssEntries as d, parseConfigParam as et, findNearestPackageRoot as f, normalizeTailwindcssRuntimeOptions as g, normalizeExtendLengthUnits as h, resolveTailwindV4SourceOptionsFromRuntime as i, toPosixPath as it, GENERATOR_PLACEHOLDER_MARKER_RE as j, removeTailwindSourceDirectives as k, guessBasedirFromEntries as l, loadTailwindV4DesignSystem as lt, findWorkspaceRoot as m, resolveTailwindV4SourceFromRuntime as n, resolveSourceScanPath as nt, hasConfiguredTailwindV4CssRoots as o, filterUnsupportedMiniProgramTailwindV4Candidates as ot, findWorkspacePackageDir as p, transformTailwindV4CssToWeapp as q, resolveTailwindV4SourceFromRuntimeOptions as r, resolveTailwindV4CssSourceBase as rt, upsertTailwindV4CssSource as s, omitUndefined as st, resolveTailwindV4Source$1 as t, resolveCssSourceEntries as tt, isTailwindV4CssEntry as u, resolveValidTailwindV4Candidates$1 as ut, normalizeStringListOption as v, hasTailwindSourceDirectives as w, hasTailwindApplyDirective as x, resolveBooleanObjectOption as y, stripGeneratorPlaceholderMarkers as z };

package/dist/{v4-engine-D4ubP7N5.js → v4-engine-ON_oSLfO.js}

@@ -1156,12 +1156,8 @@ function resolveTargetCandidates(candidates, target) {
 	const collected = collectCandidates(candidates);
 	return target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(collected) : collected;
 }
-function collectSeenCandidates(generated, requestedCandidates) {
-	return new Set([
-		...requestedCandidates,
-		...generated.rawCandidates,
-		...generated.classSet
-	]);
+function collectSeenCandidates(generated) {
+	return new Set(generated.classSet);
 }
 function shouldDelegateWebSourceScanToTailwind(target, scanSources) {
 	return target === "web" && scanSources !== false;
@@ -1213,7 +1209,7 @@ function seedIncrementalGenerateCache(options) {
 	const customPropertyValues = collectCustomPropertyValues(options.compatibleSource.css);
 	mergeCustomPropertyValues(customPropertyValues, options.generated.css);
 	incrementalGenerateCache.set(cacheKey, {
-		seenCandidates: collectSeenCandidates(options.generated, options.requestedCandidates),
+		seenCandidates: collectSeenCandidates(options.generated),
 		classSet: new Set(options.generated.classSet),
 		css: options.generated.css,
 		rawCss: options.generated.rawCss,
@@ -1833,22 +1829,6 @@ function hasTailwindNonRootGenerationDirectives(rawSource, options = {}) {
 		return GENERATOR_PLACEHOLDER_MARKER_RE.test(rawSource) || /@(?:apply|config|custom-variant|plugin|source|theme|utility|variant)\b/.test(rawSource);
 	}
 }
-function hasTailwindRootImportDirectives(rawSource, options = {}) {
-	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
-	try {
-		const root = _weapp_tailwindcss_postcss.postcss.parse(rawSource);
-		let found = false;
-		root.walkAtRules((node) => {
-			if (isTailwindImportAtRule(node, options)) {
-				found = true;
-				return false;
-			}
-		});
-		return found;
-	} catch {
-		return extractTailwindDirectiveLines(rawSource, options).some((line) => /@(?:import|use|forward)\b/.test(line));
-	}
-}
 function hasTailwindRootDirectives(rawSource, options = {}) {
 	if (!TAILWIND_ROOT_DIRECTIVE_RE.test(rawSource) && !(options.importFallback && rawSource.includes("weapp-tailwindcss"))) return false;
 	try {
@@ -2327,9 +2307,9 @@ function normalizeTailwindV4SourceOptions(options) {
 	if (css === options.css && cssSources === options.cssSources && cssEntries === options.cssEntries) return options;
 	return {
 		...options,
-		css,
+		...css === void 0 ? {} : { css },
 		...cssEntries === void 0 ? {} : { cssEntries },
-		cssSources
+		...cssSources === void 0 ? {} : { cssSources }
 	};
 }
 function resolveTailwindCssImportTarget(runtime) {
@@ -2542,12 +2522,6 @@ Object.defineProperty(exports, "hasTailwindRootDirectives", {
 		return hasTailwindRootDirectives;
 	}
 });
-Object.defineProperty(exports, "hasTailwindRootImportDirectives", {
-	enumerable: true,
-	get: function() {
-		return hasTailwindRootImportDirectives;
-	}
-});
 Object.defineProperty(exports, "hasTailwindSourceDirectives", {
 	enumerable: true,
 	get: function() {