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

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-import { a as resolveTailwindV4Source$1, i as normalizeWeappTailwindcssGeneratorOptions, p as resolveTailwindV3Source, t as createWeappTailwindcssGenerator } from "./generator-Y-Ikv4Fu.mjs";
-import { createRequire } from "node:module";
+import { a as resolveTailwindV4Source$1, i as normalizeWeappTailwindcssGeneratorOptions, p as resolveTailwindV3Source, t as createWeappTailwindcssGenerator } from "./generator-Dpp-5s8z.mjs";
+import { t as readInstalledPackageMajorVersion } from "./version-WNz3MwRv.mjs";
 import postcss from "postcss";
 import path from "node:path";
 import process from "node:process";
@@ -9,7 +9,7 @@ import { readFile, stat } from "node:fs/promises";
 import fg from "fast-glob";
 //#region src/postcss.ts
 const PLUGIN_NAME = "weapp-tailwindcss";
-const POSTCSS_SOURCE_EXTENSIONS = [
+const POSTCSS_SOURCE_PATTERN = `**/*.{${[
 	"html",
 	"wxml",
 	"axml",
@@ -26,10 +26,11 @@ const POSTCSS_SOURCE_EXTENSIONS = [
 	"jsx",
 	"ts",
 	"tsx"
-];
+].join(",")}}`;
 function resolveInputFile(result) {
 	const from = result.opts.from;
-	return typeof from === "string" && from.length > 0 ? from : void 0;
+	if (typeof from !== "string" || from.length === 0) return;
+	return path.isAbsolute(from) ? from : path.resolve(process.cwd(), from);
 }
 function resolvePostcssBase(result, options) {
 	if (options.base) return options.base;
@@ -42,9 +43,13 @@ function resolvePostcssProjectRoot(result, options) {
 	return inputFile ? path.dirname(inputFile) : process.cwd();
 }
 function replaceRootCss(root, css, result) {
-	const nextRoot = postcss.parse(css, { from: resolveInputFile(result) });
 	root.removeAll();
-	root.append(nextRoot.nodes);
+	try {
+		const nextRoot = postcss.parse(css, { from: resolveInputFile(result) });
+		root.append(nextRoot.nodes);
+	} catch {
+		root.raws = { after: css };
+	}
 }
 function addDependencyMessages(result, generated) {
 	for (const file of generated.dependencies) result.messages.push({
@@ -81,22 +86,15 @@ function hasTailwindV4CssSyntax(root) {
 	});
 	return hasV4Syntax;
 }
-function readPackageMajorVersion(packageName, base) {
-	try {
-		const pkg = createRequire(`${base}/package.json`)(`${packageName}/package.json`);
-		const major = Number(pkg.version?.split(".")[0]);
-		return major === 3 || major === 4 ? major : void 0;
-	} catch {
-		return;
-	}
-}
 function resolvePostcssTailwindVersion(root, result, options) {
-	if (options.version) return options.version;
-	if (hasTailwindV4CssSyntax(root)) return 4;
 	const packageName = options.packageName ?? "tailwindcss";
+	const installedVersion = readInstalledPackageMajorVersion(packageName, resolvePostcssProjectRoot(result, options));
+	if (installedVersion) return installedVersion;
+	if (options.version) return options.version;
 	if (packageName === "@tailwindcss/postcss" || packageName.includes("tailwindcss4")) return 4;
 	if (packageName.includes("tailwindcss3")) return 3;
-	return readPackageMajorVersion(packageName, resolvePostcssProjectRoot(result, options)) ?? 4;
+	if (hasTailwindV4CssSyntax(root)) return 4;
+	return 4;
 }
 function getSourceExtension(file) {
 	return path.extname(file).slice(1) || void 0;
@@ -110,7 +108,7 @@ async function pathExistsAsDirectory(file) {
 }
 async function expandLocalSourceFiles(sourcePath, base) {
 	const absoluteSource = path.isAbsolute(sourcePath) ? sourcePath : path.resolve(base, sourcePath);
-	if (await pathExistsAsDirectory(absoluteSource)) return fg(`**/*.{${POSTCSS_SOURCE_EXTENSIONS.join(",")}}`, {
+	if (await pathExistsAsDirectory(absoluteSource)) return fg(POSTCSS_SOURCE_PATTERN, {
 		absolute: true,
 		cwd: absoluteSource,
 		onlyFiles: true
@@ -126,7 +124,7 @@ async function resolveTailwindSourceEntry(sourcePath, base, negated) {
 	if (await pathExistsAsDirectory(absoluteSource)) return {
 		base: absoluteSource,
 		negated,
-		pattern: "**/*"
+		pattern: POSTCSS_SOURCE_PATTERN
 	};
 	if (path.isAbsolute(sourcePath)) return {
 		base: path.dirname(absoluteSource),
@@ -169,13 +167,14 @@ async function collectConfigContentFiles(root, base) {
 	};
 }
 async function collectAutoTailwindCandidates(root, result, options) {
+	if (options.scanSources === false) return /* @__PURE__ */ new Set();
 	const base = resolvePostcssBase(result, options);
 	const projectRoot = resolvePostcssProjectRoot(result, options);
 	const sourceEntryTasks = [];
 	if (!root.toString().includes("source(none)")) sourceEntryTasks.push(Promise.resolve({
 		base,
 		negated: false,
-		pattern: "**/*"
+		pattern: POSTCSS_SOURCE_PATTERN
 	}));
 	root.walkAtRules("source", (rule) => {
 		const parsed = parseSourceFileParam(rule.params);
@@ -217,17 +216,27 @@ function addSourceDependencyMessages(result, files) {
 		file
 	});
 }
+function quoteCssString(value) {
+	return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
+}
+function toCssPath(value) {
+	return value.replaceAll("\\", "/");
+}
+function prependConfigDirective(css, config) {
+	if (!config || /@config\s+/.test(css)) return css;
+	return `@config "${quoteCssString(toCssPath(config))}";\n${css}`;
+}
 const weappTailwindcssPostcssPlugin = (options = {}) => {
 	return {
 		postcssPlugin: PLUGIN_NAME,
 		async Once(root, { result }) {
-			const { candidates, generator: userGeneratorOptions, sources, styleOptions, target: legacyTarget, ...sourceOptions } = options;
+			const { candidates, generator: userGeneratorOptions, scanSources, sources, styleOptions, ...sourceOptions } = options;
 			const generatorOptions = normalizeWeappTailwindcssGeneratorOptions(userGeneratorOptions);
-			if (generatorOptions.mode === "off") return;
 			const tailwindVersion = resolvePostcssTailwindVersion(root, result, options);
 			const [collectedSources, autoCandidates] = await Promise.all([collectPostcssLocalSources(root, result, options), collectAutoTailwindCandidates(root, result, options)]);
+			const generatorConfig = generatorOptions.config ?? options.config;
 			const generator = createWeappTailwindcssGenerator(tailwindVersion === 3 ? await resolveTailwindV3Source({
-				config: options.config,
+				config: generatorConfig,
 				css: sourceOptions.css ?? root.toString(),
 				base: resolvePostcssBase(result, options),
 				cwd: resolvePostcssProjectRoot(result, options),
@@ -236,20 +245,20 @@ const weappTailwindcssPostcssPlugin = (options = {}) => {
 				postcssPlugin: options.postcssPlugin
 			}) : await resolveTailwindV4Source$1({
 				...sourceOptions,
-				css: sourceOptions.css ?? root.toString(),
+				css: prependConfigDirective(sourceOptions.css ?? root.toString(), generatorConfig),
 				base: resolvePostcssBase(result, options),
 				projectRoot: resolvePostcssProjectRoot(result, options)
 			}));
 			const generateOptions = {
 				candidates: new Set([...autoCandidates, ...candidates ?? []]),
-				scanSources: false,
+				scanSources: scanSources ?? false,
 				sources: [...collectedSources.sources, ...sources ?? []],
 				styleOptions: {
 					...generatorOptions.styleOptions,
 					...styleOptions
 				},
 				tailwindcssV3Compatibility: generatorOptions.tailwindcssV3Compatibility,
-				target: legacyTarget ?? generatorOptions.target
+				target: generatorOptions.target
 			};
 			const generated = await generator.generate(generateOptions);
 			replaceRootCss(root, generated.css, result);

package/dist/presets.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-8l464Juk.js");
 const require_utils = require("./utils-DmC9_In3.js");
-const require_logger = require("./logger-BZ45DZJT.js");
+const require_logger = require("./logger-D9clu_3f.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let local_pkg = require("local-pkg");

package/dist/presets.mjs

@@ -1,5 +1,5 @@
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-7DUGTFED.mjs";
-import { a as resolveUniAppXOptions, r as resolveTailwindcssBasedir, t as logger } from "./logger-BoVx1Dbt.mjs";
+import { a as resolveUniAppXOptions, r as resolveTailwindcssBasedir, t as logger } from "./logger-1gx9UllH.mjs";
 import process from "node:process";
 import { getPackageInfoSync } from "local-pkg";
 //#region src/presets/shared.ts

package/dist/{recorder-XdFvVASS.mjs → recorder-BIW3Kuke.mjs}

@@ -1,6 +1,6 @@
 import { i as isMap, n as defuOverrideArray } from "./utils-7DUGTFED.mjs";
 import { getDefaultOptions } from "./defaults.mjs";
-import { a as resolveUniAppXOptions, c as warnMissingCssEntries, d as getRuntimeClassSetSignature, f as invalidateRuntimeClassSet, i as isUniAppXEnabled, l as findNearestPackageRoot, n as createTailwindcssPatcherFromContext, s as applyV4CssCalcDefaults, t as logger$1, u as getRuntimeClassSetCacheEntry } from "./logger-BoVx1Dbt.mjs";
+import { a as resolveUniAppXOptions, c as warnMissingCssEntries, d as getRuntimeClassSetSignature, f as invalidateRuntimeClassSet, i as isUniAppXEnabled, l as findNearestPackageRoot, n as createTailwindcssPatcherFromContext, s as applyV4CssCalcDefaults, t as logger$1, u as getRuntimeClassSetCacheEntry } from "./logger-1gx9UllH.mjs";
 import { createStyleHandler } from "@weapp-tailwindcss/postcss";
 import path from "node:path";
 import process from "node:process";
@@ -364,10 +364,10 @@ function getRecordFileCandidates(baseDir) {
 }
 //#endregion
 //#region package.json
-var version = "5.0.0-next.3";
+var version = "5.0.0-next.5";
 //#endregion
 //#region src/constants.ts
-const pluginName = "weapp-tailwindcss-webpack-plugin";
+const pluginName = "weapp-tailwindcss";
 const vitePluginName = "weapp-tailwindcss:adaptor";
 const WEAPP_TW_VERSION = version;
 const DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS = {
@@ -2104,7 +2104,6 @@ function getOptionsFingerprint(options) {
 		options.uniAppX ? "1" : "0",
 		options.wrapExpression ? "1" : "0",
 		String(options.tailwindcssMajorVersion ?? ""),
-		String(options.staleClassNameFallback ?? ""),
 		String(options.jsArbitraryValueFallback ?? ""),
 		JSON.stringify(options.arbitraryValues ?? null),
 		JSON.stringify(options.ignoreCallExpressionIdentifiers ?? null),
@@ -2128,7 +2127,6 @@ function shouldCacheJsResult(rawSource, options) {
 function createJsHandler(options) {
 	const defaults = {
 		escapeMap: options.escapeMap,
-		staleClassNameFallback: options.staleClassNameFallback,
 		jsArbitraryValueFallback: options.jsArbitraryValueFallback,
 		tailwindcssMajorVersion: options.tailwindcssMajorVersion,
 		arbitraryValues: options.arbitraryValues,
@@ -2290,11 +2288,7 @@ function generateCode(match, options = {}) {
 			const initial = jsHandler(match, runtimeSet, wrapExpression ? WRAP_EXPRESSION_HANDLER_OPTIONS : void 0);
 			if (!initial.error || wrapExpression) return initial.code;
 			return jsHandler(match, runtimeSet, WRAP_EXPRESSION_HANDLER_OPTIONS).code;
-		} else
- /**
-		* @deprecated
-		*/
-		return rewriteLegacyExpression(match, options);
+		} else return rewriteLegacyExpression(match, options);
 	} catch {
 		return match;
 	}
@@ -2588,7 +2582,7 @@ function resolveRuntimePackageReplacements(option) {
 	return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
 function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions, tailwindcssMajorVersion) {
-	const { cssPreflight, cssPreflightRange, escapeMap, cssChildCombinatorReplaceValue, injectAdditionalCssVarScope, cssSelectorReplacement, rem2rpx, postcssOptions, cssRemoveProperty, cssRemoveHoverPseudoClass, cssPresetEnv, autoprefixer, uniAppX, px2rpx, unitsToPx, arbitraryValues, jsPreserveClass, staleClassNameFallback, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
+	const { cssPreflight, cssPreflightRange, escapeMap, cssChildCombinatorReplaceValue, injectAdditionalCssVarScope, cssSelectorReplacement, rem2rpx, postcssOptions, cssRemoveProperty, cssRemoveHoverPseudoClass, cssPresetEnv, autoprefixer, uniAppX, px2rpx, unitsToPx, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
 	const uniAppXEnabled = isUniAppXEnabled(uniAppX);
 	const resolvedUniAppXOptions = resolveUniAppXOptions(uniAppX);
 	const moduleSpecifierReplacements = resolveRuntimePackageReplacements(replaceRuntimePackages);
@@ -2616,7 +2610,6 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
 		escapeMap,
 		arbitraryValues,
 		jsPreserveClass,
-		staleClassNameFallback,
 		jsArbitraryValueFallback: jsArbitraryValueFallback ?? "auto",
 		tailwindcssMajorVersion,
 		generateMap: true,

package/dist/{recorder-GdTJ3QqX.js → recorder-D4BKt75Q.js}

@@ -1,7 +1,7 @@
 const require_chunk = require("./chunk-8l464Juk.js");
 require("./utils-DmC9_In3.js");
 const require_defaults = require("./defaults.js");
-const require_logger = require("./logger-BZ45DZJT.js");
+const require_logger = require("./logger-D9clu_3f.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
@@ -372,10 +372,10 @@ function getRecordFileCandidates(baseDir) {
 }
 //#endregion
 //#region package.json
-var version = "5.0.0-next.3";
+var version = "5.0.0-next.5";
 //#endregion
 //#region src/constants.ts
-const pluginName = "weapp-tailwindcss-webpack-plugin";
+const pluginName = "weapp-tailwindcss";
 const vitePluginName = "weapp-tailwindcss:adaptor";
 const WEAPP_TW_VERSION = version;
 const DEFAULT_RUNTIME_PACKAGE_REPLACEMENTS = {
@@ -2112,7 +2112,6 @@ function getOptionsFingerprint(options) {
 		options.uniAppX ? "1" : "0",
 		options.wrapExpression ? "1" : "0",
 		String(options.tailwindcssMajorVersion ?? ""),
-		String(options.staleClassNameFallback ?? ""),
 		String(options.jsArbitraryValueFallback ?? ""),
 		JSON.stringify(options.arbitraryValues ?? null),
 		JSON.stringify(options.ignoreCallExpressionIdentifiers ?? null),
@@ -2136,7 +2135,6 @@ function shouldCacheJsResult(rawSource, options) {
 function createJsHandler(options) {
 	const defaults = {
 		escapeMap: options.escapeMap,
-		staleClassNameFallback: options.staleClassNameFallback,
 		jsArbitraryValueFallback: options.jsArbitraryValueFallback,
 		tailwindcssMajorVersion: options.tailwindcssMajorVersion,
 		arbitraryValues: options.arbitraryValues,
@@ -2298,11 +2296,7 @@ function generateCode(match, options = {}) {
 			const initial = jsHandler(match, runtimeSet, wrapExpression ? WRAP_EXPRESSION_HANDLER_OPTIONS : void 0);
 			if (!initial.error || wrapExpression) return initial.code;
 			return jsHandler(match, runtimeSet, WRAP_EXPRESSION_HANDLER_OPTIONS).code;
-		} else
- /**
-		* @deprecated
-		*/
-		return rewriteLegacyExpression(match, options);
+		} else return rewriteLegacyExpression(match, options);
 	} catch {
 		return match;
 	}
@@ -2596,7 +2590,7 @@ function resolveRuntimePackageReplacements(option) {
 	return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
 function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions, tailwindcssMajorVersion) {
-	const { cssPreflight, cssPreflightRange, escapeMap, cssChildCombinatorReplaceValue, injectAdditionalCssVarScope, cssSelectorReplacement, rem2rpx, postcssOptions, cssRemoveProperty, cssRemoveHoverPseudoClass, cssPresetEnv, autoprefixer, uniAppX, px2rpx, unitsToPx, arbitraryValues, jsPreserveClass, staleClassNameFallback, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
+	const { cssPreflight, cssPreflightRange, escapeMap, cssChildCombinatorReplaceValue, injectAdditionalCssVarScope, cssSelectorReplacement, rem2rpx, postcssOptions, cssRemoveProperty, cssRemoveHoverPseudoClass, cssPresetEnv, autoprefixer, uniAppX, px2rpx, unitsToPx, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
 	const uniAppXEnabled = require_logger.isUniAppXEnabled(uniAppX);
 	const resolvedUniAppXOptions = require_logger.resolveUniAppXOptions(uniAppX);
 	const moduleSpecifierReplacements = resolveRuntimePackageReplacements(replaceRuntimePackages);
@@ -2624,7 +2618,6 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
 		escapeMap,
 		arbitraryValues,
 		jsPreserveClass,
-		staleClassNameFallback,
 		jsArbitraryValueFallback: jsArbitraryValueFallback ?? "auto",
 		tailwindcssMajorVersion,
 		generateMap: true,

package/dist/reset.d.ts

@@ -1 +1,2 @@
+export { default } from './reset/index'
 export * from './reset/index'

package/dist/{css-imports-BbrbluP9.js → run-tasks-Cq5A5nVD.js}

@@ -47,19 +47,10 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
 }
 //#endregion
 //#region src/utils/disabled.ts
-function resolveDisabledOptions(disabled) {
-	if (disabled === true) return {
-		plugin: true,
-		rewriteCssImports: false
-	};
-	if (disabled === false || disabled == null) return {
-		plugin: false,
-		rewriteCssImports: false
-	};
-	return {
-		plugin: disabled.plugin ?? false,
-		rewriteCssImports: disabled.rewriteCssImports ?? false
-	};
+function resolvePluginDisabledState(disabled) {
+	if (disabled === true) return { plugin: true };
+	if (disabled === false || disabled == null) return { plugin: false };
+	return { plugin: disabled.plugin ?? false };
 }
 //#endregion
 //#region src/utils/resolve-package.ts
@@ -99,34 +90,6 @@ function pushConcurrentTaskFactories(queue, factories, limit) {
 	queue.push(runWithConcurrency(factories, limit).then(() => void 0));
 }
 //#endregion
-//#region src/bundlers/shared/css-imports.ts
-const tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
-const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])(tailwindcss(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
-function normalizeTailwindcssSpecifier(specifier) {
-	if (specifier === "tailwindcss$") return "tailwindcss";
-	return specifier;
-}
-function getTailwindcssSubpath(specifier) {
-	if (specifier === "tailwindcss") return "index.css";
-	return specifier.slice(12);
-}
-function resolveTailwindcssImport(specifier, pkgDir, options) {
-	const normalized = normalizeTailwindcssSpecifier(specifier);
-	if (!tailwindcssImportRE.test(normalized)) return null;
-	if (normalized === "tailwindcss") return options?.rootImport ?? "weapp-tailwindcss/index.css";
-	return (options?.join ?? node_path.default.join)(pkgDir, getTailwindcssSubpath(normalized));
-}
-function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
-	let hasReplacements = false;
-	const rewritten = code.replace(tailwindcssCssImportStatementRE, (full, prefix, quote, specifier, suffix) => {
-		const replacement = resolveTailwindcssImport(specifier, pkgDir, options);
-		if (!replacement) return full;
-		hasReplacements = true;
-		return `${prefix}${quote}${replacement}${suffix}`;
-	});
-	return hasReplacements ? rewritten : void 0;
-}
-//#endregion
 Object.defineProperty(exports, "normalizeOutputPathKey", {
 	enumerable: true,
 	get: function() {
@@ -139,12 +102,6 @@ Object.defineProperty(exports, "pushConcurrentTaskFactories", {
 		return pushConcurrentTaskFactories;
 	}
 });
-Object.defineProperty(exports, "resolveDisabledOptions", {
-	enumerable: true,
-	get: function() {
-		return resolveDisabledOptions;
-	}
-});
 Object.defineProperty(exports, "resolveOutputSpecifier", {
 	enumerable: true,
 	get: function() {
@@ -157,16 +114,10 @@ Object.defineProperty(exports, "resolvePackageDir", {
 		return resolvePackageDir;
 	}
 });
-Object.defineProperty(exports, "resolveTailwindcssImport", {
-	enumerable: true,
-	get: function() {
-		return resolveTailwindcssImport;
-	}
-});
-Object.defineProperty(exports, "rewriteTailwindcssImportsInCode", {
+Object.defineProperty(exports, "resolvePluginDisabledState", {
 	enumerable: true,
 	get: function() {
-		return rewriteTailwindcssImportsInCode;
+		return resolvePluginDisabledState;
 	}
 });
 Object.defineProperty(exports, "toAbsoluteOutputPath", {

package/dist/{css-imports-CSdPq_Sc.mjs → run-tasks-DUVrDJGl.mjs}

@@ -45,19 +45,10 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
 }
 //#endregion
 //#region src/utils/disabled.ts
-function resolveDisabledOptions(disabled) {
-	if (disabled === true) return {
-		plugin: true,
-		rewriteCssImports: false
-	};
-	if (disabled === false || disabled == null) return {
-		plugin: false,
-		rewriteCssImports: false
-	};
-	return {
-		plugin: disabled.plugin ?? false,
-		rewriteCssImports: disabled.rewriteCssImports ?? false
-	};
+function resolvePluginDisabledState(disabled) {
+	if (disabled === true) return { plugin: true };
+	if (disabled === false || disabled == null) return { plugin: false };
+	return { plugin: disabled.plugin ?? false };
 }
 //#endregion
 //#region src/utils/resolve-package.ts
@@ -97,32 +88,4 @@ function pushConcurrentTaskFactories(queue, factories, limit) {
 	queue.push(runWithConcurrency(factories, limit).then(() => void 0));
 }
 //#endregion
-//#region src/bundlers/shared/css-imports.ts
-const tailwindcssImportRE = /^tailwindcss(?:\/.*)?$/;
-const tailwindcssCssImportStatementRE = /(@import\s+(?:url\(\s*)?)(["'])(tailwindcss(?:\/[^"']*)?\$?)(\2\s*\)?)/gi;
-function normalizeTailwindcssSpecifier(specifier) {
-	if (specifier === "tailwindcss$") return "tailwindcss";
-	return specifier;
-}
-function getTailwindcssSubpath(specifier) {
-	if (specifier === "tailwindcss") return "index.css";
-	return specifier.slice(12);
-}
-function resolveTailwindcssImport(specifier, pkgDir, options) {
-	const normalized = normalizeTailwindcssSpecifier(specifier);
-	if (!tailwindcssImportRE.test(normalized)) return null;
-	if (normalized === "tailwindcss") return options?.rootImport ?? "weapp-tailwindcss/index.css";
-	return (options?.join ?? path.join)(pkgDir, getTailwindcssSubpath(normalized));
-}
-function rewriteTailwindcssImportsInCode(code, pkgDir, options) {
-	let hasReplacements = false;
-	const rewritten = code.replace(tailwindcssCssImportStatementRE, (full, prefix, quote, specifier, suffix) => {
-		const replacement = resolveTailwindcssImport(specifier, pkgDir, options);
-		if (!replacement) return full;
-		hasReplacements = true;
-		return `${prefix}${quote}${replacement}${suffix}`;
-	});
-	return hasReplacements ? rewritten : void 0;
-}
-//#endregion
-export { resolveDisabledOptions as a, toAbsoluteOutputPath as c, resolvePackageDir as i, rewriteTailwindcssImportsInCode as n, normalizeOutputPathKey as o, pushConcurrentTaskFactories as r, resolveOutputSpecifier as s, resolveTailwindcssImport as t };
+export { resolveOutputSpecifier as a, normalizeOutputPathKey as i, resolvePackageDir as n, toAbsoluteOutputPath as o, resolvePluginDisabledState as r, pushConcurrentTaskFactories as t };

package/dist/tailwindcss/miniprogram.d.ts

@@ -1 +1,5 @@
-export declare function pruneMiniProgramGeneratedCss(css: string): string;
+interface PruneMiniProgramGeneratedCssOptions {
+    preservePreflight?: boolean;
+}
+export declare function pruneMiniProgramGeneratedCss(css: string, options?: PruneMiniProgramGeneratedCssOptions): string;
+export {};

package/dist/tailwindcss/patcher-options.d.ts

@@ -1,56 +1,8 @@
-import type { PackageResolvingOptions } from 'local-pkg';
-import type { ILengthUnitsPatchOptions, NormalizedTailwindCssPatchOptions, TailwindCssPatchOptions } from 'tailwindcss-patch';
+import type { ILengthUnitsPatchOptions, TailwindCssPatchOptions } from 'tailwindcss-patch';
 type TailwindUserOptions = NonNullable<TailwindCssPatchOptions['tailwindcss']>;
-type ResolvedTailwindUserOptions = TailwindUserOptions | NormalizedTailwindCssPatchOptions['tailwind'];
 type TailwindApplyOptions = NonNullable<TailwindCssPatchOptions['apply']>;
-type TailwindExtractOptions = NonNullable<TailwindCssPatchOptions['extract']>;
 type TailwindExtendLengthUnitsOption = TailwindApplyOptions['extendLengthUnits'];
-export interface LegacyTailwindcssPatcherOptions {
-    cache?: boolean | {
-        enabled?: boolean;
-        cwd?: string;
-        dir?: string;
-        file?: string;
-        strategy?: 'merge' | 'overwrite';
-    };
-    patch?: {
-        overwrite?: boolean;
-        basedir?: string;
-        cwd?: string;
-        filter?: (className: string) => boolean;
-        resolve?: PackageResolvingOptions;
-        tailwindcss?: TailwindUserOptions;
-        applyPatches?: {
-            exportContext?: boolean;
-            extendLengthUnits?: boolean | ILengthUnitsPatchOptions;
-        };
-        output?: {
-            filename?: string;
-            loose?: boolean;
-            removeUniversalSelector?: boolean;
-        };
-    };
-}
-export interface LegacyTailwindcssOutputOptions {
-    enabled?: boolean;
-    file?: string;
-    format?: TailwindExtractOptions['format'];
-    pretty?: TailwindExtractOptions['pretty'];
-    removeUniversalSelector?: boolean;
-}
-export interface LegacyTailwindcssFeatureOptions {
-    exposeContext?: TailwindApplyOptions['exposeContext'];
-    extendLengthUnits?: boolean | ILengthUnitsPatchOptions | TailwindExtendLengthUnitsOption;
-}
-export type CompatTailwindCssPatchOptions = TailwindCssPatchOptions & {
-    cwd?: string;
-    overwrite?: boolean;
-    features?: LegacyTailwindcssFeatureOptions;
-    output?: LegacyTailwindcssOutputOptions;
-    tailwind?: ResolvedTailwindUserOptions;
-};
-export declare function resolveTailwindcssOptions(options?: CompatTailwindCssPatchOptions | LegacyTailwindcssPatcherOptions): ResolvedTailwindUserOptions | undefined;
+export declare function resolveTailwindcssOptions(options?: TailwindCssPatchOptions): TailwindUserOptions | undefined;
 export declare function normalizeExtendLengthUnits(value: boolean | ILengthUnitsPatchOptions | undefined): TailwindExtendLengthUnitsOption | undefined;
-export declare function normalizeTailwindcssPatcherOptions(options?: CompatTailwindCssPatchOptions | LegacyTailwindcssPatcherOptions): TailwindCssPatchOptions | undefined;
-export declare function toModernTailwindcssPatchOptions(options?: CompatTailwindCssPatchOptions): TailwindCssPatchOptions | undefined;
+export declare function normalizeTailwindcssPatcherOptions(options?: TailwindCssPatchOptions): TailwindCssPatchOptions | undefined;
 export {};

package/dist/tailwindcss/patcher.d.ts

@@ -1,5 +1,4 @@
 import type { ILengthUnitsPatchOptions, TailwindCssPatchOptions } from 'tailwindcss-patch';
-import type { LegacyTailwindcssPatcherOptions } from './patcher-options';
 import type { TailwindcssPatcherLike } from '../types';
 type TailwindUserOptions = NonNullable<TailwindCssPatchOptions['tailwindcss']>;
 export interface CreateTailwindcssPatcherOptions {
@@ -7,7 +6,7 @@ export interface CreateTailwindcssPatcherOptions {
     cacheDir?: string;
     supportCustomLengthUnitsPatch?: boolean | ILengthUnitsPatchOptions;
     tailwindcss?: TailwindUserOptions;
-    tailwindcssPatcherOptions?: TailwindCssPatchOptions | LegacyTailwindcssPatcherOptions;
+    tailwindcssPatcherOptions?: TailwindCssPatchOptions;
 }
 export declare function createTailwindcssPatcher(options?: CreateTailwindcssPatcherOptions): TailwindcssPatcherLike;
 export {};

package/dist/tailwindcss/v4/patcher-options.d.ts

@@ -1,24 +1,2 @@
 import type { TailwindCssPatchOptions } from 'tailwindcss-patch';
-type TailwindUserOptions = NonNullable<TailwindCssPatchOptions['tailwindcss']>;
-export interface LegacyTailwindcssPatcherOptionsLike {
-    patch?: {
-        basedir?: string;
-        cwd?: string;
-        tailwindcss?: TailwindUserOptions & {
-            v4?: {
-                base?: string;
-                cssEntries?: string[];
-                sources?: Array<{
-                    base?: string;
-                    pattern: string;
-                    negated?: boolean;
-                }>;
-            };
-        };
-        [key: string]: unknown;
-    };
-    [key: string]: unknown;
-}
-type TailwindcssPatcherOptionsForBase = TailwindCssPatchOptions | LegacyTailwindcssPatcherOptionsLike | undefined;
-export declare function overrideTailwindcssPatcherOptionsForBase(options: TailwindcssPatcherOptionsForBase, baseDir: string, cssEntries: string[]): TailwindcssPatcherOptionsForBase;
-export {};
+export declare function overrideTailwindcssPatcherOptionsForBase(options: TailwindCssPatchOptions | undefined, baseDir: string, cssEntries: string[]): TailwindCssPatchOptions | undefined;

package/dist/tailwindcss/v4/patcher.d.ts

@@ -9,6 +9,7 @@ export interface TailwindcssPatcherFactoryOptions {
     tailwindcssPatcherOptions?: CreateTailwindcssPatcherOptions['tailwindcssPatcherOptions'];
     supportCustomLengthUnitsPatch: InternalUserDefinedOptions['supportCustomLengthUnitsPatch'];
     appType: InternalUserDefinedOptions['appType'];
+    bareArbitraryValues?: InternalUserDefinedOptions['arbitraryValues']['bareArbitraryValues'];
 }
 export declare function createPatcherForBase(baseDir: string, cssEntries: string[] | undefined, options: TailwindcssPatcherFactoryOptions): TailwindcssPatcherLike;
 export declare function tryCreateMultiTailwindcssPatcher(groups: Map<string, string[]>, options: TailwindcssPatcherFactoryOptions): TailwindcssPatcherLike | undefined;

package/dist/tailwindcss/v4-engine/types.d.ts

@@ -5,7 +5,7 @@ export interface TailwindV4GenerateOptions extends PatchTailwindV4GenerateOption
     target?: TailwindV4GenerateTarget;
     styleOptions?: Partial<IStyleHandlerOptions>;
     tailwindcssV3Compatibility?: boolean;
-    scanSources?: boolean;
+    scanSources?: PatchTailwindV4GenerateOptions['scanSources'];
 }
 export interface TailwindV4GenerateResult extends Omit<PatchTailwindV4GenerateResult, 'css'> {
     css: string;

package/dist/tailwindcss/version.d.ts

@@ -0,0 +1,4 @@
+export type SupportedTailwindcssMajorVersion = 3 | 4;
+export declare const DEFAULT_TAILWINDCSS_GENERATOR_MAJOR_VERSION: SupportedTailwindcssMajorVersion;
+export declare function normalizeSupportedTailwindcssMajorVersion(version: number | undefined): SupportedTailwindcssMajorVersion | undefined;
+export declare function readInstalledPackageMajorVersion(packageName: string, base: string): SupportedTailwindcssMajorVersion | undefined;

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 {
@@ -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;

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[];
+    };
 }