weapp-tailwindcss 5.0.0-next.3 → 5.0.0-next.7

package/dist/{logger-BZ45DZJT.js → tailwindcss-T1U5T-iF.js}

@@ -1,185 +1,15 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_patcher_options = require("./patcher-options-6gJN2EXy.js");
-require("./utils-DmC9_In3.js");
+const require_cache = require("./cache-DPN5yKSX.js");
+require("./utils-VZvGusYs.js");
 let node_module = require("node:module");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
-let tailwindcss_patch = require("tailwindcss-patch");
-let node_fs = require("node:fs");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
-let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
+let node_fs = require("node:fs");
 let node_url = require("node:url");
-//#region src/tailwindcss/runtime/cache.ts
-const runtimeClassSetCache = /* @__PURE__ */ new WeakMap();
-const runtimeFileSignatureCache = /* @__PURE__ */ new Map();
-let runtimeFileSignatureCacheClearTimer;
-const runtimeSignaturePatchersSymbol = Symbol.for("weapp-tailwindcss.runtimeSignaturePatchers");
-function getCacheEntry(twPatcher) {
-	let entry = runtimeClassSetCache.get(twPatcher);
-	if (!entry) {
-		entry = {};
-		runtimeClassSetCache.set(twPatcher, entry);
-	}
-	return entry;
-}
-function scheduleRuntimeConfigSignatureCacheClear() {
-	if (runtimeFileSignatureCacheClearTimer) return;
-	runtimeFileSignatureCacheClearTimer = setTimeout(() => {
-		runtimeFileSignatureCache.clear();
-		runtimeFileSignatureCacheClearTimer = void 0;
-	}, 0);
-	runtimeFileSignatureCacheClearTimer.unref?.();
-}
-function getFileSignature(filePath) {
-	const cached = runtimeFileSignatureCache.get(filePath);
-	if (cached !== void 0) return cached;
-	let signature;
-	try {
-		const stats = (0, node_fs.statSync)(filePath);
-		signature = `${filePath}:${stats.size}:${stats.mtimeMs}`;
-	} catch {
-		signature = `${filePath}:missing`;
-	}
-	runtimeFileSignatureCache.set(filePath, signature);
-	scheduleRuntimeConfigSignatureCacheClear();
-	return signature;
-}
-function getTailwindTrackedFiles(twPatcher) {
-	const tailwindOptions = require_patcher_options.resolveTailwindcssOptions(twPatcher.options);
-	const tracked = /* @__PURE__ */ new Set();
-	const configPath = tailwindOptions?.config;
-	if (typeof configPath === "string" && configPath.length > 0) tracked.add(configPath);
-	for (const entry of tailwindOptions?.v4?.cssEntries ?? []) if (typeof entry === "string" && entry.length > 0) tracked.add(entry);
-	return tracked;
-}
-function normalizeSignatureValue(value) {
-	if (value == null) return "null";
-	if (typeof value === "string") return value;
-	if (typeof value === "number" || typeof value === "boolean") return String(value);
-	if (Array.isArray(value)) return `[${value.map((item) => normalizeSignatureValue(item)).join(",")}]`;
-	if (typeof value === "object") return `{${Object.entries(value).filter(([, item]) => item !== void 0).sort(([a], [b]) => a.localeCompare(b)).map(([key, item]) => `${key}:${normalizeSignatureValue(item)}`).join(",")}}`;
-	return String(value);
-}
-function readOptionalProperty(value, key) {
-	if (typeof value !== "object" || value === null || !(key in value)) return;
-	return value[key];
-}
-function getTailwindOptionsSignature(twPatcher) {
-	const options = twPatcher.options;
-	const tailwindOptions = require_patcher_options.resolveTailwindcssOptions(options);
-	return normalizeSignatureValue({
-		projectRoot: options?.projectRoot,
-		packageName: tailwindOptions?.packageName,
-		versionHint: readOptionalProperty(tailwindOptions, "versionHint"),
-		cwd: tailwindOptions?.cwd,
-		config: tailwindOptions?.config,
-		v2: tailwindOptions?.v2,
-		v3: tailwindOptions?.v3,
-		v4: {
-			base: tailwindOptions?.v4?.base,
-			configuredBase: readOptionalProperty(tailwindOptions?.v4, "configuredBase"),
-			css: tailwindOptions?.v4?.css,
-			cssEntries: tailwindOptions?.v4?.cssEntries,
-			hasUserDefinedSources: readOptionalProperty(tailwindOptions?.v4, "hasUserDefinedSources"),
-			sources: tailwindOptions?.v4?.sources
-		}
-	});
-}
-function getPatchTargetSignature(twPatcher) {
-	const packageInfo = twPatcher.packageInfo;
-	return [
-		packageInfo?.name ?? "missing",
-		packageInfo?.rootPath ?? "missing",
-		packageInfo?.version ?? "unknown",
-		twPatcher.majorVersion ?? "unknown",
-		getTailwindOptionsSignature(twPatcher)
-	].join(":");
-}
-function getNestedPatchers(twPatcher) {
-	const nested = twPatcher[runtimeSignaturePatchersSymbol];
-	return Array.isArray(nested) && nested.length > 0 ? nested : void 0;
-}
-function getOwnRuntimeClassSetSignature(twPatcher) {
-	const trackedFiles = [...getTailwindTrackedFiles(twPatcher)].sort((a, b) => a.localeCompare(b)).map(getFileSignature);
-	return `${trackedFiles.length > 0 ? trackedFiles.join("|") : "files:missing"}|patch:${getPatchTargetSignature(twPatcher)}`;
-}
-function invalidateRuntimeClassSet(twPatcher) {
-	if (!twPatcher) return;
-	const nestedPatchers = getNestedPatchers(twPatcher);
-	if (nestedPatchers) for (const patcher of nestedPatchers) invalidateRuntimeClassSet(patcher);
-	for (const trackedFile of getTailwindTrackedFiles(twPatcher)) runtimeFileSignatureCache.delete(trackedFile);
-	runtimeClassSetCache.delete(twPatcher);
-}
-function getRuntimeClassSetCacheEntry(twPatcher) {
-	return getCacheEntry(twPatcher);
-}
-function getRuntimeClassSetSignature(twPatcher) {
-	const nestedPatchers = getNestedPatchers(twPatcher);
-	if (nestedPatchers) return nestedPatchers.map(getOwnRuntimeClassSetSignature).sort((a, b) => a.localeCompare(b)).join("||");
-	return getOwnRuntimeClassSetSignature(twPatcher);
-}
-//#endregion
-//#region src/context/workspace.ts
-const IGNORED_WORKSPACE_DIRS = new Set([
-	"node_modules",
-	".git",
-	".hg",
-	".svn",
-	".turbo",
-	".output",
-	".next",
-	"dist",
-	"build"
-]);
-function findWorkspaceRoot(startDir) {
-	if (!startDir) return;
-	let current = node_path.default.resolve(startDir);
-	while (true) {
-		if ((0, node_fs.existsSync)(node_path.default.join(current, "pnpm-workspace.yaml"))) return current;
-		const parent = node_path.default.dirname(current);
-		if (parent === current) return;
-		current = parent;
-	}
-}
-function findNearestPackageRoot(startDir) {
-	if (!startDir) return;
-	let current = node_path.default.resolve(startDir);
-	while (true) {
-		if ((0, node_fs.existsSync)(node_path.default.join(current, "package.json"))) return current;
-		const parent = node_path.default.dirname(current);
-		if (parent === current) return;
-		current = parent;
-	}
-}
-function findWorkspacePackageDir(rootDir, packageName) {
-	const visited = /* @__PURE__ */ new Set();
-	const queue = [node_path.default.resolve(rootDir)];
-	while (queue.length > 0) {
-		const current = queue.shift();
-		const normalized = node_path.default.normalize(current);
-		if (visited.has(normalized)) continue;
-		visited.add(normalized);
-		try {
-			const pkgPath = node_path.default.join(normalized, "package.json");
-			if ((0, node_fs.existsSync)(pkgPath)) {
-				if (JSON.parse((0, node_fs.readFileSync)(pkgPath, "utf8"))?.name === packageName) return normalized;
-			}
-		} catch {}
-		let entries;
-		try {
-			entries = (0, node_fs.readdirSync)(normalized, { withFileTypes: true });
-		} catch {
-			continue;
-		}
-		for (const entry of entries) {
-			if (!entry.isDirectory() || IGNORED_WORKSPACE_DIRS.has(entry.name) || entry.isSymbolicLink?.()) continue;
-			queue.push(node_path.default.join(normalized, entry.name));
-		}
-	}
-}
-//#endregion
+let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 //#region src/tailwindcss/v4/config.ts
 const DEFAULT_CSS_CALC_CUSTOM_PROPERTIES = [];
 function includesToken(list, token) {
@@ -234,8 +64,6 @@ function hasConfiguredCssEntries(ctx) {
 	const patcherOptions = ctx.tailwindcssPatcherOptions;
 	if (patcherOptions) {
 		if (normalizeCssEntriesConfig(patcherOptions.tailwindcss?.v4?.cssEntries)) return true;
-		if (normalizeCssEntriesConfig(patcherOptions.tailwind?.v4?.cssEntries)) return true;
-		if (normalizeCssEntriesConfig(patcherOptions.patch?.tailwindcss?.v4?.cssEntries)) return true;
 	}
 	return false;
 }
@@ -253,226 +81,17 @@ function applyV4CssCalcDefaults(cssCalc, patcher) {
 	return cssCalcOptions;
 }
 //#endregion
-//#region src/tailwindcss/patcher-resolve.ts
-const GENERIC_RELATIVE_SPECIFIERS = [".", ".."];
-const DEFAULT_TAILWIND_CONFIG_SPECIFIERS = ["stubs/config.full.js", "defaultConfig.js"];
-const TAILWIND_CONFIG_FILES = [
-	"tailwind.config.js",
-	"tailwind.config.cjs",
-	"tailwind.config.mjs",
-	"tailwind.config.ts",
-	"tailwind.config.cts",
-	"tailwind.config.mts"
-];
-function isPathSpecifier(specifier) {
-	if (!specifier) return false;
-	if (specifier.startsWith("file://")) return true;
-	if (node_path.default.isAbsolute(specifier)) return true;
-	return GENERIC_RELATIVE_SPECIFIERS.some((prefix) => specifier.startsWith(`${prefix}/`) || specifier.startsWith(`${prefix}\\`));
-}
-function resolveModuleFromPaths(specifier, paths) {
-	if (!specifier || isPathSpecifier(specifier) || paths.length === 0) return;
-	try {
-		return (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href).resolve(specifier, { paths });
-	} catch {
-		return;
-	}
-}
-function resolveTailwindConfigFallback(packageName, paths) {
-	if (!packageName) return;
-	for (const suffix of DEFAULT_TAILWIND_CONFIG_SPECIFIERS) {
-		const resolved = resolveModuleFromPaths(`${packageName}/${suffix}`, paths);
-		if (resolved) return resolved;
-	}
-}
-function appendNodeModules(paths, dir) {
-	if (!dir) return;
-	const nodeModulesDir = node_path.default.join(dir, "node_modules");
-	if ((0, node_fs.existsSync)(nodeModulesDir)) paths.add(nodeModulesDir);
-}
-function findTailwindConfig(searchRoots) {
-	for (const root of searchRoots) for (const file of TAILWIND_CONFIG_FILES) {
-		const candidate = node_path.default.resolve(root, file);
-		if ((0, node_fs.existsSync)(candidate)) return candidate;
-	}
-}
-function createDefaultResolvePaths(basedir) {
-	const paths = /* @__PURE__ */ new Set();
-	let fallbackCandidates = [];
-	if (basedir) {
-		const resolvedBase = node_path.default.resolve(basedir);
-		appendNodeModules(paths, resolvedBase);
-		fallbackCandidates.push(resolvedBase);
-		const packageRoot = findNearestPackageRoot(resolvedBase);
-		if (packageRoot) {
-			appendNodeModules(paths, packageRoot);
-			fallbackCandidates.push(packageRoot);
-		}
-	}
-	const cwd = node_process.default.cwd();
-	appendNodeModules(paths, cwd);
-	try {
-		const modulePath = (0, node_url.fileURLToPath)(require("url").pathToFileURL(__filename).href);
-		const candidate = (0, node_fs.existsSync)(modulePath) && !node_path.default.extname(modulePath) ? modulePath : node_path.default.dirname(modulePath);
-		paths.add(candidate);
-	} catch {
-		paths.add(require("url").pathToFileURL(__filename).href);
-	}
-	if (paths.size === 0) {
-		fallbackCandidates = fallbackCandidates.filter(Boolean);
-		if (fallbackCandidates.length === 0) fallbackCandidates.push(cwd);
-		for (const candidate of fallbackCandidates) paths.add(candidate);
-	}
-	return [...paths];
-}
-//#endregion
-//#region src/tailwindcss/patcher.ts
-function createFallbackTailwindcssPatcher() {
-	return {
-		packageInfo: {
-			name: "tailwindcss",
-			version: void 0,
-			rootPath: "",
-			packageJsonPath: "",
-			packageJson: {}
-		},
-		async patch() {
-			return {
-				exposeContext: void 0,
-				extendLengthUnits: void 0
-			};
-		},
-		async getClassSet() {
-			return /* @__PURE__ */ new Set();
-		},
-		async extract(_options) {
-			return {
-				classList: [],
-				classSet: /* @__PURE__ */ new Set()
-			};
-		},
-		async collectContentTokens() {
-			return {
-				entries: [],
-				filesScanned: 0,
-				sources: [],
-				skippedFiles: []
-			};
-		}
-	};
-}
-let hasLoggedMissingTailwind = false;
-const TAILWINDCSS_NOT_FOUND_RE = /tailwindcss not found/i;
-const UNABLE_TO_LOCATE_TAILWINDCSS_RE = /unable to locate tailwind css package/i;
-function isTailwindcssV4PackageName(packageName) {
-	return packageName === "@tailwindcss/postcss" || packageName === "tailwindcss4" || Boolean(packageName && packageName.includes("tailwindcss4"));
-}
-function createTailwindcssPatcher(options) {
-	const { basedir, cacheDir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions } = options || {};
-	const cache = { driver: "memory" };
-	const normalizedBasedir = basedir ? node_path.default.resolve(basedir) : void 0;
-	const cacheRoot = findNearestPackageRoot(normalizedBasedir) ?? normalizedBasedir ?? node_process.default.cwd();
-	if (cacheDir) if (node_path.default.isAbsolute(cacheDir)) cache.dir = cacheDir;
-	else if (normalizedBasedir) cache.dir = node_path.default.resolve(normalizedBasedir, cacheDir);
-	else cache.dir = node_path.default.resolve(node_process.default.cwd(), cacheDir);
-	else cache.dir = node_path.default.join(cacheRoot, "node_modules", ".cache", "tailwindcss-patch");
-	if (normalizedBasedir) cache.cwd = normalizedBasedir;
-	const resolvePaths = createDefaultResolvePaths(cache.cwd ?? normalizedBasedir ?? node_process.default.cwd());
-	const normalizedUserOptions = require_patcher_options.normalizeTailwindcssPatcherOptions(tailwindcssPatcherOptions);
-	const extendLengthUnits = require_patcher_options.normalizeExtendLengthUnits(supportCustomLengthUnitsPatch ?? true);
-	const baseTailwindOptions = (0, _weapp_tailwindcss_shared.defuOverrideArray)(tailwindcss ?? {}, {
-		cwd: normalizedBasedir,
-		resolve: { paths: resolvePaths }
-	});
-	if (baseTailwindOptions.version === 2) {
-		if (!baseTailwindOptions.packageName) baseTailwindOptions.packageName = "@tailwindcss/postcss7-compat";
-		if (!baseTailwindOptions.postcssPlugin) baseTailwindOptions.postcssPlugin = "@tailwindcss/postcss7-compat";
-	} else if (!baseTailwindOptions.packageName) baseTailwindOptions.packageName = "tailwindcss";
-	if (!baseTailwindOptions.postcssPlugin) baseTailwindOptions.postcssPlugin = baseTailwindOptions.version === 4 || isTailwindcssV4PackageName(baseTailwindOptions.packageName) ? "@tailwindcss/postcss" : "tailwindcss";
-	if (typeof baseTailwindOptions.postcssPlugin === "string") {
-		const resolvedPlugin = resolveModuleFromPaths(baseTailwindOptions.postcssPlugin, resolvePaths);
-		if (resolvedPlugin) baseTailwindOptions.postcssPlugin = resolvedPlugin;
-	}
-	const resolvedOptions = require_patcher_options.toModernTailwindcssPatchOptions((0, _weapp_tailwindcss_shared.defuOverrideArray)(normalizedUserOptions ?? {}, {
-		projectRoot: normalizedBasedir,
-		cache,
-		tailwindcss: baseTailwindOptions,
-		apply: {
-			exposeContext: true,
-			extendLengthUnits
-		}
-	})) ?? {};
-	const resolvedTailwindOptions = resolvedOptions.tailwindcss;
-	if (resolvedTailwindOptions) {
-		const existingResolve = resolvedTailwindOptions.resolve ?? {};
-		const sourcePaths = Array.isArray(existingResolve.paths) && existingResolve.paths.length > 0 ? existingResolve.paths : resolvePaths;
-		resolvedTailwindOptions.resolve = {
-			...existingResolve,
-			paths: [...new Set(sourcePaths)]
-		};
-		_weapp_tailwindcss_logger.logger.debug("Tailwind resolve config %O", {
-			packageName: resolvedTailwindOptions.packageName,
-			version: resolvedTailwindOptions.version,
-			resolve: resolvedTailwindOptions.resolve,
-			cwd: resolvedTailwindOptions.cwd
-		});
-		if (typeof resolvedTailwindOptions.postcssPlugin === "string") {
-			const resolvedPlugin = resolveModuleFromPaths(resolvedTailwindOptions.postcssPlugin, resolvedTailwindOptions.resolve?.paths ?? resolvePaths);
-			if (resolvedPlugin) resolvedTailwindOptions.postcssPlugin = resolvedPlugin;
-		}
-		const searchRoots = /* @__PURE__ */ new Set();
-		if (resolvedTailwindOptions.cwd) searchRoots.add(resolvedTailwindOptions.cwd);
-		for (const resolvePath of resolvedTailwindOptions.resolve?.paths ?? []) {
-			const parentDir = node_path.default.dirname(resolvePath);
-			searchRoots.add(parentDir);
-		}
-		const configPath = findTailwindConfig(searchRoots);
-		if (!resolvedTailwindOptions.config) if (configPath) resolvedTailwindOptions.config = configPath;
-		else {
-			const fallbackConfig = resolveTailwindConfigFallback(resolvedTailwindOptions.packageName, resolvedTailwindOptions.resolve.paths ?? resolvePaths);
-			if (fallbackConfig) resolvedTailwindOptions.config = fallbackConfig;
-		}
-		if (!resolvedTailwindOptions.cwd && configPath) resolvedTailwindOptions.cwd = node_path.default.dirname(configPath);
-		resolvedOptions.tailwindcss = resolvedTailwindOptions;
-	}
-	try {
-		return new tailwindcss_patch.TailwindcssPatcher(resolvedOptions);
-	} catch (error) {
-		const searchPaths = resolvedOptions.tailwindcss?.resolve?.paths;
-		if (error instanceof Error && TAILWINDCSS_NOT_FOUND_RE.test(error.message)) {
-			if (!hasLoggedMissingTailwind) {
-				_weapp_tailwindcss_logger.logger.warn("Tailwind CSS 未安装，已跳过 Tailwind 相关补丁。若需使用 Tailwind 能力，请安装 tailwindcss。");
-				hasLoggedMissingTailwind = true;
-			}
-			return createFallbackTailwindcssPatcher();
-		}
-		if (error instanceof Error && UNABLE_TO_LOCATE_TAILWINDCSS_RE.test(error.message)) _weapp_tailwindcss_logger.logger.error("无法定位 Tailwind CSS 包 \"%s\"，已尝试路径: %O", resolvedOptions.tailwindcss?.packageName, searchPaths);
-		throw error;
-	}
-}
-//#endregion
 //#region src/tailwindcss/v4/multi-patcher.ts
 function createMultiTailwindcssPatcher(patchers) {
 	if (patchers.length <= 1) return patchers[0];
-	const [first] = patchers;
+	const first = patchers[0];
+	const firstWithoutPatch = { ...first };
+	delete firstWithoutPatch.patch;
 	const multiPatcher = {
-		...first,
+		...firstWithoutPatch,
 		packageInfo: first?.packageInfo,
 		majorVersion: first?.majorVersion,
 		options: first?.options,
-		async patch() {
-			let exposeContext;
-			let extendLengthUnits;
-			for (const patcher of patchers) {
-				const result = await patcher.patch();
-				if (result?.exposeContext && exposeContext == null) exposeContext = result.exposeContext;
-				if (result?.extendLengthUnits && extendLengthUnits == null) extendLengthUnits = result.extendLengthUnits;
-			}
-			return {
-				exposeContext,
-				extendLengthUnits
-			};
-		},
 		async getClassSet() {
 			const aggregated = /* @__PURE__ */ new Set();
 			for (const patcher of patchers) {
@@ -511,7 +130,7 @@ function createMultiTailwindcssPatcher(patchers) {
 		}
 		return aggregated;
 	};
-	Object.defineProperty(multiPatcher, runtimeSignaturePatchersSymbol, {
+	Object.defineProperty(multiPatcher, require_cache.runtimeSignaturePatchersSymbol, {
 		value: [...patchers],
 		configurable: true
 	});
@@ -519,46 +138,13 @@ function createMultiTailwindcssPatcher(patchers) {
 }
 //#endregion
 //#region src/tailwindcss/v4/patcher-options.ts
-function isLegacyTailwindcssPatcherOptions(options) {
-	return typeof options === "object" && options !== null && "patch" in options;
-}
-function isModernTailwindcssPatchOptions(options) {
-	return typeof options === "object" && options !== null && !("patch" in options);
-}
 function overrideTailwindcssPatcherOptionsForBase(options, baseDir, cssEntries) {
 	const hasCssEntries = cssEntries.length > 0;
 	if (!options) return options;
-	if (isLegacyTailwindcssPatcherOptions(options)) {
-		const patchOptions = options.patch;
-		if (!patchOptions) return options;
-		const nextPatch = {
-			...patchOptions,
-			basedir: baseDir,
-			cwd: patchOptions.cwd ?? baseDir
-		};
-		if (patchOptions.tailwindcss) {
-			const nextV4 = { ...patchOptions.tailwindcss.v4 ?? {} };
-			if (hasCssEntries) nextV4.cssEntries = cssEntries;
-			else {
-				nextV4.cssEntries = nextV4.cssEntries ?? cssEntries;
-				if (nextV4.base === void 0) nextV4.base = baseDir;
-			}
-			nextPatch.tailwindcss = {
-				...patchOptions.tailwindcss,
-				v4: nextV4
-			};
-		}
-		return {
-			...options,
-			patch: nextPatch
-		};
-	}
-	if (!isModernTailwindcssPatchOptions(options)) return options;
-	const modernTailwind = options.tailwindcss ?? options.tailwind;
+	const modernTailwind = options.tailwindcss;
 	if (!modernTailwind) return options;
-	const { tailwind: _legacyTailwind, ...rest } = options;
 	return {
-		...rest,
+		...options,
 		tailwindcss: {
 			...modernTailwind,
 			v4: {
@@ -578,7 +164,7 @@ function guessBasedirFromEntries(entries) {
 		const trimmed = entry.trim();
 		if (!trimmed || !node_path.default.isAbsolute(trimmed)) continue;
 		const entryDir = node_path.default.dirname(trimmed);
-		const resolved = findNearestPackageRoot(entryDir) ?? entryDir;
+		const resolved = require_cache.findNearestPackageRoot(entryDir) ?? entryDir;
 		if (resolved) return resolved;
 	}
 }
@@ -604,7 +190,7 @@ function resolveCssEntryBase(entryDir, options) {
 	const { preferredBaseDir, workspaceRoot } = options;
 	if (preferredBaseDir && isSubPath(preferredBaseDir, normalizedDir)) return preferredBaseDir;
 	if (workspaceRoot && isSubPath(workspaceRoot, normalizedDir)) return workspaceRoot;
-	const packageRoot = findNearestPackageRoot(normalizedDir);
+	const packageRoot = require_cache.findNearestPackageRoot(normalizedDir);
 	if (packageRoot) return node_path.default.normalize(packageRoot);
 	return normalizedDir;
 }
@@ -641,7 +227,7 @@ function isTailwindVersionMismatchError(error) {
 	return error instanceof Error && CONFIGURED_TAILWIND_VERSION_RE.test(error.message) && RESOLVED_TAILWIND_VERSION_RE.test(error.message);
 }
 function createPatcherForBase(baseDir, cssEntries, options) {
-	const { tailwindcss, tailwindcssPatcherOptions, supportCustomLengthUnitsPatch } = options;
+	const { tailwindcss, tailwindcssPatcherOptions, supportCustomLengthUnitsPatch, bareArbitraryValues } = options;
 	const hasCssEntries = Boolean(cssEntries?.length);
 	const mergedTailwindOptions = (0, _weapp_tailwindcss_shared.defuOverrideArray)(tailwindcss ?? {}, {
 		cwd: baseDir,
@@ -663,11 +249,15 @@ function createPatcherForBase(baseDir, cssEntries, options) {
 			else if (!mergedTailwindOptions.v4.cssEntries) mergedTailwindOptions.v4.cssEntries = [];
 		} else if (!mergedTailwindOptions.v4.cssEntries) mergedTailwindOptions.v4.cssEntries = cssEntries ?? [];
 	}
+	if (bareArbitraryValues !== void 0 && bareArbitraryValues !== false) mergedTailwindOptions.v4.bareArbitraryValues = bareArbitraryValues;
 	const patchedOptions = overrideTailwindcssPatcherOptionsForBase(tailwindcssPatcherOptions, baseDir, cssEntries ?? []);
-	const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwind?.packageName || tailwindcssPatcherOptions?.patch?.tailwindcss?.packageName;
-	const explicitTailwindVersion = resolveExplicitTailwindVersion(tailwindcss?.version || tailwindcssPatcherOptions?.tailwindcss?.version || tailwindcssPatcherOptions?.tailwind?.version || tailwindcssPatcherOptions?.patch?.tailwindcss?.version || mergedTailwindOptions.version, configuredPackageName);
-	const hasExplicitV4Signals = hasCssEntries || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwind) || hasOwnV4Signal(tailwindcssPatcherOptions?.patch?.tailwindcss);
-	const shouldPatchV4PostcssPackage = (explicitTailwindVersion === 3 ? false : explicitTailwindVersion === 4 || explicitTailwindVersion === void 0 && (mergedTailwindOptions.version === 4 || isTailwindcss4Package(configuredPackageName ?? mergedTailwindOptions.packageName) || hasExplicitV4Signals)) && !Boolean(configuredPackageName);
+	const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwindcss?.packageName;
+	const explicitTailwindVersion = resolveExplicitTailwindVersion(tailwindcss?.version || tailwindcssPatcherOptions?.tailwindcss?.version || mergedTailwindOptions.version, configuredPackageName);
+	const hasExplicitV4Signals = hasCssEntries || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss);
+	const packageNameForVersionDetection = configuredPackageName ?? mergedTailwindOptions.packageName ?? "tailwindcss";
+	const installedTailwindVersion = require_cache.readInstalledPackageMajorVersion(packageNameForVersionDetection, baseDir);
+	const resolvedTailwindVersion = installedTailwindVersion ?? explicitTailwindVersion;
+	const shouldPatchV4PostcssPackage = (resolvedTailwindVersion === 4 && (installedTailwindVersion === 4 || explicitTailwindVersion === 4 || hasExplicitV4Signals && isTailwindcss4Package(packageNameForVersionDetection)) || resolvedTailwindVersion === void 0 && (hasCssEntries || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss))) && !Boolean(configuredPackageName);
 	const packageCandidates = /* @__PURE__ */ new Set();
 	if (shouldPatchV4PostcssPackage) packageCandidates.add("@tailwindcss/postcss");
 	packageCandidates.add(mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss");
@@ -679,8 +269,9 @@ function createPatcherForBase(baseDir, cssEntries, options) {
 			...mergedTailwindOptions,
 			packageName
 		};
+		if (resolvedTailwindVersion) tailwindOptionsForPackage.version = resolvedTailwindVersion;
 		try {
-			patchers.push(createTailwindcssPatcher({
+			patchers.push(require_cache.createTailwindcssPatcher({
 				basedir: baseDir,
 				supportCustomLengthUnitsPatch: supportCustomLengthUnitsPatch ?? true,
 				tailwindcss: tailwindOptionsForPackage,
@@ -843,9 +434,9 @@ function resolveTailwindcssBasedir(basedir, fallback) {
 		return node_path.default.normalize(node_path.default.dirname(packageJsonPath));
 	} catch {
 		if (node_process.default.env.WEAPP_TW_DEBUG_STACK === "1") _weapp_tailwindcss_logger.logger.debug("failed to resolve package json for %s", packageName);
-		const workspaceRoot = findWorkspaceRoot(anchor);
+		const workspaceRoot = require_cache.findWorkspaceRoot(anchor);
 		if (workspaceRoot) {
-			const packageDir = findWorkspacePackageDir(workspaceRoot, packageName);
+			const packageDir = require_cache.findWorkspacePackageDir(workspaceRoot, packageName);
 			if (packageDir) return packageDir;
 		}
 	}
@@ -904,7 +495,7 @@ function detectImplicitCssEntries(appType, baseDir) {
 //#endregion
 //#region src/context/tailwindcss.ts
 function createTailwindcssPatcherFromContext(ctx) {
-	const { tailwindcssBasedir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions, cssEntries: rawCssEntries, appType } = ctx;
+	const { tailwindcssBasedir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions, cssEntries: rawCssEntries, appType, arbitraryValues } = ctx;
 	const absoluteCssEntryBasedir = guessBasedirFromEntries(rawCssEntries);
 	const resolvedTailwindcssBasedir = resolveTailwindcssBasedir(tailwindcssBasedir, absoluteCssEntryBasedir);
 	ctx.tailwindcssBasedir = resolvedTailwindcssBasedir;
@@ -916,9 +507,10 @@ function createTailwindcssPatcherFromContext(ctx) {
 		tailwindcss,
 		tailwindcssPatcherOptions,
 		supportCustomLengthUnitsPatch,
-		appType
+		appType,
+		bareArbitraryValues: arbitraryValues?.bareArbitraryValues
 	};
-	const workspaceRoot = findWorkspaceRoot(resolvedTailwindcssBasedir) ?? (absoluteCssEntryBasedir ? findWorkspaceRoot(absoluteCssEntryBasedir) : void 0);
+	const workspaceRoot = require_cache.findWorkspaceRoot(resolvedTailwindcssBasedir) ?? (absoluteCssEntryBasedir ? require_cache.findWorkspaceRoot(absoluteCssEntryBasedir) : void 0);
 	const groupedCssEntries = normalizedCssEntries ? groupCssEntriesByBase(normalizedCssEntries, {
 		preferredBaseDir: resolvedTailwindcssBasedir,
 		workspaceRoot
@@ -947,36 +539,6 @@ Object.defineProperty(exports, "createTailwindcssPatcherFromContext", {
 		return createTailwindcssPatcherFromContext;
 	}
 });
-Object.defineProperty(exports, "findNearestPackageRoot", {
-	enumerable: true,
-	get: function() {
-		return findNearestPackageRoot;
-	}
-});
-Object.defineProperty(exports, "findTailwindConfig", {
-	enumerable: true,
-	get: function() {
-		return findTailwindConfig;
-	}
-});
-Object.defineProperty(exports, "getRuntimeClassSetCacheEntry", {
-	enumerable: true,
-	get: function() {
-		return getRuntimeClassSetCacheEntry;
-	}
-});
-Object.defineProperty(exports, "getRuntimeClassSetSignature", {
-	enumerable: true,
-	get: function() {
-		return getRuntimeClassSetSignature;
-	}
-});
-Object.defineProperty(exports, "invalidateRuntimeClassSet", {
-	enumerable: true,
-	get: function() {
-		return invalidateRuntimeClassSet;
-	}
-});
 Object.defineProperty(exports, "isUniAppXEnabled", {
 	enumerable: true,
 	get: function() {

package/dist/typedoc.export.d.ts

@@ -1,5 +1,3 @@
 export type { WeappTailwindcssGenerateOptions, WeappTailwindcssGenerateResult, WeappTailwindcssGenerator, WeappTailwindcssGeneratorTarget, WeappTailwindcssPostcssPluginOptions, } from './index';
-export type { DisabledOptions } from './types/disabled-options';
 export type { UserDefinedOptions } from './types/user-defined-options';
 export type { ApplyOptions, CacheOptions, ExtractOptions, TailwindCssOptions, TailwindCssPatchOptions, TailwindV2Options, TailwindV3Options, TailwindV4Options, } from 'tailwindcss-patch';
-export type TailwindcssPatchOptions = import('tailwindcss-patch').TailwindCssPatchOptions;

package/dist/types/index.d.ts

@@ -5,11 +5,10 @@ import type { Document, Result as PostcssResult, Root } from 'postcss';
 import type { ILengthUnitsPatchOptions, TailwindcssPatcher } from 'tailwindcss-patch';
 import type { ICreateCacheReturnType } from '../cache';
 import type { ItemOrItemArray } from './base';
-import type { DisabledOptions } from './disabled-options';
 import type { AppType, IArbitraryValues, ICustomAttributesEntities } from './shared';
 import type { UniAppXComponentLocalStylesOptions, UniAppXOptions as UniAppXUserDefinedOptions, UserDefinedOptions } from './user-defined-options';
 type AsyncableMethod<T> = T extends (...args: infer A) => infer R ? (...args: A) => Promise<Awaited<R>> | Awaited<R> : never;
-export type { DisabledOptions, UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
+export type { UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
 export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
 export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities } from './shared';
 export interface LinkedJsModuleResult {
@@ -24,7 +23,7 @@ export interface JsHandlerResult {
 export interface TailwindcssPatcherLike {
     packageInfo: TailwindcssPatcher['packageInfo'];
     majorVersion?: TailwindcssPatcher['majorVersion'];
-    patch: TailwindcssPatcher['patch'];
+    patch?: TailwindcssPatcher['patch'];
     getClassSet: AsyncableMethod<TailwindcssPatcher['getClassSet']>;
     getClassSetSync?: TailwindcssPatcher['getClassSetSync'];
     extract: TailwindcssPatcher['extract'];
@@ -37,7 +36,6 @@ export interface RefreshTailwindcssPatcherOptions {
 export interface IJsHandlerOptions {
     escapeMap?: Record<string, string>;
     classNameSet?: Set<string>;
-    staleClassNameFallback?: boolean;
     jsArbitraryValueFallback?: boolean | 'auto';
     tailwindcssMajorVersion?: number;
     arbitraryValues?: IArbitraryValues;
@@ -90,11 +88,6 @@ export interface IBaseWebpackPlugin {
     appType?: AppType;
     apply: (compiler: any) => void;
 }
-export interface InternalPatchResult {
-    dataTypes?: string;
-    processTailwindFeatures?: string;
-    plugin?: string;
-}
 export type CreateJsHandlerOptions = Omit<IJsHandlerOptions, 'classNameSet'>;
 export interface JsModuleGraphOptions {
     resolve: (specifier: string, importer: string) => string | undefined;

package/dist/types/shared.d.ts

@@ -4,4 +4,7 @@ export type ICustomAttributes = Record<string, ItemOrItemArray<string | RegExp>>
 export type ICustomAttributesEntities = [string | RegExp, ItemOrItemArray<string | RegExp>][];
 export interface IArbitraryValues {
     allowDoubleQuotes?: boolean;
+    bareArbitraryValues?: boolean | {
+        units?: string[];
+    };
 }