weapp-tailwindcss 5.0.0 → 5.0.2

package/dist/index.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator--0-ekuVO.js");
+const require_generator = require("./generator-Bd1LntD3.js");
 const require_gulp = require("./gulp.js");
-const require_postcss = require("./postcss-hYimKoN_.js");
-const require_vite = require("./vite-Ec0uX6kF.js");
-const require_webpack = require("./webpack-Ccohlg3A.js");
+const require_postcss = require("./postcss-DfnqZ4Bm.js");
+const require_vite = require("./vite-D1ZdgbWa.js");
+const require_webpack = require("./webpack-vk2uqSnK.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-B76ovqsv.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-DRHWC1t-.mjs";
 import { WeappTailwindcss as createPlugins } from "./gulp.mjs";
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-CR9UCaIK.mjs";
-import { t as WeappTailwindcss } from "./vite-DOprpdH-.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-DFlZcqAU.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-CJrmfXvi.mjs";
+import { t as WeappTailwindcss } from "./vite-jBTi5CwO.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-CChDqRrl.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
 export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/{postcss-CR9UCaIK.mjs → postcss-CJrmfXvi.mjs}

@@ -1,5 +1,5 @@
-import { A as collectCssInlineSourceCandidates, F as parseConfigParam, H as readInstalledPackageMajorVersion, I as resolveCssSourceEntries, M as expandTailwindSourceEntries, O as DEFAULT_SOURCE_SCAN_EXTENSIONS, P as normalizeLegacyContentEntries, j as createSourceScanPattern, t as resolveTailwindV3Source, y as resolveTailwindV4Source$1 } from "./v3-engine-DCxNPBVs.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-B76ovqsv.mjs";
+import { $ as createSourceScanPattern, Q as collectCssInlineSourceCandidates, X as DEFAULT_SOURCE_SCAN_EXTENSIONS, et as expandTailwindSourceEntries, it as resolveCssSourceEntries, nt as normalizeLegacyContentEntries, rt as parseConfigParam, t as resolveTailwindV3Source, ut as readInstalledPackageMajorVersion, y as resolveTailwindV4Source$1 } from "./v3-engine-BCUGX3gX.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-DRHWC1t-.mjs";
 import postcss from "postcss";
 import { extractRawCandidatesWithPositions, extractValidCandidates } from "tailwindcss-patch";
 import process from "node:process";
@@ -83,7 +83,7 @@ async function collectConfigContentFiles(root, base, options) {
 		const contentEntries = normalizeLegacyContentEntries((await loadConfig({
 			config: configPath,
 			cwd: path.dirname(configPath)
-		}))?.config.content, path.dirname(configPath));
+		}))?.config.content, options.version === 3 ? options.projectRoot ?? base : path.dirname(configPath), { relativeBase: path.dirname(configPath) });
 		files.push(...await expandTailwindSourceEntries(contentEntries));
 	}
 	return {
@@ -98,7 +98,7 @@ async function collectConfiguredContentEntries(root, base, options) {
 	return normalizeLegacyContentEntries((await loadConfig({
 		config: resolvedConfigPath,
 		cwd: path.dirname(resolvedConfigPath)
-	}))?.config.content, path.dirname(resolvedConfigPath));
+	}))?.config.content, options.version === 3 ? options.projectRoot ?? base : path.dirname(resolvedConfigPath), { relativeBase: path.dirname(resolvedConfigPath) });
 }
 async function collectRawCandidatesFromSourceEntries(sourceEntries) {
 	const candidates = /* @__PURE__ */ new Set();

package/dist/{postcss-hYimKoN_.js → postcss-DfnqZ4Bm.js}

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
-const require_generator = require("./generator--0-ekuVO.js");
+const require_v3_engine = require("./v3-engine-CmIF_gsq.js");
+const require_generator = require("./generator-Bd1LntD3.js");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
 let tailwindcss_patch = require("tailwindcss-patch");
@@ -87,7 +87,7 @@ async function collectConfigContentFiles(root, base, options) {
 		const contentEntries = require_v3_engine.normalizeLegacyContentEntries((await (0, tailwindcss_config.loadConfig)({
 			config: configPath,
 			cwd: node_path.default.dirname(configPath)
-		}))?.config.content, node_path.default.dirname(configPath));
+		}))?.config.content, options.version === 3 ? options.projectRoot ?? base : node_path.default.dirname(configPath), { relativeBase: node_path.default.dirname(configPath) });
 		files.push(...await require_v3_engine.expandTailwindSourceEntries(contentEntries));
 	}
 	return {
@@ -102,7 +102,7 @@ async function collectConfiguredContentEntries(root, base, options) {
 	return require_v3_engine.normalizeLegacyContentEntries((await (0, tailwindcss_config.loadConfig)({
 		config: resolvedConfigPath,
 		cwd: node_path.default.dirname(resolvedConfigPath)
-	}))?.config.content, node_path.default.dirname(resolvedConfigPath));
+	}))?.config.content, options.version === 3 ? options.projectRoot ?? base : node_path.default.dirname(resolvedConfigPath), { relativeBase: node_path.default.dirname(resolvedConfigPath) });
 }
 async function collectRawCandidatesFromSourceEntries(sourceEntries) {
 	const candidates = /* @__PURE__ */ new Set();

package/dist/postcss.js

@@ -2,6 +2,6 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_postcss = require("./postcss-hYimKoN_.js");
+const require_postcss = require("./postcss-DfnqZ4Bm.js");
 exports.default = require_postcss.weappTailwindcssPostcssPlugin;
 exports.weappTailwindcssPostcssPlugin = require_postcss.weappTailwindcssPostcssPlugin;

package/dist/postcss.mjs

@@ -1,2 +1,2 @@
-import { t as weappTailwindcssPostcssPlugin } from "./postcss-CR9UCaIK.mjs";
+import { t as weappTailwindcssPostcssPlugin } from "./postcss-CJrmfXvi.mjs";
 export { weappTailwindcssPostcssPlugin as default, weappTailwindcssPostcssPlugin };

package/dist/{precheck-DPtJjZmV.js → precheck-Bj5ReSOU.js}

@@ -1,8 +1,8 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
+const require_v3_engine = require("./v3-engine-CmIF_gsq.js");
 const require_defaults = require("./defaults-zKUH2mDe.js");
 require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-glCm_d3H.js");
+const require_tailwindcss = require("./tailwindcss-jvoYizzX.js");
 let tailwindcss_patch = require("tailwindcss-patch");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/{precheck-BrNwLG2e.mjs → precheck-CUr1DYyy.mjs}

@@ -1,7 +1,7 @@
-import { B as createDebug, C as createTailwindV4Engine$1, K as resolveBooleanObjectOption, c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, q as omitUndefined, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-DCxNPBVs.mjs";
+import { G as createTailwindV4Engine$1, c as getRuntimeClassSetCacheEntry, ct as createDebug, d as invalidateRuntimeClassSet, ht as omitUndefined, mt as resolveBooleanObjectOption, s as ensureTailwindcssRuntimePatch, u as getRuntimeClassSetSignatureWithSources, x as resolveTailwindV4SourceFromPatcher } from "./v3-engine-BCUGX3gX.mjs";
 import { a as resolveDefaultCssPreflight, i as getDefaultOptions, o as DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH, s as HARD_PARSE_CACHE_MAX_ENTRIES } from "./defaults-8xrgzxFY.mjs";
 import { i as isMap, n as defuOverrideArray } from "./utils-DsaS975I.mjs";
-import { a as applyV4CssCalcDefaults, i as resolveUniAppXOptions, o as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-DWtPieNE.mjs";
+import { i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-D5RogwtV.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "tailwindcss-patch";
 import process from "node:process";

package/dist/presets.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
+const require_v3_engine = require("./v3-engine-CmIF_gsq.js");
 const require_utils = require("./utils-D7Ygohep.js");
-const require_tailwindcss = require("./tailwindcss-glCm_d3H.js");
+const require_tailwindcss = require("./tailwindcss-jvoYizzX.js");
 require("./logger-TlKT3xmR.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/presets.mjs

@@ -1,6 +1,6 @@
-import { q as omitUndefined } from "./v3-engine-DCxNPBVs.mjs";
+import { ht as omitUndefined } from "./v3-engine-BCUGX3gX.mjs";
 import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DWtPieNE.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-D5RogwtV.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import process from "node:process";
 import path from "node:path";

package/dist/{source-candidates-DN1mihlU.mjs → source-candidates-D7b-Jzsx.mjs}

@@ -1,4 +1,5 @@
-import { L as resolveSourceScanPath, N as isFileMatchedByTailwindSourceEntries, k as FULL_SOURCE_SCAN_EXTENSION_RE, z as toPosixPath } from "./v3-engine-DCxNPBVs.mjs";
+import { Z as FULL_SOURCE_SCAN_EXTENSION_RE, at as resolveSourceScanPath, st as toPosixPath, tt as isFileMatchedByTailwindSourceEntries } from "./v3-engine-BCUGX3gX.mjs";
+import { createRequire } from "node:module";
 import { extractSourceCandidates, resolveProjectSourceFiles } from "tailwindcss-patch";
 import path from "node:path";
 import { readFile } from "node:fs/promises";
@@ -48,6 +49,23 @@ const TAILWIND_V4_IGNORED_FILES = [
 	".env.*"
 ];
 const sourceCandidateContentCache = /* @__PURE__ */ new Map();
+const require = createRequire(import.meta.url);
+const TAILWIND_V3_HTML_TOKEN_CANDIDATES = new Set([
+	"/block",
+	"/div",
+	"/span",
+	"/template",
+	"/text",
+	"/view",
+	"class",
+	"className",
+	"div",
+	"hover-class",
+	"span",
+	"template",
+	"text",
+	"view"
+]);
 function cleanUrl(id) {
 	return resolveSourceScanPath(id.replace(CLEAN_URL_RE, ""));
 }
@@ -105,8 +123,23 @@ function resolveSourceCandidateExtension(id) {
 	const normalized = cleanUrl(id);
 	return /\.([^.\\/]+)$/.exec(normalized)?.[1] ?? "html";
 }
-function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues) {
-	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${source}`;
+function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, extractor) {
+	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${extractor ? "custom" : "default"}\0${source}`;
+}
+async function extractCandidates(source, extension, options) {
+	if (options.extractor) return new Set(await options.extractor(source, extension));
+	return new Set(await extractSourceCandidates(source, extension, { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } }));
+}
+function createTailwindV3DefaultExtractor() {
+	try {
+		const defaultExtractorModule = require("tailwindcss/lib/lib/defaultExtractor");
+		const resolveConfigModule = require("tailwindcss/resolveConfig");
+		const resolveConfig = resolveConfigModule.default ?? resolveConfigModule;
+		const extractor = (defaultExtractorModule.defaultExtractor ?? defaultExtractorModule.default ?? defaultExtractorModule)({ tailwindConfig: resolveConfig({ content: [] }) });
+		return (source) => new Set(extractor(source).filter((candidate) => !TAILWIND_V3_HTML_TOKEN_CANDIDATES.has(candidate)));
+	} catch {
+		return;
+	}
 }
 function isSourceCandidateRequest(id) {
 	return FULL_SOURCE_SCAN_EXTENSION_RE.test(cleanUrl(id));
@@ -136,34 +169,34 @@ function createSourceCandidateCollector(options = {}) {
 	async function sync(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceScanLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await extractSourceCandidates(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
+		const nextCandidates = await extractCandidates(source, extension, options);
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceScanLayer(normalizedId, nextCandidates);
 	}
 	async function syncCss(id, source) {
 		const normalizedId = cleanUrl(id);
-		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues);
+		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceCssLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await extractSourceCandidates(source, "css", { bareArbitraryValues: options.bareArbitraryValues }));
+		const nextCandidates = await extractCandidates(source, "css", options);
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceCssLayer(normalizedId, nextCandidates);
 	}
 	async function merge(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
-		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : new Set(await extractSourceCandidates(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
+		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : await extractCandidates(source, extension, options);
 		if (!cachedCandidates) sourceCandidateContentCache.set(contentCacheKey, [...extractedCandidates]);
 		replaceTransformLayer(normalizedId, extractedCandidates);
 	}
@@ -187,7 +220,7 @@ function createSourceCandidateCollector(options = {}) {
 			...ignoredSources.length > 0 ? { ignoredSources } : {},
 			filter: isSourceCandidateRequest
 		});
-		await Promise.all(files.map((file) => syncFile(file)));
+		await Promise.all(files.map((file) => syncFile(resolveSourceScanPath(file))));
 	}
 	function replaceFinal(id, nextCandidates) {
 		const normalizedId = cleanUrl(id);
@@ -319,4 +352,4 @@ function createSourceCandidateCollector(options = {}) {
 	};
 }
 //#endregion
-export { isSourceCandidateRequest as n, createSourceCandidateCollector as t };
+export { createTailwindV3DefaultExtractor as n, isSourceCandidateRequest as r, createSourceCandidateCollector as t };

package/dist/{source-candidates-DSxme_O2.js → source-candidates-DQxvGPSw.js}

@@ -1,5 +1,6 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
+const require_v3_engine = require("./v3-engine-CmIF_gsq.js");
+let node_module = require("node:module");
 let tailwindcss_patch = require("tailwindcss-patch");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
@@ -50,6 +51,23 @@ const TAILWIND_V4_IGNORED_FILES = [
 	".env.*"
 ];
 const sourceCandidateContentCache = /* @__PURE__ */ new Map();
+const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+const TAILWIND_V3_HTML_TOKEN_CANDIDATES = new Set([
+	"/block",
+	"/div",
+	"/span",
+	"/template",
+	"/text",
+	"/view",
+	"class",
+	"className",
+	"div",
+	"hover-class",
+	"span",
+	"template",
+	"text",
+	"view"
+]);
 function cleanUrl(id) {
 	return require_v3_engine.resolveSourceScanPath(id.replace(CLEAN_URL_RE, ""));
 }
@@ -107,8 +125,23 @@ function resolveSourceCandidateExtension(id) {
 	const normalized = cleanUrl(id);
 	return /\.([^.\\/]+)$/.exec(normalized)?.[1] ?? "html";
 }
-function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues) {
-	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${source}`;
+function createSourceCandidateContentCacheKey(extension, source, bareArbitraryValues, extractor) {
+	return `${extension}\0${JSON.stringify(bareArbitraryValues ?? false)}\0${extractor ? "custom" : "default"}\0${source}`;
+}
+async function extractCandidates(source, extension, options) {
+	if (options.extractor) return new Set(await options.extractor(source, extension));
+	return new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, extension, { ...options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } }));
+}
+function createTailwindV3DefaultExtractor() {
+	try {
+		const defaultExtractorModule = require$1("tailwindcss/lib/lib/defaultExtractor");
+		const resolveConfigModule = require$1("tailwindcss/resolveConfig");
+		const resolveConfig = resolveConfigModule.default ?? resolveConfigModule;
+		const extractor = (defaultExtractorModule.defaultExtractor ?? defaultExtractorModule.default ?? defaultExtractorModule)({ tailwindConfig: resolveConfig({ content: [] }) });
+		return (source) => new Set(extractor(source).filter((candidate) => !TAILWIND_V3_HTML_TOKEN_CANDIDATES.has(candidate)));
+	} catch {
+		return;
+	}
 }
 function isSourceCandidateRequest(id) {
 	return require_v3_engine.FULL_SOURCE_SCAN_EXTENSION_RE.test(cleanUrl(id));
@@ -138,34 +171,34 @@ function createSourceCandidateCollector(options = {}) {
 	async function sync(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceScanLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
+		const nextCandidates = await extractCandidates(source, extension, options);
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceScanLayer(normalizedId, nextCandidates);
 	}
 	async function syncCss(id, source) {
 		const normalizedId = cleanUrl(id);
-		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues);
+		const contentCacheKey = createSourceCandidateContentCacheKey("css", source, options.bareArbitraryValues, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
 		if (cachedCandidates) {
 			replaceCssLayer(normalizedId, new Set(cachedCandidates));
 			return;
 		}
-		const nextCandidates = new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, "css", { bareArbitraryValues: options.bareArbitraryValues }));
+		const nextCandidates = await extractCandidates(source, "css", options);
 		sourceCandidateContentCache.set(contentCacheKey, [...nextCandidates]);
 		replaceCssLayer(normalizedId, nextCandidates);
 	}
 	async function merge(id, source) {
 		const normalizedId = cleanUrl(id);
 		const extension = resolveSourceCandidateExtension(normalizedId);
-		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues);
+		const contentCacheKey = createSourceCandidateContentCacheKey(extension, source, options.bareArbitraryValues, options.extractor);
 		const cachedCandidates = sourceCandidateContentCache.get(contentCacheKey);
-		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : new Set(await (0, tailwindcss_patch.extractSourceCandidates)(source, extension, { bareArbitraryValues: options.bareArbitraryValues }));
+		const extractedCandidates = cachedCandidates ? new Set(cachedCandidates) : await extractCandidates(source, extension, options);
 		if (!cachedCandidates) sourceCandidateContentCache.set(contentCacheKey, [...extractedCandidates]);
 		replaceTransformLayer(normalizedId, extractedCandidates);
 	}
@@ -189,7 +222,7 @@ function createSourceCandidateCollector(options = {}) {
 			...ignoredSources.length > 0 ? { ignoredSources } : {},
 			filter: isSourceCandidateRequest
 		});
-		await Promise.all(files.map((file) => syncFile(file)));
+		await Promise.all(files.map((file) => syncFile(require_v3_engine.resolveSourceScanPath(file))));
 	}
 	function replaceFinal(id, nextCandidates) {
 		const normalizedId = cleanUrl(id);
@@ -327,6 +360,12 @@ Object.defineProperty(exports, "createSourceCandidateCollector", {
 		return createSourceCandidateCollector;
 	}
 });
+Object.defineProperty(exports, "createTailwindV3DefaultExtractor", {
+	enumerable: true,
+	get: function() {
+		return createTailwindV3DefaultExtractor;
+	}
+});
 Object.defineProperty(exports, "isSourceCandidateRequest", {
 	enumerable: true,
 	get: function() {

package/dist/tailwindcss/source-scan.d.ts

@@ -23,7 +23,9 @@ export declare function resolveTailwindV4CssSourceBase(source: Pick<TailwindV4Cs
 export declare function parseConfigParam(params: string): string | undefined;
 export declare function expandInlineSourceCandidatePattern(pattern: string): string[];
 export declare function collectCssInlineSourceCandidates(root: Root): TailwindInlineSourceCandidates;
-export declare function normalizeLegacyContentEntries(content: unknown, base: string): TailwindSourceEntry[];
+export declare function normalizeLegacyContentEntries(content: unknown, base: string, options?: {
+    relativeBase?: string | undefined;
+}): TailwindSourceEntry[];
 export declare function resolveTailwindSourceEntry(sourcePath: string, base: string, negated: boolean, defaultPattern?: string): Promise<TailwindSourceEntry>;
 export declare function parseSourceFileParam(params: string): {
     negated: boolean;

package/dist/{tailwindcss-DWtPieNE.mjs → tailwindcss-D5RogwtV.mjs}

@@ -1,4 +1,4 @@
-import { G as normalizeStringListOption, H as readInstalledPackageMajorVersion, J as findNearestPackageRoot, V as createTailwindcssPatcher, X as findWorkspaceRoot, Y as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, q as omitUndefined } from "./v3-engine-DCxNPBVs.mjs";
+import { _t as findWorkspacePackageDir, f as runtimeSignaturePatchersSymbol, gt as findNearestPackageRoot, ht as omitUndefined, lt as createTailwindcssPatcher, pt as normalizeStringListOption, ut as readInstalledPackageMajorVersion, vt as findWorkspaceRoot } from "./v3-engine-BCUGX3gX.mjs";
 import { n as defuOverrideArray } from "./utils-DsaS975I.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";
@@ -265,27 +265,16 @@ function groupCssEntriesByBase(entries, options = {}) {
 }
 //#endregion
 //#region src/tailwindcss/v4/patcher.ts
-const CONFIGURED_TAILWIND_VERSION_RE = /Configured tailwindcss\.version=\d+/u;
-const RESOLVED_TAILWIND_VERSION_RE = /resolved package ".+" is version /u;
 function isTailwindcss4Package(packageName) {
 	return Boolean(packageName && (packageName === "tailwindcss4" || packageName === "@tailwindcss/postcss" || packageName.includes("tailwindcss4")));
 }
 function resolveExplicitTailwindVersion(configuredVersion, configuredPackageName) {
 	if (typeof configuredVersion === "number") return configuredVersion;
-	if (configuredPackageName === "tailwindcss") return 3;
 	if (isTailwindcss4Package(configuredPackageName)) return 4;
 }
-function hasOwnV4Signal(value) {
-	return typeof value === "object" && value !== null && "v4" in value;
-}
-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, bareArbitraryValues } = options;
 	const hasCssEntries = Boolean(cssEntries?.length);
-	const configuredV4Options = tailwindcss?.v4 ?? tailwindcssPatcherOptions?.tailwindcss?.v4;
-	const hasCssSources = Boolean(configuredV4Options?.cssSources?.length);
 	const defaultTailwindcssConfig = {
 		cwd: baseDir,
 		v2: { cwd: baseDir },
@@ -311,43 +300,19 @@ function createPatcherForBase(baseDir, cssEntries, options) {
 	const patchedOptions = overrideTailwindcssPatcherOptionsForBase(tailwindcssPatcherOptions, baseDir, cssEntries ?? []);
 	const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwindcss?.packageName;
 	const explicitTailwindVersion = resolveExplicitTailwindVersion(tailwindcss?.version || tailwindcssPatcherOptions?.tailwindcss?.version || mergedTailwindOptions.version, configuredPackageName);
-	const hasExplicitV4Signals = hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss);
-	const packageNameForVersionDetection = configuredPackageName ?? mergedTailwindOptions.packageName ?? "tailwindcss";
-	const installedTailwindVersion = readInstalledPackageMajorVersion(packageNameForVersionDetection, baseDir);
-	const resolvedTailwindVersion = installedTailwindVersion ?? explicitTailwindVersion;
+	const resolvedTailwindVersion = readInstalledPackageMajorVersion(configuredPackageName ?? mergedTailwindOptions.packageName ?? "tailwindcss", baseDir) ?? explicitTailwindVersion;
 	const supportedResolvedTailwindVersion = resolvedTailwindVersion === 2 || resolvedTailwindVersion === 3 || resolvedTailwindVersion === 4 ? resolvedTailwindVersion : void 0;
-	const shouldPatchV4PostcssPackage = (resolvedTailwindVersion === 4 && (installedTailwindVersion === 4 || explicitTailwindVersion === 4 || hasExplicitV4Signals && isTailwindcss4Package(packageNameForVersionDetection)) || resolvedTailwindVersion === void 0 && (hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss))) && !Boolean(configuredPackageName);
-	const packageCandidates = /* @__PURE__ */ new Set();
-	if (shouldPatchV4PostcssPackage) packageCandidates.add("@tailwindcss/postcss");
-	packageCandidates.add(mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss");
-	const patchers = [];
-	const packageCandidateList = [...packageCandidates];
-	let firstVersionMismatchError;
-	for (const packageName of packageCandidateList) {
-		const tailwindOptionsForPackage = {
-			...mergedTailwindOptions,
-			packageName
-		};
-		if (supportedResolvedTailwindVersion) tailwindOptionsForPackage.version = supportedResolvedTailwindVersion;
-		try {
-			patchers.push(createTailwindcssPatcher(omitUndefined({
-				basedir: baseDir,
-				supportCustomLengthUnitsPatch: supportCustomLengthUnitsPatch ?? true,
-				tailwindcss: tailwindOptionsForPackage,
-				tailwindcssPatcherOptions: patchedOptions
-			})));
-		} catch (error) {
-			if (packageCandidateList.length > 1 && isTailwindVersionMismatchError(error)) {
-				firstVersionMismatchError ?? (firstVersionMismatchError = error);
-				logger.warn("skip incompatible Tailwind package candidate \"%s\" for v4 patcher: %s", packageName, error.message);
-				continue;
-			}
-			throw error;
-		}
-	}
-	if (patchers.length === 0 && firstVersionMismatchError) throw firstVersionMismatchError;
-	const [singlePatcher] = patchers;
-	return patchers.length === 1 && singlePatcher ? singlePatcher : createMultiTailwindcssPatcher(patchers);
+	const tailwindOptionsForPackage = {
+		...mergedTailwindOptions,
+		packageName: mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss"
+	};
+	if (supportedResolvedTailwindVersion) tailwindOptionsForPackage.version = supportedResolvedTailwindVersion;
+	return createTailwindcssPatcher(omitUndefined({
+		basedir: baseDir,
+		supportCustomLengthUnitsPatch: supportCustomLengthUnitsPatch ?? true,
+		tailwindcss: tailwindOptionsForPackage,
+		tailwindcssPatcherOptions: patchedOptions
+	}));
 }
 function tryCreateMultiTailwindcssPatcher(groups, options) {
 	if (groups.size <= 1) return;
@@ -588,4 +553,4 @@ function createTailwindcssPatcherFromContext(ctx) {
 	return createPatcherForBase(resolvedTailwindcssBasedir, normalizedCssEntries ?? rawCssEntries, patcherOptions);
 }
 //#endregion
-export { applyV4CssCalcDefaults as a, upsertTailwindV4CssSource as c, resolveUniAppXOptions as i, resolveTailwindcssBasedir as n, warnMissingCssEntries as o, isUniAppXEnabled as r, hasConfiguredTailwindV4CssRoots as s, createTailwindcssPatcherFromContext as t };
+export { normalizeCssEntries as a, hasConfiguredTailwindV4CssRoots as c, resolveUniAppXOptions as i, upsertTailwindV4CssSource as l, resolveTailwindcssBasedir as n, applyV4CssCalcDefaults as o, isUniAppXEnabled as r, warnMissingCssEntries as s, createTailwindcssPatcherFromContext as t };

package/dist/{tailwindcss-glCm_d3H.js → tailwindcss-jvoYizzX.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-C5U5_Hdc.js");
-const require_v3_engine = require("./v3-engine-D3BMLVAN.js");
+const require_v3_engine = require("./v3-engine-CmIF_gsq.js");
 require("./utils-D7Ygohep.js");
 let node_fs = require("node:fs");
 let node_module = require("node:module");
@@ -269,27 +269,16 @@ function groupCssEntriesByBase(entries, options = {}) {
 }
 //#endregion
 //#region src/tailwindcss/v4/patcher.ts
-const CONFIGURED_TAILWIND_VERSION_RE = /Configured tailwindcss\.version=\d+/u;
-const RESOLVED_TAILWIND_VERSION_RE = /resolved package ".+" is version /u;
 function isTailwindcss4Package(packageName) {
 	return Boolean(packageName && (packageName === "tailwindcss4" || packageName === "@tailwindcss/postcss" || packageName.includes("tailwindcss4")));
 }
 function resolveExplicitTailwindVersion(configuredVersion, configuredPackageName) {
 	if (typeof configuredVersion === "number") return configuredVersion;
-	if (configuredPackageName === "tailwindcss") return 3;
 	if (isTailwindcss4Package(configuredPackageName)) return 4;
 }
-function hasOwnV4Signal(value) {
-	return typeof value === "object" && value !== null && "v4" in value;
-}
-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, bareArbitraryValues } = options;
 	const hasCssEntries = Boolean(cssEntries?.length);
-	const configuredV4Options = tailwindcss?.v4 ?? tailwindcssPatcherOptions?.tailwindcss?.v4;
-	const hasCssSources = Boolean(configuredV4Options?.cssSources?.length);
 	const defaultTailwindcssConfig = {
 		cwd: baseDir,
 		v2: { cwd: baseDir },
@@ -315,43 +304,19 @@ function createPatcherForBase(baseDir, cssEntries, options) {
 	const patchedOptions = overrideTailwindcssPatcherOptionsForBase(tailwindcssPatcherOptions, baseDir, cssEntries ?? []);
 	const configuredPackageName = tailwindcss?.packageName || tailwindcssPatcherOptions?.tailwindcss?.packageName;
 	const explicitTailwindVersion = resolveExplicitTailwindVersion(tailwindcss?.version || tailwindcssPatcherOptions?.tailwindcss?.version || mergedTailwindOptions.version, configuredPackageName);
-	const hasExplicitV4Signals = hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss);
-	const packageNameForVersionDetection = configuredPackageName ?? mergedTailwindOptions.packageName ?? "tailwindcss";
-	const installedTailwindVersion = require_v3_engine.readInstalledPackageMajorVersion(packageNameForVersionDetection, baseDir);
-	const resolvedTailwindVersion = installedTailwindVersion ?? explicitTailwindVersion;
+	const resolvedTailwindVersion = require_v3_engine.readInstalledPackageMajorVersion(configuredPackageName ?? mergedTailwindOptions.packageName ?? "tailwindcss", baseDir) ?? explicitTailwindVersion;
 	const supportedResolvedTailwindVersion = resolvedTailwindVersion === 2 || resolvedTailwindVersion === 3 || resolvedTailwindVersion === 4 ? resolvedTailwindVersion : void 0;
-	const shouldPatchV4PostcssPackage = (resolvedTailwindVersion === 4 && (installedTailwindVersion === 4 || explicitTailwindVersion === 4 || hasExplicitV4Signals && isTailwindcss4Package(packageNameForVersionDetection)) || resolvedTailwindVersion === void 0 && (hasCssEntries || hasCssSources || hasOwnV4Signal(tailwindcss) || hasOwnV4Signal(tailwindcssPatcherOptions?.tailwindcss))) && !Boolean(configuredPackageName);
-	const packageCandidates = /* @__PURE__ */ new Set();
-	if (shouldPatchV4PostcssPackage) packageCandidates.add("@tailwindcss/postcss");
-	packageCandidates.add(mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss");
-	const patchers = [];
-	const packageCandidateList = [...packageCandidates];
-	let firstVersionMismatchError;
-	for (const packageName of packageCandidateList) {
-		const tailwindOptionsForPackage = {
-			...mergedTailwindOptions,
-			packageName
-		};
-		if (supportedResolvedTailwindVersion) tailwindOptionsForPackage.version = supportedResolvedTailwindVersion;
-		try {
-			patchers.push(require_v3_engine.createTailwindcssPatcher(require_v3_engine.omitUndefined({
-				basedir: baseDir,
-				supportCustomLengthUnitsPatch: supportCustomLengthUnitsPatch ?? true,
-				tailwindcss: tailwindOptionsForPackage,
-				tailwindcssPatcherOptions: patchedOptions
-			})));
-		} catch (error) {
-			if (packageCandidateList.length > 1 && isTailwindVersionMismatchError(error)) {
-				firstVersionMismatchError ?? (firstVersionMismatchError = error);
-				_weapp_tailwindcss_logger.logger.warn("skip incompatible Tailwind package candidate \"%s\" for v4 patcher: %s", packageName, error.message);
-				continue;
-			}
-			throw error;
-		}
-	}
-	if (patchers.length === 0 && firstVersionMismatchError) throw firstVersionMismatchError;
-	const [singlePatcher] = patchers;
-	return patchers.length === 1 && singlePatcher ? singlePatcher : createMultiTailwindcssPatcher(patchers);
+	const tailwindOptionsForPackage = {
+		...mergedTailwindOptions,
+		packageName: mergedTailwindOptions.packageName ?? configuredPackageName ?? "tailwindcss"
+	};
+	if (supportedResolvedTailwindVersion) tailwindOptionsForPackage.version = supportedResolvedTailwindVersion;
+	return require_v3_engine.createTailwindcssPatcher(require_v3_engine.omitUndefined({
+		basedir: baseDir,
+		supportCustomLengthUnitsPatch: supportCustomLengthUnitsPatch ?? true,
+		tailwindcss: tailwindOptionsForPackage,
+		tailwindcssPatcherOptions: patchedOptions
+	}));
 }
 function tryCreateMultiTailwindcssPatcher(groups, options) {
 	if (groups.size <= 1) return;
@@ -616,6 +581,12 @@ Object.defineProperty(exports, "isUniAppXEnabled", {
 		return isUniAppXEnabled;
 	}
 });
+Object.defineProperty(exports, "normalizeCssEntries", {
+	enumerable: true,
+	get: function() {
+		return normalizeCssEntries;
+	}
+});
 Object.defineProperty(exports, "resolveTailwindcssBasedir", {
 	enumerable: true,
 	get: function() {