weapp-tailwindcss 5.1.13 → 5.1.15

package/dist/rspack.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_webpack = require("./webpack-CzXjfvYS.js");
+const require_webpack = require("./webpack-nppysF4B.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 //#region src/bundlers/rspack/index.ts

package/dist/rspack.mjs

@@ -1,4 +1,4 @@
-import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-CTYm19zA.mjs";
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-C_UUFRgj.mjs";
 import path from "node:path";
 //#region src/bundlers/rspack/index.ts
 const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";

package/dist/shared/mpx.d.ts

@@ -1,7 +1,10 @@
 import type { AppType } from '../types';
+import path from 'node:path';
 export declare function isMpx(appType?: AppType): appType is "mpx";
 export declare function getTailwindcssCssEntry(pkgDir: string): string;
-export declare function patchMpxWebpackPluginNormalizeLib(compiler: any, mpxWebpackPluginDir: string | undefined): boolean;
+export declare function rewriteMpxWebpackPluginRequests(request: string, mpxWebpackPluginDir: string, pathImpl?: Pick<typeof path, 'join'>): string;
+export declare function patchMpxWebpackPluginRequests(compiler: any, mpxWebpackPluginDir: string | undefined): boolean;
+export declare function patchMpxWebpackPluginNormalizeLib(_compiler: any, mpxWebpackPluginDir: string | undefined): boolean;
 export declare function ensureMpxTailwindcssAliases(compiler: any, pkgDir: string): string;
 export declare function patchMpxLoaderResolve(loaderContext: any, pkgDir: string, enabled: boolean): void;
 export declare function setupMpxTailwindcssRedirect(pkgDir: string, enabled: boolean): void;

package/dist/{source-candidate-scan-signature-CMgu5bJk.js → source-candidate-scan-signature-BAahhiwb.js}

@@ -1,9 +1,9 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 const require_framework = require("./framework.js");
 require("./auto-DtU6f3X6.js");
-const require_tailwindcss = require("./tailwindcss-z9JMF-qU.js");
+const require_tailwindcss = require("./tailwindcss-KBYPJ2DW.js");
 const require_wxml = require("./wxml-Ce10eREX.js");
-const require_hmr_timing = require("./hmr-timing-DW1g3zjl.js");
+const require_hmr_timing = require("./hmr-timing-B8p4f0ca.js");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
@@ -229,39 +229,6 @@ function resolvePackageDir(name) {
 	return node_path.default.dirname(pkgPath);
 }
 //#endregion
-//#region src/bundlers/shared/generated-css-marker.ts
-const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
-const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
-const BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE = /\/\*!?\s*weapp-tailwindcss (vite|webpack)-generated-css(?:\s*:\s*([^\s*]+))?\s*\*\/\s*/gi;
-const VITE_INTERNAL_CSS_MARKER_GLOBAL_RE = /\/\*\$vite\$:\d+\*\/\s*/g;
-function createBundlerGeneratedCssMarker(bundler, file) {
-	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
-}
-function hasBundlerGeneratedCssMarker(source) {
-	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
-}
-function stripBundlerGeneratedCssMarkers(source) {
-	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
-}
-function parseBundlerGeneratedCssMarkerBlocks(source) {
-	const blocks = [];
-	BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex = 0;
-	let match = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-	while (match !== null) {
-		const cssStart = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex;
-		const nextMatch = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-		const cssEnd = nextMatch?.index ?? source.length;
-		const file = match[2] ? decodeURIComponent(match[2]) : void 0;
-		blocks.push({
-			bundler: match[1],
-			file,
-			css: source.slice(cssStart, cssEnd)
-		});
-		match = nextMatch;
-	}
-	return blocks;
-}
-//#endregion
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -306,30 +273,6 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
 	return matchWithExtensions(candidate, hasOutput);
 }
 //#endregion
-//#region src/bundlers/shared/style-requests.ts
-const SOURCE_STYLE_EXT_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)$/i;
-const STYLE_QUERY_RE = /(?:^|&)type=styles?(?:&|$)/;
-const STYLE_LANG_QUERY_RE = /(?:^|&)lang(?:[.=](?:css|scss|sass|less|styl|stylus|pcss|postcss))?(?:&|$)/;
-function stripHash(request) {
-	const hashIndex = request.indexOf("#");
-	return hashIndex === -1 ? request : request.slice(0, hashIndex);
-}
-function stripRequestQuery(request) {
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	return queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-}
-function isSourceStyleRequest(request) {
-	if (typeof request !== "string" || request.length === 0) return false;
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	const pathname = queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-	if (SOURCE_STYLE_EXT_RE.test(pathname)) return true;
-	if (queryIndex === -1) return false;
-	const query = normalized.slice(queryIndex + 1);
-	return STYLE_QUERY_RE.test(query) || STYLE_LANG_QUERY_RE.test(query);
-}
-//#endregion
 //#region src/bundlers/shared/v4-generation-core.ts
 async function generateTailwindV4Css(options) {
 	const majorVersion = options.runtimeState.tailwindRuntime.majorVersion;
@@ -476,7 +419,7 @@ const isWindows = node_process.default.platform === "win32";
 const cssLangRE = new RegExp(`\\.(?:css|less|sass|scss|styl|stylus|pcss|postcss)(?:$|\\?)`);
 const htmlLangRE = /\.html?(?:$|\?)/;
 function isCSSRequest(request) {
-	return cssLangRE.test(request) || isSourceStyleRequest(request);
+	return cssLangRE.test(request) || require_hmr_timing.isSourceStyleRequest(request);
 }
 function isHTMLRequest(request) {
 	return htmlLangRE.test(request);
@@ -510,6 +453,7 @@ function createBundleBuildState() {
 		runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
 		linkedByEntry: /* @__PURE__ */ new Map(),
 		dependentsByLinkedFile: /* @__PURE__ */ new Map(),
+		bundleMarkupCandidatesByFile: /* @__PURE__ */ new Map(),
 		generatorCandidateSignature: void 0
 	};
 }
@@ -530,7 +474,7 @@ function createProcessFiles() {
 }
 function readEntrySource(output) {
 	if (output.type === "chunk") return output.code;
-	return output.source.toString();
+	return typeof output.source === "string" ? output.source : node_buffer.Buffer.from(output.source).toString();
 }
 function classifyBundleEntry(file, opts) {
 	if (opts.htmlMatcher(file) || isHTMLRequest(file)) return "html";
@@ -706,78 +650,51 @@ function createLocalSourceEntries(sourceFile) {
 	}];
 }
 function intersectCandidates(first, second) {
-	const scoped = /* @__PURE__ */ new Set();
+	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Set();
 	const [small, large] = first.size <= second.size ? [first, second] : [second, first];
+	const scoped = /* @__PURE__ */ new Set();
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
-function intersectCandidateSourceMaps(first, second) {
-	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Map();
-	const scoped = /* @__PURE__ */ new Map();
-	for (const [candidate, sources] of first) if (second.has(candidate)) scoped.set(candidate, sources);
-	return scoped;
-}
 function mergeCandidates(first, second) {
 	return /* @__PURE__ */ new Set([...first, ...second]);
 }
-function intersectExplicitSourceCandidates(scopedCandidates, localCandidates) {
-	if (localCandidates.size === 0 && scopedCandidates.size > 0) return scopedCandidates;
-	return intersectCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates) {
-	if (scopedCandidates.size === 0 && localCandidates.size === 0 && fallbackCandidates?.size) return fallbackCandidates;
-	return intersectExplicitSourceCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceMaps(scopedSources, localSources, fallbackSources) {
-	if (scopedSources.size === 0 && localSources.size === 0 && fallbackSources?.size) return fallbackSources;
-	if (localSources.size === 0 && scopedSources.size > 0) return scopedSources;
-	return intersectCandidateSourceMaps(scopedSources, localSources);
+function canFallbackToOutputCandidates(rawSource, entries) {
+	return rawSource.includes("@source") && entries.length > 0 && entries.every((entry) => !entry.negated);
 }
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
 		localEntries: void 0
 	};
-	const localEntries = createLocalSourceEntries(sourceFile);
-	if (!resolvedEntries || resolvedEntries.length === 0) return {
-		entries: localEntries,
-		localEntries: void 0
-	};
-	return {
-		entries: resolvedEntries,
-		localEntries
-	};
+	if (resolvedEntries !== void 0) return { entries: resolvedEntries };
+	return { entries: createLocalSourceEntries(sourceFile) };
 }
 async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile) {
 	return resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(rawSource, node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 }
 async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fallbackSignature, getSourceCandidatesForEntries, options = {}) {
 	if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource)) return fallbackSignature;
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return fallbackSignature;
-	const scopedCandidates = getSourceCandidatesForEntries(entries);
-	const scopedSignature = createCandidateSignature(localEntries ? resolveExplicitSourceCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries), getSourceCandidatesForEntries(void 0)) : scopedCandidates);
+	const scopedSignature = createCandidateSignature(getSourceCandidatesForEntries(entries));
 	return options.includeFallbackSignature === true ? `${scopedSignature}:${fallbackSignature}` : scopedSignature;
 }
 async function createScopedGeneratorSourceTraceMap(rawSource, sourceFile, getSourceCandidateSourcesForEntries) {
 	if (!getSourceCandidateSourcesForEntries || !hasOwnSourceDirectives(rawSource)) return getSourceCandidateSourcesForEntries?.(void 0);
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return getSourceCandidateSourcesForEntries(void 0);
-	const scopedSources = getSourceCandidateSourcesForEntries(entries);
-	return localEntries ? resolveExplicitSourceMaps(scopedSources, getSourceCandidateSourcesForEntries(localEntries), getSourceCandidateSourcesForEntries(void 0)) : scopedSources;
+	return getSourceCandidateSourcesForEntries(entries);
 }
 async function createScopedGeneratorRuntime(options) {
 	const { cssHandlerOptions, fallbackRuntime, getSourceCandidatesForEntries, outputFile, rawSource, shouldExcludeSubpackageSourceCandidates, sourceFile, scopedSourceCandidateGetter } = options;
 	if (getSourceCandidatesForEntries && rawSource && sourceFile) {
-		const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+		const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
-			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			const shouldMergeFallbackRuntime = (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4CustomVariantConditionalComments)(rawSource);
-			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
-			const localCandidates = scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries);
-			const fallbackCandidates = scopedSourceCandidateGetter?.(void 0);
-			const scopedLocalCandidates = resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates);
-			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
+			const explicitCandidates = getSourceCandidatesForEntries(entries);
+			const outputCandidates = scopedSourceCandidateGetter?.(void 0);
+			const scopedCandidates = outputCandidates ? explicitCandidates.size === 0 && canFallbackToOutputCandidates(rawSource, entries) ? outputCandidates : intersectCandidates(explicitCandidates, outputCandidates) : explicitCandidates;
+			return (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4CustomVariantConditionalComments)(rawSource) ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
@@ -857,12 +774,6 @@ Object.defineProperty(exports, "createBundleModuleGraphOptions", {
 		return createBundleModuleGraphOptions;
 	}
 });
-Object.defineProperty(exports, "createBundlerGeneratedCssMarker", {
-	enumerable: true,
-	get: function() {
-		return createBundlerGeneratedCssMarker;
-	}
-});
 Object.defineProperty(exports, "createCandidateSignature", {
 	enumerable: true,
 	get: function() {
@@ -929,12 +840,6 @@ Object.defineProperty(exports, "getSnapshotHash", {
 		return getSnapshotHash;
 	}
 });
-Object.defineProperty(exports, "hasBundlerGeneratedCssMarker", {
-	enumerable: true,
-	get: function() {
-		return hasBundlerGeneratedCssMarker;
-	}
-});
 Object.defineProperty(exports, "hasRuntimeAffectingSourceChanges", {
 	enumerable: true,
 	get: function() {
@@ -953,12 +858,6 @@ Object.defineProperty(exports, "isHTMLRequest", {
 		return isHTMLRequest;
 	}
 });
-Object.defineProperty(exports, "isSourceStyleRequest", {
-	enumerable: true,
-	get: function() {
-		return isSourceStyleRequest;
-	}
-});
 Object.defineProperty(exports, "normalizeOutputPathKey", {
 	enumerable: true,
 	get: function() {
@@ -971,12 +870,6 @@ Object.defineProperty(exports, "normalizePath", {
 		return normalizePath;
 	}
 });
-Object.defineProperty(exports, "parseBundlerGeneratedCssMarkerBlocks", {
-	enumerable: true,
-	get: function() {
-		return parseBundlerGeneratedCssMarkerBlocks;
-	}
-});
 Object.defineProperty(exports, "resolveOutputSpecifier", {
 	enumerable: true,
 	get: function() {
@@ -1013,18 +906,6 @@ Object.defineProperty(exports, "slash", {
 		return slash;
 	}
 });
-Object.defineProperty(exports, "stripBundlerGeneratedCssMarkers", {
-	enumerable: true,
-	get: function() {
-		return stripBundlerGeneratedCssMarkers;
-	}
-});
-Object.defineProperty(exports, "stripRequestQuery", {
-	enumerable: true,
-	get: function() {
-		return stripRequestQuery;
-	}
-});
 Object.defineProperty(exports, "summarizeStringDiff", {
 	enumerable: true,
 	get: function() {

package/dist/{source-candidate-scan-signature-t4XKAQ04.mjs → source-candidate-scan-signature-Cf7259PR.mjs}

@@ -1,8 +1,8 @@
 import { detectAppType } from "./framework.mjs";
-import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-CrJJc5rK.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-DZT_pWrd.mjs";
+import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-2dg_uhEJ.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached, i as resolveUniAppXOptions } from "./tailwindcss-xs704TRw.mjs";
 import { _ as babelParse, n as Parser, v as traverse } from "./wxml-DdGdeqaH.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-hRhRAjYV.mjs";
+import { O as isSourceStyleRequest, d as generateCssByGenerator } from "./hmr-timing-1aS6--U7.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
@@ -225,39 +225,6 @@ function resolvePackageDir(name) {
 	return path.dirname(pkgPath);
 }
 //#endregion
-//#region src/bundlers/shared/generated-css-marker.ts
-const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
-const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
-const BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE = /\/\*!?\s*weapp-tailwindcss (vite|webpack)-generated-css(?:\s*:\s*([^\s*]+))?\s*\*\/\s*/gi;
-const VITE_INTERNAL_CSS_MARKER_GLOBAL_RE = /\/\*\$vite\$:\d+\*\/\s*/g;
-function createBundlerGeneratedCssMarker(bundler, file) {
-	return `/*! weapp-tailwindcss ${bundler}-generated-css:${encodeURIComponent(file)} */`;
-}
-function hasBundlerGeneratedCssMarker(source) {
-	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
-}
-function stripBundlerGeneratedCssMarkers(source) {
-	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
-}
-function parseBundlerGeneratedCssMarkerBlocks(source) {
-	const blocks = [];
-	BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex = 0;
-	let match = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-	while (match !== null) {
-		const cssStart = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.lastIndex;
-		const nextMatch = BUNDLER_GENERATED_CSS_MARKER_CAPTURE_RE.exec(source);
-		const cssEnd = nextMatch?.index ?? source.length;
-		const file = match[2] ? decodeURIComponent(match[2]) : void 0;
-		blocks.push({
-			bundler: match[1],
-			file,
-			css: source.slice(cssStart, cssEnd)
-		});
-		match = nextMatch;
-	}
-	return blocks;
-}
-//#endregion
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -302,30 +269,6 @@ function resolveOutputSpecifier(specifier, importer, outDir, hasOutput) {
 	return matchWithExtensions(candidate, hasOutput);
 }
 //#endregion
-//#region src/bundlers/shared/style-requests.ts
-const SOURCE_STYLE_EXT_RE = /\.(?:css|scss|sass|less|styl|stylus|pcss|postcss)$/i;
-const STYLE_QUERY_RE = /(?:^|&)type=styles?(?:&|$)/;
-const STYLE_LANG_QUERY_RE = /(?:^|&)lang(?:[.=](?:css|scss|sass|less|styl|stylus|pcss|postcss))?(?:&|$)/;
-function stripHash(request) {
-	const hashIndex = request.indexOf("#");
-	return hashIndex === -1 ? request : request.slice(0, hashIndex);
-}
-function stripRequestQuery(request) {
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	return queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-}
-function isSourceStyleRequest(request) {
-	if (typeof request !== "string" || request.length === 0) return false;
-	const normalized = stripHash(request);
-	const queryIndex = normalized.indexOf("?");
-	const pathname = queryIndex === -1 ? normalized : normalized.slice(0, queryIndex);
-	if (SOURCE_STYLE_EXT_RE.test(pathname)) return true;
-	if (queryIndex === -1) return false;
-	const query = normalized.slice(queryIndex + 1);
-	return STYLE_QUERY_RE.test(query) || STYLE_LANG_QUERY_RE.test(query);
-}
-//#endregion
 //#region src/bundlers/shared/v4-generation-core.ts
 async function generateTailwindV4Css(options) {
 	const majorVersion = options.runtimeState.tailwindRuntime.majorVersion;
@@ -506,6 +449,7 @@ function createBundleBuildState() {
 		runtimeAffectingHashByFile: /* @__PURE__ */ new Map(),
 		linkedByEntry: /* @__PURE__ */ new Map(),
 		dependentsByLinkedFile: /* @__PURE__ */ new Map(),
+		bundleMarkupCandidatesByFile: /* @__PURE__ */ new Map(),
 		generatorCandidateSignature: void 0
 	};
 }
@@ -526,7 +470,7 @@ function createProcessFiles() {
 }
 function readEntrySource(output) {
 	if (output.type === "chunk") return output.code;
-	return output.source.toString();
+	return typeof output.source === "string" ? output.source : Buffer.from(output.source).toString();
 }
 function classifyBundleEntry(file, opts) {
 	if (opts.htmlMatcher(file) || isHTMLRequest(file)) return "html";
@@ -702,78 +646,51 @@ function createLocalSourceEntries(sourceFile) {
 	}];
 }
 function intersectCandidates(first, second) {
-	const scoped = /* @__PURE__ */ new Set();
+	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Set();
 	const [small, large] = first.size <= second.size ? [first, second] : [second, first];
+	const scoped = /* @__PURE__ */ new Set();
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
-function intersectCandidateSourceMaps(first, second) {
-	if (first.size === 0 || second.size === 0) return /* @__PURE__ */ new Map();
-	const scoped = /* @__PURE__ */ new Map();
-	for (const [candidate, sources] of first) if (second.has(candidate)) scoped.set(candidate, sources);
-	return scoped;
-}
 function mergeCandidates(first, second) {
 	return /* @__PURE__ */ new Set([...first, ...second]);
 }
-function intersectExplicitSourceCandidates(scopedCandidates, localCandidates) {
-	if (localCandidates.size === 0 && scopedCandidates.size > 0) return scopedCandidates;
-	return intersectCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates) {
-	if (scopedCandidates.size === 0 && localCandidates.size === 0 && fallbackCandidates?.size) return fallbackCandidates;
-	return intersectExplicitSourceCandidates(scopedCandidates, localCandidates);
-}
-function resolveExplicitSourceMaps(scopedSources, localSources, fallbackSources) {
-	if (scopedSources.size === 0 && localSources.size === 0 && fallbackSources?.size) return fallbackSources;
-	if (localSources.size === 0 && scopedSources.size > 0) return scopedSources;
-	return intersectCandidateSourceMaps(scopedSources, localSources);
+function canFallbackToOutputCandidates(rawSource, entries) {
+	return rawSource.includes("@source") && entries.length > 0 && entries.every((entry) => !entry.negated);
 }
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
 		localEntries: void 0
 	};
-	const localEntries = createLocalSourceEntries(sourceFile);
-	if (!resolvedEntries || resolvedEntries.length === 0) return {
-		entries: localEntries,
-		localEntries: void 0
-	};
-	return {
-		entries: resolvedEntries,
-		localEntries
-	};
+	if (resolvedEntries !== void 0) return { entries: resolvedEntries };
+	return { entries: createLocalSourceEntries(sourceFile) };
 }
 async function resolveScopedGeneratorSourceEntries(rawSource, sourceFile) {
 	return resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 }
 async function createScopedGeneratorCandidateSignature(rawSource, sourceFile, fallbackSignature, getSourceCandidatesForEntries, options = {}) {
 	if (!getSourceCandidatesForEntries || !hasOwnSourceDirectives(rawSource)) return fallbackSignature;
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return fallbackSignature;
-	const scopedCandidates = getSourceCandidatesForEntries(entries);
-	const scopedSignature = createCandidateSignature(localEntries ? resolveExplicitSourceCandidates(scopedCandidates, getSourceCandidatesForEntries(localEntries), getSourceCandidatesForEntries(void 0)) : scopedCandidates);
+	const scopedSignature = createCandidateSignature(getSourceCandidatesForEntries(entries));
 	return options.includeFallbackSignature === true ? `${scopedSignature}:${fallbackSignature}` : scopedSignature;
 }
 async function createScopedGeneratorSourceTraceMap(rawSource, sourceFile, getSourceCandidateSourcesForEntries) {
 	if (!getSourceCandidateSourcesForEntries || !hasOwnSourceDirectives(rawSource)) return getSourceCandidateSourcesForEntries?.(void 0);
-	const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+	const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 	if (entries === void 0) return getSourceCandidateSourcesForEntries(void 0);
-	const scopedSources = getSourceCandidateSourcesForEntries(entries);
-	return localEntries ? resolveExplicitSourceMaps(scopedSources, getSourceCandidateSourcesForEntries(localEntries), getSourceCandidateSourcesForEntries(void 0)) : scopedSources;
+	return getSourceCandidateSourcesForEntries(entries);
 }
 async function createScopedGeneratorRuntime(options) {
 	const { cssHandlerOptions, fallbackRuntime, getSourceCandidatesForEntries, outputFile, rawSource, shouldExcludeSubpackageSourceCandidates, sourceFile, scopedSourceCandidateGetter } = options;
 	if (getSourceCandidatesForEntries && rawSource && sourceFile) {
-		const { entries, localEntries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
+		const { entries } = await resolveScopedGeneratorSourceEntries(rawSource, sourceFile);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
-			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			const shouldMergeFallbackRuntime = hasCssMacroTailwindV4CustomVariantConditionalComments(rawSource);
-			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
-			const localCandidates = scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries);
-			const fallbackCandidates = scopedSourceCandidateGetter?.(void 0);
-			const scopedLocalCandidates = resolveExplicitSourceCandidates(scopedCandidates, localCandidates, fallbackCandidates);
-			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
+			const explicitCandidates = getSourceCandidatesForEntries(entries);
+			const outputCandidates = scopedSourceCandidateGetter?.(void 0);
+			const scopedCandidates = outputCandidates ? explicitCandidates.size === 0 && canFallbackToOutputCandidates(rawSource, entries) ? outputCandidates : intersectCandidates(explicitCandidates, outputCandidates) : explicitCandidates;
+			return hasCssMacroTailwindV4CustomVariantConditionalComments(rawSource) ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
@@ -811,4 +728,4 @@ function createSourceCandidateScanSignature(input) {
 	});
 }
 //#endregion
-export { createBundlerGeneratedCssMarker as A, resolveViteFrameworkProfile as B, createBundleModuleGraphOptions as C, normalizeOutputPathKey as D, stripRequestQuery as E, resolvePluginDisabledState as F, createBuiltinViteStyleInjectorPlugins as I, createBuiltinWebpackStyleInjectorPlugin as L, parseBundlerGeneratedCssMarkerBlocks as M, stripBundlerGeneratedCssMarkers as N, resolveOutputSpecifier as O, resolvePackageDir as P, viteStyleInjectorDelegates as R, applyLinkedResults as S, isSourceStyleRequest as T, resolveWebpackFrameworkProfile as V, isCSSRequest as _, createCandidateSignature as a, slash as b, getSnapshotHash as c, buildBundleSnapshot as d, classifyBundleEntry as f, formatPostcssSourceMap as g, cleanUrl as h, createScopedGeneratorSourceTraceMap as i, hasBundlerGeneratedCssMarker as j, toAbsoluteOutputPath as k, hasRuntimeAffectingSourceChanges as l, updateBundleBuildState as m, createScopedGeneratorCandidateSignature as n, createJsHashSalt as o, createBundleBuildState as p, createScopedGeneratorRuntime as r, createLinkedImpactSignature as s, createSourceCandidateScanSignature as t, summarizeStringDiff as u, isHTMLRequest as v, generateTailwindV4Css as w, createRuntimeAffectingSourceSignature as x, normalizePath as y, webpackStyleInjectorDelegates as z };
+export { createBuiltinViteStyleInjectorPlugins as A, createBundleModuleGraphOptions as C, toAbsoluteOutputPath as D, resolveOutputSpecifier as E, resolveWebpackFrameworkProfile as F, viteStyleInjectorDelegates as M, webpackStyleInjectorDelegates as N, resolvePackageDir as O, resolveViteFrameworkProfile as P, applyLinkedResults as S, normalizeOutputPathKey as T, isCSSRequest as _, createCandidateSignature as a, slash as b, getSnapshotHash as c, buildBundleSnapshot as d, classifyBundleEntry as f, formatPostcssSourceMap as g, cleanUrl as h, createScopedGeneratorSourceTraceMap as i, createBuiltinWebpackStyleInjectorPlugin as j, resolvePluginDisabledState as k, hasRuntimeAffectingSourceChanges as l, updateBundleBuildState as m, createScopedGeneratorCandidateSignature as n, createJsHashSalt as o, createBundleBuildState as p, createScopedGeneratorRuntime as r, createLinkedImpactSignature as s, createSourceCandidateScanSignature as t, summarizeStringDiff as u, isHTMLRequest as v, generateTailwindV4Css as w, createRuntimeAffectingSourceSignature as x, normalizePath as y };

package/dist/tailwindcss/candidates.d.ts

@@ -1,7 +1,11 @@
+import type { ICustomAttributesEntities } from '../types';
 import type { IArbitraryValues } from '../types/shared';
 export interface SourceCandidateExtractionOptions {
     bareArbitraryValues?: IArbitraryValues['bareArbitraryValues'] | undefined;
+    customAttributesEntities?: ICustomAttributesEntities | undefined;
+    disabledDefaultTemplateHandler?: boolean | undefined;
     extractor?: ((source: string, extension: string) => Promise<Iterable<string>> | Iterable<string>) | undefined;
 }
 export declare function extractCandidatesFromSource(source: string, extension: string, options?: SourceCandidateExtractionOptions): Promise<Set<string>>;
+export declare function extractTemplateAttributeCandidates(source: string, extension: string, options: SourceCandidateExtractionOptions): Promise<never[] | Set<string>>;
 export declare function extractScriptStringCandidates(source: string, extension: string, options: SourceCandidateExtractionOptions): Promise<never[] | Set<string>>;

package/dist/{tailwindcss-z9JMF-qU.js → tailwindcss-KBYPJ2DW.js}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_generator = require("./generator-CS10c9g1.js");
+const require_generator = require("./generator-CEnUsjed.js");
 const require_object = require("./object-COs_Mw6p.js");
 require("./utils-CuKLf1Zv.js");
 let node_fs = require("node:fs");

package/dist/{tailwindcss-DZT_pWrd.mjs → tailwindcss-xs704TRw.mjs}

@@ -1,4 +1,4 @@
-import { At as resolveTailwindV4CssSourceBase, C as findWorkspaceRoot, Ct as createTailwindSourceEntryMatcher, D as normalizeStringListOption, Dt as parseConfigParam, E as resolveTailwindcssOptions, Et as normalizeLegacyContentEntries, Mt as resolveCssMacroTailwindV4Source, Ot as resolveCssSourceEntries, Pt as loadTailwindV4DesignSystem, S as findWorkspacePackageDir, St as FULL_SOURCE_SCAN_PATTERN, T as normalizeTailwindcssRuntimeOptions, _ as groupCssEntriesByBase, b as normalizeCssEntries, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as guessBasedirFromEntries, w as normalizeExtendLengthUnits, wt as expandTailwindSourceEntries, x as findNearestPackageRoot, y as isTailwindV4CssEntry } from "./generator-BvPcmqxU.mjs";
+import { At as resolveTailwindV4CssSourceBase, C as findWorkspaceRoot, Ct as createTailwindSourceEntryMatcher, D as normalizeStringListOption, Dt as parseConfigParam, E as resolveTailwindcssOptions, Et as normalizeLegacyContentEntries, Mt as resolveCssMacroTailwindV4Source, Ot as resolveCssSourceEntries, Pt as loadTailwindV4DesignSystem, S as findWorkspacePackageDir, St as FULL_SOURCE_SCAN_PATTERN, T as normalizeTailwindcssRuntimeOptions, _ as groupCssEntriesByBase, b as normalizeCssEntries, d as resolveTailwindV4SourceFromRuntime, h as hasConfiguredTailwindV4CssRoots, i as normalizeWeappTailwindcssGeneratorOptions, m as filterTailwindV4CssSourceRoots, p as resolveTailwindV4SourceOptionsFromRuntime, v as guessBasedirFromEntries, w as normalizeExtendLengthUnits, wt as expandTailwindSourceEntries, x as findNearestPackageRoot, y as isTailwindV4CssEntry } from "./generator-CEo920So.mjs";
 import { t as omitUndefined } from "./object-BJSWl-E5.mjs";
 import { n as defuOverrideArray$1 } from "./utils-MVwpU07P.mjs";
 import { createRequire } from "node:module";

package/dist/{transform-D5JUgMpE.mjs → transform-B_KM9sLX.mjs}

@@ -14621,6 +14621,48 @@ function isRuntimeCandidate(candidate, runtimeSet) {
 	if (!runtimeSet || runtimeSet.size === 0) return false;
 	return runtimeSet.has(candidate) || runtimeSet.has(replaceWxml(candidate));
 }
+function hasTopLevelVariant(candidate) {
+	let bracketDepth = 0;
+	let parenthesisDepth = 0;
+	let quote = "";
+	let escaped = false;
+	for (const char of candidate) {
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = "";
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (char === "[") {
+			bracketDepth += 1;
+			continue;
+		}
+		if (char === "]") {
+			bracketDepth = Math.max(0, bracketDepth - 1);
+			continue;
+		}
+		if (char === "(") {
+			parenthesisDepth += 1;
+			continue;
+		}
+		if (char === ")") {
+			parenthesisDepth = Math.max(0, parenthesisDepth - 1);
+			continue;
+		}
+		if (char === ":" && bracketDepth === 0 && parenthesisDepth === 0) return true;
+	}
+	return false;
+}
 function shouldEnableComponentLocalStyle(id) {
 	return COMPONENT_RE.test(id);
 }
@@ -14643,18 +14685,18 @@ var UniAppXComponentLocalStyleCollector = class {
 		this.aliasByLookup.set(replaceWxml(utility), alias);
 		return alias;
 	}
-	rewriteLiteral(literal, shouldInclude) {
+	rewriteLiteral(literal) {
 		const candidates = splitCandidateTokens(literal);
 		if (candidates.length === 0) return literal;
 		let rewritten = literal;
 		for (const candidate of candidates) {
-			if (!shouldInclude(candidate)) continue;
-			rewritten = rewritten.replace(candidate, this.ensureAlias(candidate));
+			if (!isRuntimeCandidate(candidate, this.runtimeSet)) continue;
+			rewritten = rewritten.replace(candidate, hasTopLevelVariant(candidate) ? replaceWxml(candidate) : this.ensureAlias(candidate));
 		}
 		return rewritten;
 	}
 	collectAndRewriteStaticClass(literal) {
-		return this.rewriteLiteral(literal, (candidate) => isRuntimeCandidate(candidate, this.runtimeSet));
+		return this.rewriteLiteral(literal);
 	}
 	collectRuntimeClasses(rawSource, options = {}) {
 		const wrapped = options.wrapExpression ? `${EXPRESSION_WRAPPER_PREFIX}${rawSource}${EXPRESSION_WRAPPER_SUFFIX}` : rawSource;
@@ -14669,7 +14711,7 @@ var UniAppXComponentLocalStyleCollector = class {
 				const classContext = options.wrapExpression || isClassContextLiteralPath(path);
 				for (const candidate of candidates) {
 					if (!candidate || !classContext && !isRuntimeCandidate(candidate, this.runtimeSet)) continue;
-					if (isRuntimeCandidate(candidate, this.runtimeSet)) this.ensureAlias(candidate);
+					if (isRuntimeCandidate(candidate, this.runtimeSet) && !hasTopLevelVariant(candidate)) this.ensureAlias(candidate);
 				}
 			}
 		} catch {}