weapp-tailwindcss 5.1.2 → 5.1.4

package/dist/presets.mjs

@@ -1,6 +1,7 @@
-import { st as omitUndefined } from "./v4-engine-C3qSwQ-e.mjs";
-import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DodxWHGz.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-B5mRo0-M.mjs";
+import { resolveTaroPlatform, resolveUniPlatformsFromEnv } from "./framework.mjs";
+import { ct as omitUndefined } from "./v4-engine-BuuYDXt1.mjs";
+import { n as defuOverrideArray } from "./utils-DodxWHGz.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-D0JF0fuZ.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";
 import process from "node:process";
@@ -11,6 +12,20 @@ function normalizeCssEntries(entries) {
 	const normalized = Array.isArray(entries) ? entries : [entries];
 	return normalized.length > 0 ? normalized : void 0;
 }
+function shouldEnableWebCompatFromEnv() {
+	const { uniPlatform, uniUtsPlatform } = resolveUniPlatformsFromEnv();
+	return uniPlatform.isWeb || uniUtsPlatform.isWeb || resolveTaroPlatform().isWeb;
+}
+function withWebCompatGeneratorDefaults(options, enabled = shouldEnableWebCompatFromEnv()) {
+	if (!enabled) return options;
+	return {
+		...options,
+		generator: defuOverrideArray(options.generator ?? {}, {
+			target: "web",
+			webCompat: true
+		})
+	};
+}
 function createBasePreset(options = {}) {
 	const { base, cssEntries, resolve, rawOptions, ...userOptions } = options;
 	const baseDir = resolveTailwindcssBasedir(base);
@@ -36,16 +51,16 @@ function createBasePreset(options = {}) {
 //#endregion
 //#region src/presets/hbuilderx.ts
 function hbuilderx(options = {}) {
-	return createBasePreset({ ...options });
+	return createBasePreset(withWebCompatGeneratorDefaults({ ...options }));
 }
 //#endregion
 //#region src/presets/uni-app.ts
 function uniApp(options = {}) {
 	const uniPlatform = process.env["UNI_PLATFORM"];
-	return createBasePreset({
-		disabled: uniPlatform === "h5" || uniPlatform === "app" || uniPlatform === "app-plus" ? true : void 0,
+	return createBasePreset(withWebCompatGeneratorDefaults({
+		disabled: uniPlatform === "app" || uniPlatform === "app-plus" ? true : void 0,
 		...options
-	});
+	}));
 }
 //#endregion
 //#region src/tailwindcss/index.ts
@@ -58,7 +73,7 @@ function resolveTailwindResolveOptions(base, resolve) {
 	const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
 	return {
 		...resolve ?? {},
-		paths: [...new Set([
+		paths: [.../* @__PURE__ */ new Set([
 			path.join(base, "node_modules"),
 			base,
 			...currentPaths
@@ -78,10 +93,9 @@ function resolveInstalledTailwindDefaults(resolve) {
 }
 function uniAppX(options) {
 	logger.info(`UNI_PLATFORM: ${process.env["UNI_PLATFORM"]}`);
-	const utsPlatform = resolveUniUtsPlatform();
-	const uniPlatform = resolveUniUtsPlatform(process.env["UNI_PLATFORM"]);
-	logger.info(`UNI_UTS_PLATFORM: ${utsPlatform.raw ?? "undefined"}`);
-	const isApp = utsPlatform.isApp || uniPlatform.isApp;
+	const { uniPlatform, uniUtsPlatform } = resolveUniPlatformsFromEnv();
+	logger.info(`UNI_UTS_PLATFORM: ${uniUtsPlatform.raw ?? "undefined"}`);
+	const isApp = uniUtsPlatform.isApp || uniPlatform.isApp;
 	const cssEntries = normalizeCssEntries(options.cssEntries);
 	const resolvedResolve = resolveTailwindResolveOptions(options.base, options.resolve);
 	const installedTailwindDefaults = resolveInstalledTailwindDefaults(resolvedResolve);
@@ -94,7 +108,7 @@ function uniAppX(options) {
 	if (typeof options.uniAppX === "boolean") resolvedUniAppX.enabled = options.uniAppX;
 	return defuOverrideArray(options.rawOptions ?? {}, {
 		uniAppX: resolvedUniAppX,
-		...options.generator !== void 0 ? { generator: options.generator } : {},
+		...withWebCompatGeneratorDefaults(options.generator !== void 0 ? { generator: options.generator } : {}),
 		rem2rpx: options.rem2rpx,
 		unitsToPx: options.unitsToPx,
 		unitConversion: options.unitConversion,
@@ -126,4 +140,4 @@ function uniAppX(options) {
 	});
 }
 //#endregion
-export { createBasePreset, hbuilderx, normalizeCssEntries, uniApp, uniAppX };
+export { createBasePreset, hbuilderx, normalizeCssEntries, shouldEnableWebCompatFromEnv, uniApp, uniAppX, withWebCompatGeneratorDefaults };

package/dist/reset.js

@@ -2,9 +2,9 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_chunk = require("./chunk-emK7D4bc.js");
+const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
 let _weapp_tailwindcss_reset = require("@weapp-tailwindcss/reset");
-_weapp_tailwindcss_reset = require_chunk.__toESM(_weapp_tailwindcss_reset);
+_weapp_tailwindcss_reset = require_rolldown_runtime.__toESM(_weapp_tailwindcss_reset);
 Object.defineProperty(exports, "default", {
 	enumerable: true,
 	get: function() {

package/dist/rspack.d.ts

@@ -0,0 +1,3 @@
+export { patchRspackConfig, WeappTailwindcss, WeappTailwindcss as weappTailwindcss, weappTailwindcssPackageDir, } from './bundlers/rspack';
+export type { PatchRspackConfigOptions, PatchRspackCssImportRewriteLoaderOptions, RspackConfigLike, } from './bundlers/rspack';
+export type { UserDefinedOptions } from './types';

package/dist/rspack.js

@@ -0,0 +1,68 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
+const require_webpack = require("./webpack-khSwkXP5.js");
+let node_path = require("node:path");
+node_path = require_rolldown_runtime.__toESM(node_path);
+//#region src/bundlers/rspack/index.ts
+const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";
+const LIGHTNING_CSS_LOADER_NAME = "builtin:lightningcss-loader";
+const CSS_LOADER_NAME = "css-loader";
+const POSTCSS_LOADER_NAME = "postcss-loader";
+function isRuleLike(value) {
+	return typeof value === "object" && value !== null;
+}
+function normalizeUse(use) {
+	if (Array.isArray(use)) return use;
+	if (use === void 0) return;
+	return [use];
+}
+function getLoaderName(item) {
+	if (typeof item === "string") return item;
+	return item?.loader;
+}
+function includesLoaderName(item, name) {
+	return getLoaderName(item)?.includes(name) === true;
+}
+function createCssImportRewriteLoaderEntry(options) {
+	return {
+		loader: options.loader ?? node_path.default.resolve(__dirname, `./${CSS_IMPORT_REWRITE_LOADER_NAME}.js`),
+		...options.options === void 0 ? {} : { options: options.options }
+	};
+}
+function resolveCssImportRewriteOptions(options) {
+	const cssImportRewriteLoader = options.cssImportRewriteLoader ?? true;
+	if (cssImportRewriteLoader === false) return;
+	return cssImportRewriteLoader === true ? {} : cssImportRewriteLoader;
+}
+function patchRuleUse(rule, options) {
+	let use = normalizeUse(rule.use);
+	if (!use) return;
+	if (options.removeLightningCssLoader) use = use.filter((item) => !includesLoaderName(item, LIGHTNING_CSS_LOADER_NAME));
+	const cssImportRewriteOptions = resolveCssImportRewriteOptions(options);
+	if (cssImportRewriteOptions) {
+		const existingIndex = use.findIndex((item) => includesLoaderName(item, CSS_IMPORT_REWRITE_LOADER_NAME));
+		const existing = existingIndex === -1 ? void 0 : use.splice(existingIndex, 1)[0];
+		const anchorIndex = use.findIndex((item) => includesLoaderName(item, LIGHTNING_CSS_LOADER_NAME));
+		const fallbackAnchorIndex = anchorIndex === -1 ? use.findIndex((item) => includesLoaderName(item, CSS_LOADER_NAME) || includesLoaderName(item, POSTCSS_LOADER_NAME)) : anchorIndex;
+		if (fallbackAnchorIndex !== -1) {
+			const loaderEntry = existing ?? createCssImportRewriteLoaderEntry(cssImportRewriteOptions);
+			use.splice(fallbackAnchorIndex + 1, 0, loaderEntry);
+		}
+	}
+	rule.use = use;
+}
+function walkRspackRule(rule, options) {
+	if (!isRuleLike(rule)) return;
+	patchRuleUse(rule, options);
+	if (Array.isArray(rule.oneOf)) rule.oneOf.forEach((item) => walkRspackRule(item, options));
+	if (Array.isArray(rule.rules)) rule.rules.forEach((item) => walkRspackRule(item, options));
+}
+function patchRspackConfig(config, options = {}) {
+	for (const rule of config.module?.rules ?? []) walkRspackRule(rule, options);
+	return config;
+}
+//#endregion
+exports.WeappTailwindcss = require_webpack.WeappTailwindcss;
+exports.patchRspackConfig = patchRspackConfig;
+exports.weappTailwindcss = require_webpack.WeappTailwindcss;
+exports.weappTailwindcssPackageDir = require_webpack.weappTailwindcssPackageDir;

package/dist/rspack.mjs

@@ -0,0 +1,62 @@
+import { n as weappTailwindcssPackageDir, r as __dirname, t as WeappTailwindcss } from "./webpack-Bg6pefpb.mjs";
+import path from "node:path";
+//#region src/bundlers/rspack/index.ts
+const CSS_IMPORT_REWRITE_LOADER_NAME = "weapp-tw-css-import-rewrite-loader";
+const LIGHTNING_CSS_LOADER_NAME = "builtin:lightningcss-loader";
+const CSS_LOADER_NAME = "css-loader";
+const POSTCSS_LOADER_NAME = "postcss-loader";
+function isRuleLike(value) {
+	return typeof value === "object" && value !== null;
+}
+function normalizeUse(use) {
+	if (Array.isArray(use)) return use;
+	if (use === void 0) return;
+	return [use];
+}
+function getLoaderName(item) {
+	if (typeof item === "string") return item;
+	return item?.loader;
+}
+function includesLoaderName(item, name) {
+	return getLoaderName(item)?.includes(name) === true;
+}
+function createCssImportRewriteLoaderEntry(options) {
+	return {
+		loader: options.loader ?? path.resolve(__dirname, `./${CSS_IMPORT_REWRITE_LOADER_NAME}.js`),
+		...options.options === void 0 ? {} : { options: options.options }
+	};
+}
+function resolveCssImportRewriteOptions(options) {
+	const cssImportRewriteLoader = options.cssImportRewriteLoader ?? true;
+	if (cssImportRewriteLoader === false) return;
+	return cssImportRewriteLoader === true ? {} : cssImportRewriteLoader;
+}
+function patchRuleUse(rule, options) {
+	let use = normalizeUse(rule.use);
+	if (!use) return;
+	if (options.removeLightningCssLoader) use = use.filter((item) => !includesLoaderName(item, LIGHTNING_CSS_LOADER_NAME));
+	const cssImportRewriteOptions = resolveCssImportRewriteOptions(options);
+	if (cssImportRewriteOptions) {
+		const existingIndex = use.findIndex((item) => includesLoaderName(item, CSS_IMPORT_REWRITE_LOADER_NAME));
+		const existing = existingIndex === -1 ? void 0 : use.splice(existingIndex, 1)[0];
+		const anchorIndex = use.findIndex((item) => includesLoaderName(item, LIGHTNING_CSS_LOADER_NAME));
+		const fallbackAnchorIndex = anchorIndex === -1 ? use.findIndex((item) => includesLoaderName(item, CSS_LOADER_NAME) || includesLoaderName(item, POSTCSS_LOADER_NAME)) : anchorIndex;
+		if (fallbackAnchorIndex !== -1) {
+			const loaderEntry = existing ?? createCssImportRewriteLoaderEntry(cssImportRewriteOptions);
+			use.splice(fallbackAnchorIndex + 1, 0, loaderEntry);
+		}
+	}
+	rule.use = use;
+}
+function walkRspackRule(rule, options) {
+	if (!isRuleLike(rule)) return;
+	patchRuleUse(rule, options);
+	if (Array.isArray(rule.oneOf)) rule.oneOf.forEach((item) => walkRspackRule(item, options));
+	if (Array.isArray(rule.rules)) rule.rules.forEach((item) => walkRspackRule(item, options));
+}
+function patchRspackConfig(config, options = {}) {
+	for (const rule of config.module?.rules ?? []) walkRspackRule(rule, options);
+	return config;
+}
+//#endregion
+export { WeappTailwindcss, WeappTailwindcss as weappTailwindcss, patchRspackConfig, weappTailwindcssPackageDir };

package/dist/{source-candidate-scan-signature-Dugfplms.mjs → source-candidate-scan-signature-BB1hvW68.mjs}

@@ -1,6 +1,7 @@
-import { g as traverse, h as babelParse, o as Parser } from "./context-C-r8ki7x.mjs";
-import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-B5mRo0-M.mjs";
-import { u as generateCssByGenerator } from "./hmr-timing-BRx-KnBh.mjs";
+import { n as hasCssMacroTailwindV4CustomVariantConditionalComments } from "./auto-CrJJc5rK.mjs";
+import { g as traverse, h as babelParse, o as Parser } from "./context-Bkpmt3ja.mjs";
+import { g as resolveTailwindV4EntriesFromCssCached } from "./tailwindcss-D0JF0fuZ.mjs";
+import { u as generateCssByGenerator } from "./hmr-timing-BRNaz8Od.mjs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
@@ -501,6 +502,9 @@ function intersectCandidates(first, second) {
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
+function mergeCandidates(first, second) {
+	return /* @__PURE__ */ new Set([...first, ...second]);
+}
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
@@ -530,12 +534,14 @@ async function createScopedGeneratorRuntime(options) {
 		const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await resolveTailwindV4EntriesFromCssCached(rawSource, path.dirname(path.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
 			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			if (!localEntries) return scopedCandidates;
-			return intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			const shouldMergeFallbackRuntime = hasCssMacroTailwindV4CustomVariantConditionalComments(rawSource);
+			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
+			const scopedLocalCandidates = intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
-	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return scopedCandidates;
+	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions) ? scopedCandidates : mergeCandidates(scopedCandidates, fallbackRuntime);
 	if (!shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions)) return fallbackRuntime;
 	return fallbackRuntime;
 }

package/dist/{source-candidate-scan-signature-BO6JSskQ.js → source-candidate-scan-signature-CaDT0gkj.js}

@@ -1,14 +1,16 @@
-const require_chunk = require("./chunk-emK7D4bc.js");
-const require_context = require("./context-CH4HFZP2.js");
-const require_tailwindcss = require("./tailwindcss-dbrbY4cd.js");
-const require_hmr_timing = require("./hmr-timing-Da1eI8S0.js");
+const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
+require("./auto-DtU6f3X6.js");
+const require_context = require("./context-DCVMkTRj.js");
+const require_tailwindcss = require("./tailwindcss-D2xs4OEu.js");
+const require_hmr_timing = require("./hmr-timing-BV6nFPoT.js");
 let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_rolldown_runtime.__toESM(node_process);
 let node_module = require("node:module");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let node_buffer = require("node:buffer");
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 //#region src/bundlers/shared/module-graph.ts
 const QUERY_HASH_RE = /[?#].*$/u;
 const PROTOCOL_RE = /^[a-z][a-z+.-]*:/iu;
@@ -504,6 +506,9 @@ function intersectCandidates(first, second) {
 	for (const candidate of small) if (large.has(candidate)) scoped.add(candidate);
 	return scoped;
 }
+function mergeCandidates(first, second) {
+	return /* @__PURE__ */ new Set([...first, ...second]);
+}
 function resolveScopedSourceEntries(rawSource, sourceFile, resolvedEntries) {
 	if (!hasOwnSourceDirectives(rawSource)) return {
 		entries: resolvedEntries,
@@ -533,12 +538,14 @@ async function createScopedGeneratorRuntime(options) {
 		const { entries, localEntries } = resolveScopedSourceEntries(rawSource, sourceFile, (await require_tailwindcss.resolveTailwindV4EntriesFromCssCached(rawSource, node_path.default.dirname(node_path.default.resolve(sourceFile.replace(/[?#].*$/, "")))))?.entries);
 		if (entries !== void 0 && (entries.length > 0 || hasOwnSourceDirectives(rawSource))) {
 			const scopedCandidates = scopedSourceCandidateGetter?.(entries) ?? getSourceCandidatesForEntries(entries);
-			if (!localEntries) return scopedCandidates;
-			return intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			const shouldMergeFallbackRuntime = (0, _weapp_tailwindcss_postcss.hasCssMacroTailwindV4CustomVariantConditionalComments)(rawSource);
+			if (!localEntries) return shouldMergeFallbackRuntime ? mergeCandidates(scopedCandidates, fallbackRuntime) : scopedCandidates;
+			const scopedLocalCandidates = intersectCandidates(scopedCandidates, scopedSourceCandidateGetter?.(localEntries) ?? getSourceCandidatesForEntries(localEntries));
+			return shouldMergeFallbackRuntime ? mergeCandidates(scopedLocalCandidates, fallbackRuntime) : scopedLocalCandidates;
 		}
 	}
 	const scopedCandidates = scopedSourceCandidateGetter?.(void 0);
-	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return scopedCandidates;
+	if (scopedCandidates && (scopedCandidates.size > 0 || shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions))) return shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions) ? scopedCandidates : mergeCandidates(scopedCandidates, fallbackRuntime);
 	if (!shouldExcludeSubpackageSourceCandidates(outputFile, cssHandlerOptions)) return fallbackRuntime;
 	return fallbackRuntime;
 }

package/dist/tailwindcss/v4-engine/css-macro-source.d.ts

@@ -0,0 +1,2 @@
+import type { TailwindV4ResolvedSource } from './types';
+export declare function resolveCssMacroTailwindV4Source(source: TailwindV4ResolvedSource): TailwindV4ResolvedSource;

package/dist/{tailwindcss-B5mRo0-M.mjs → tailwindcss-D0JF0fuZ.mjs}

@@ -1,4 +1,4 @@
-import { $ as normalizeLegacyContentEntries, X as createTailwindSourceEntryMatcher, Y as FULL_SOURCE_SCAN_PATTERN, Z as expandTailwindSourceEntries, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, at as collectCssInlineSourceCandidates, c as groupCssEntriesByBase, d as normalizeCssEntries, et as parseConfigParam, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, l as guessBasedirFromEntries, lt as loadTailwindV4DesignSystem, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, p as findWorkspacePackageDir, rt as resolveTailwindV4CssSourceBase, st as omitUndefined, tt as resolveCssSourceEntries, u as isTailwindV4CssEntry, v as normalizeStringListOption } from "./v4-engine-C3qSwQ-e.mjs";
+import { $ as normalizeLegacyContentEntries, X as createTailwindSourceEntryMatcher, Y as FULL_SOURCE_SCAN_PATTERN, Z as expandTailwindSourceEntries, _ as resolveTailwindcssOptions, a as filterTailwindV4CssSourceRoots, at as collectCssInlineSourceCandidates, c as groupCssEntriesByBase, ct as omitUndefined, d as normalizeCssEntries, et as parseConfigParam, f as findNearestPackageRoot, g as normalizeTailwindcssRuntimeOptions, h as normalizeExtendLengthUnits, i as resolveTailwindV4SourceOptionsFromRuntime, l as guessBasedirFromEntries, m as findWorkspaceRoot, n as resolveTailwindV4SourceFromRuntime, o as hasConfiguredTailwindV4CssRoots, ot as resolveCssMacroTailwindV4Source, p as findWorkspacePackageDir, rt as resolveTailwindV4CssSourceBase, tt as resolveCssSourceEntries, u as isTailwindV4CssEntry, ut as loadTailwindV4DesignSystem, v as normalizeStringListOption } from "./v4-engine-BuuYDXt1.mjs";
 import { n as defuOverrideArray$1 } from "./utils-DodxWHGz.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, statSync } from "node:fs";
@@ -503,7 +503,7 @@ async function resolveViteSourceScanEntries(options, runtime, scanOptions = {})
 	addSourceScanDependency(dependencies, source.file);
 	addSourceScanDependencies(dependencies, source.dependencies);
 	const resolved = await resolveTailwindV4EntriesFromCssCached(source.css, source.base);
-	return resolved ? createResolvedViteSourceScan(createResolvedV4CssScanInput(resolved.entries.length > 0 ? resolved.entries : [], resolved.inlineCandidates, resolved.entries.length > 0 ? resolved.explicit : false), new Set([...dependencies, ...resolved.dependencies])) : void 0;
+	return resolved ? createResolvedViteSourceScan(createResolvedV4CssScanInput(resolved.entries.length > 0 ? resolved.entries : [], resolved.inlineCandidates, resolved.entries.length > 0 ? resolved.explicit : false), /* @__PURE__ */ new Set([...dependencies, ...resolved.dependencies])) : void 0;
 }
 function createViteSourceScanMatcher(entries) {
 	if (entries?.length === 0) return;
@@ -945,14 +945,14 @@ function createEngineTailwindcssRuntime(options) {
 		const rawCandidates = new Set(report.entries.map((entry) => {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
-		const source = await resolveTailwindV4SourceFromRuntime(runtime);
+		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const designSystem = await loadTailwindV4DesignSystem(source);
 		const candidates = new Set(resolveValidTailwindV4Candidates(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}
 	async function collectTailwindV4CssCandidates(candidates) {
-		const source = await resolveTailwindV4SourceFromRuntime(runtime);
+		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
 			if (!css.includes("@apply")) continue;
@@ -967,7 +967,7 @@ function createEngineTailwindcssRuntime(options) {
 		}
 	}
 	async function collectContentTokens() {
-		const source = await resolveTailwindV4SourceFromRuntime(runtime);
+		const source = resolveCssMacroTailwindV4Source(await resolveTailwindV4SourceFromRuntime(runtime));
 		const report = await extractProjectCandidatesWithPositions({
 			base: source.base,
 			baseFallbacks: source.baseFallbacks,
@@ -1292,7 +1292,7 @@ const ENV_BASEDIR_KEYS = [
 	"INIT_CWD",
 	"PWD"
 ];
-const GENERIC_ENV_BASEDIR_KEYS = new Set(["INIT_CWD", "PWD"]);
+const GENERIC_ENV_BASEDIR_KEYS = /* @__PURE__ */ new Set(["INIT_CWD", "PWD"]);
 function pickEnvBasedir() {
 	for (const key of ENV_BASEDIR_KEYS) {
 		const value = process.env[key];

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

@@ -1,11 +1,11 @@
-const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v4_engine = require("./v4-engine-ON_oSLfO.js");
-require("./utils-BCa37Wqj.js");
+const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
+const require_v4_engine = require("./v4-engine-CKtsdKxK.js");
+require("./utils-D3h8j7Mk.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
-node_path = require_chunk.__toESM(node_path);
+node_path = require_rolldown_runtime.__toESM(node_path);
 let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
+node_process = require_rolldown_runtime.__toESM(node_process);
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let node_fs_promises = require("node:fs/promises");
@@ -13,7 +13,7 @@ let node_module = require("node:module");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let fast_glob = require("fast-glob");
-fast_glob = require_chunk.__toESM(fast_glob);
+fast_glob = require_rolldown_runtime.__toESM(fast_glob);
 let tailwindcss_config = require("tailwindcss-config");
 let node_url = require("node:url");
 //#region src/bundlers/vite/static-config-content.ts
@@ -507,7 +507,7 @@ async function resolveViteSourceScanEntries(options, runtime, scanOptions = {})
 	addSourceScanDependency(dependencies, source.file);
 	addSourceScanDependencies(dependencies, source.dependencies);
 	const resolved = await resolveTailwindV4EntriesFromCssCached(source.css, source.base);
-	return resolved ? createResolvedViteSourceScan(createResolvedV4CssScanInput(resolved.entries.length > 0 ? resolved.entries : [], resolved.inlineCandidates, resolved.entries.length > 0 ? resolved.explicit : false), new Set([...dependencies, ...resolved.dependencies])) : void 0;
+	return resolved ? createResolvedViteSourceScan(createResolvedV4CssScanInput(resolved.entries.length > 0 ? resolved.entries : [], resolved.inlineCandidates, resolved.entries.length > 0 ? resolved.explicit : false), /* @__PURE__ */ new Set([...dependencies, ...resolved.dependencies])) : void 0;
 }
 function createViteSourceScanMatcher(entries) {
 	if (entries?.length === 0) return;
@@ -949,14 +949,14 @@ function createEngineTailwindcssRuntime(options) {
 		const rawCandidates = new Set(report.entries.map((entry) => {
 			return typeof entry === "string" ? entry : entry.rawCandidate;
 		}).filter((entry) => typeof entry === "string" && entry.length > 0));
-		const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
+		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const designSystem = await (0, _tailwindcss_mangle_engine.loadTailwindV4DesignSystem)(source);
 		const candidates = new Set((0, _tailwindcss_mangle_engine.resolveValidTailwindV4Candidates)(designSystem, rawCandidates, { ...source.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: source.bareArbitraryValues } }));
 		await collectTailwindV4CssCandidates(candidates);
 		return applyClassSetFilter(candidates);
 	}
 	async function collectTailwindV4CssCandidates(candidates) {
-		const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
+		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const cssList = [source.css, ...(source.cssSources ?? []).map((cssSource) => cssSource.css).filter((css) => typeof css === "string")];
 		for (const css of cssList) {
 			if (!css.includes("@apply")) continue;
@@ -971,7 +971,7 @@ function createEngineTailwindcssRuntime(options) {
 		}
 	}
 	async function collectContentTokens() {
-		const source = await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime);
+		const source = require_v4_engine.resolveCssMacroTailwindV4Source(await require_v4_engine.resolveTailwindV4SourceFromRuntime(runtime));
 		const report = await (0, _tailwindcss_mangle_engine.extractProjectCandidatesWithPositions)({
 			base: source.base,
 			baseFallbacks: source.baseFallbacks,
@@ -1296,7 +1296,7 @@ const ENV_BASEDIR_KEYS = [
 	"INIT_CWD",
 	"PWD"
 ];
-const GENERIC_ENV_BASEDIR_KEYS = new Set(["INIT_CWD", "PWD"]);
+const GENERIC_ENV_BASEDIR_KEYS = /* @__PURE__ */ new Set(["INIT_CWD", "PWD"]);
 function pickEnvBasedir() {
 	for (const key of ENV_BASEDIR_KEYS) {
 		const value = node_process.default.env[key];

package/dist/{transform-DeqFRp1D.mjs → transform-BP86eSZp.mjs}

@@ -1,14 +1,14 @@
-import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-C-r8ki7x.mjs";
+import { c as createAttributeMatcher, d as JsTokenUpdater, f as _defineProperty, h as babelParse, m as replaceWxml, p as isClassContextLiteralPath, s as generateCode, u as analyzeSource } from "./context-Bkpmt3ja.mjs";
 import { createRequire } from "node:module";
 import { splitCandidateTokens } from "@tailwindcss-mangle/engine";
 import MagicString from "magic-string";
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
+var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+shared@3.5.38/node_modules/@vue/shared/dist/shared.cjs.prod.js
+//#region ../../node_modules/.pnpm/@vue+shared@3.5.39/node_modules/@vue/shared/dist/shared.cjs.prod.js
 /**
-* @vue/shared v3.5.38
+* @vue/shared v3.5.39
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -492,9 +492,9 @@ var require_shared_cjs_prod = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.toTypeString = toTypeString;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+shared@3.5.38/node_modules/@vue/shared/dist/shared.cjs.js
+//#region ../../node_modules/.pnpm/@vue+shared@3.5.39/node_modules/@vue/shared/dist/shared.cjs.js
 /**
-* @vue/shared v3.5.38
+* @vue/shared v3.5.39
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -979,7 +979,7 @@ var require_shared_cjs = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.toTypeString = toTypeString;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+shared@3.5.38/node_modules/@vue/shared/index.js
+//#region ../../node_modules/.pnpm/@vue+shared@3.5.39/node_modules/@vue/shared/index.js
 var require_shared = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	if (process.env.NODE_ENV === "production") module.exports = require_shared_cjs_prod();
 	else module.exports = require_shared_cjs();
@@ -992,7 +992,7 @@ var require_decode_codepoint = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.fromCodePoint = void 0;
 	exports.replaceCodePoint = replaceCodePoint;
 	exports.decodeCodePoint = decodeCodePoint;
-	const decodeMap = new Map([
+	const decodeMap = /* @__PURE__ */ new Map([
 		[0, 65533],
 		[128, 8364],
 		[130, 8218],
@@ -3916,9 +3916,9 @@ var require_source_map = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.SourceNode = require_source_node().SourceNode;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+compiler-core@3.5.38/node_modules/@vue/compiler-core/dist/compiler-core.cjs.prod.js
+//#region ../../node_modules/.pnpm/@vue+compiler-core@3.5.39/node_modules/@vue/compiler-core/dist/compiler-core.cjs.prod.js
 /**
-* @vue/compiler-core v3.5.38
+* @vue/compiler-core v3.5.39
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -8347,7 +8347,7 @@ const ${helpers.map((s) => `_${helperNameMap[s]} = ${helperNameMap[s]}`).join(",
 			const child = node.children[i];
 			if (typeof child !== "object") continue;
 			if (child.type === 4) parseFilter(child, context);
-			else if (child.type === 8) rewriteFilter(node, context);
+			else if (child.type === 8) rewriteFilter(child, context);
 			else if (child.type === 5) rewriteFilter(child.content, context);
 		}
 	}
@@ -8676,9 +8676,9 @@ const ${helpers.map((s) => `_${helperNameMap[s]} = ${helperNameMap[s]}`).join(",
 	exports.warnDeprecation = warnDeprecation;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+compiler-core@3.5.38/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js
+//#region ../../node_modules/.pnpm/@vue+compiler-core@3.5.39/node_modules/@vue/compiler-core/dist/compiler-core.cjs.js
 /**
-* @vue/compiler-core v3.5.38
+* @vue/compiler-core v3.5.39
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -13163,7 +13163,7 @@ const ${helpers.map((s) => `_${helperNameMap[s]} = ${helperNameMap[s]}`).join(",
 			const child = node.children[i];
 			if (typeof child !== "object") continue;
 			if (child.type === 4) parseFilter(child, context);
-			else if (child.type === 8) rewriteFilter(node, context);
+			else if (child.type === 8) rewriteFilter(child, context);
 			else if (child.type === 5) rewriteFilter(child.content, context);
 		}
 	}
@@ -13493,15 +13493,15 @@ const ${helpers.map((s) => `_${helperNameMap[s]} = ${helperNameMap[s]}`).join(",
 	exports.warnDeprecation = warnDeprecation;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+compiler-core@3.5.38/node_modules/@vue/compiler-core/index.js
+//#region ../../node_modules/.pnpm/@vue+compiler-core@3.5.39/node_modules/@vue/compiler-core/index.js
 var require_compiler_core = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	if (process.env.NODE_ENV === "production") module.exports = require_compiler_core_cjs_prod();
 	else module.exports = require_compiler_core_cjs();
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+compiler-dom@3.5.38/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.prod.js
+//#region ../../node_modules/.pnpm/@vue+compiler-dom@3.5.39/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.prod.js
 /**
-* @vue/compiler-dom v3.5.38
+* @vue/compiler-dom v3.5.39
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -13934,9 +13934,9 @@ var require_compiler_dom_cjs_prod = /* @__PURE__ */ __commonJSMin(((exports) =>
 	});
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/@vue+compiler-dom@3.5.38/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
+//#region ../../node_modules/.pnpm/@vue+compiler-dom@3.5.39/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
 /**
-* @vue/compiler-dom v3.5.38
+* @vue/compiler-dom v3.5.39
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/