weapp-tailwindcss 5.0.12 → 5.0.13

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * from './framework';
 export { createWeappTailwindcssGenerator } from './generator';
 export type * from './generator';
 export { createPlugins } from './gulp';

package/dist/index.js

@@ -1,13 +1,29 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-Cb1Zp3Al.js");
-const require_gulp = require("./gulp-CxGZU0-v.js");
+const require_framework = require("./framework.js");
+const require_generator = require("./generator-CzpArpCL.js");
+const require_gulp = require("./gulp-XT8Jc7lH.js");
 const require_postcss = require("./postcss.js");
-const require_vite = require("./vite-BBGOjh9e.js");
-const require_webpack = require("./webpack-DIWrcpRo.js");
+const require_vite = require("./vite-CXHVsHmX.js");
+const require_webpack = require("./webpack-CfkUkMXG.js");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 exports.WeappTailwindcss = require_vite.WeappTailwindcss;
 exports.createPlugins = require_gulp.createPlugins;
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
+exports.detectAppType = require_framework.detectAppType;
+exports.detectAppTypeFromEnv = require_framework.detectAppTypeFromEnv;
+exports.detectAppTypeFromPackageJson = require_framework.detectAppTypeFromPackageJson;
+exports.isMpxPackage = require_framework.isMpxPackage;
+exports.isRunningInHBuilderX = require_framework.isRunningInHBuilderX;
+exports.isTaroPackage = require_framework.isTaroPackage;
+exports.isUniAppPackage = require_framework.isUniAppPackage;
+exports.isUniAppVitePackage = require_framework.isUniAppVitePackage;
+exports.isUniAppXManifest = require_framework.isUniAppXManifest;
+exports.isUniAppXPackage = require_framework.isUniAppXPackage;
+exports.isWeappVitePackage = require_framework.isWeappVitePackage;
+exports.resolveImplicitAppTypeFromViteRoot = require_framework.resolveImplicitAppTypeFromViteRoot;
+exports.resolveUniPlatform = require_framework.resolveUniPlatform;
+exports.resolveUniPlatformsFromEnv = require_framework.resolveUniPlatformsFromEnv;
+exports.resolveUniUtsPlatform = require_framework.resolveUniUtsPlatform;
 Object.defineProperty(exports, "unitConversionComposeRules", {
 	enumerable: true,
 	get: function() {

package/dist/index.mjs

@@ -1,7 +1,8 @@
-import { t as createWeappTailwindcssGenerator } from "./generator-mvNFUvns.mjs";
-import { t as createPlugins } from "./gulp-BfZpaYSQ.mjs";
+import { detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform } from "./framework.mjs";
+import { t as createWeappTailwindcssGenerator } from "./generator-ITLd7PTl.mjs";
+import { t as createPlugins } from "./gulp-DfOQERcV.mjs";
 import weappTailwindcssPostcssPlugin from "./postcss.mjs";
-import { t as WeappTailwindcss } from "./vite-CS5DE-HD.mjs";
-import { n as weappTailwindcssPackageDir } from "./webpack-SPcri_D8.mjs";
+import { t as WeappTailwindcss } from "./vite-DjI09vVN.mjs";
+import { n as weappTailwindcssPackageDir } from "./webpack-BcPpnT90.mjs";
 import { unitConversionComposeRules, unitConversionPresets } from "@weapp-tailwindcss/postcss";
-export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };
+export { WeappTailwindcss, createPlugins, createWeappTailwindcssGenerator, detectAppType, detectAppTypeFromEnv, detectAppTypeFromPackageJson, isMpxPackage, isRunningInHBuilderX, isTaroPackage, isUniAppPackage, isUniAppVitePackage, isUniAppXManifest, isUniAppXPackage, isWeappVitePackage, resolveImplicitAppTypeFromViteRoot, resolveUniPlatform, resolveUniPlatformsFromEnv, resolveUniUtsPlatform, unitConversionComposeRules, unitConversionPresets, weappTailwindcssPackageDir, weappTailwindcssPostcssPlugin };

package/dist/postcss.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_v3_engine = require("./v3-engine-CQE5JJNZ.js");
-const require_generator = require("./generator-Cb1Zp3Al.js");
+const require_v3_engine = require("./v3-engine-2rrgylhn.js");
+const require_generator = require("./generator-CzpArpCL.js");
 const weappTailwindcssPostcssPlugin = (0, require("@weapp-tailwindcss/postcss").createWeappTailwindcssPostcssPlugin)({
 	createGenerator: (source) => {
 		return require_generator.createWeappTailwindcssGenerator(source);

package/dist/postcss.mjs

@@ -1,5 +1,5 @@
-import { b as resolveTailwindV4Source, t as resolveTailwindV3Source } from "./v3-engine-DKBaKWGL.mjs";
-import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-mvNFUvns.mjs";
+import { t as resolveTailwindV3Source, x as resolveTailwindV4Source } from "./v3-engine-C6eJ0YzK.mjs";
+import { i as normalizeWeappTailwindcssGeneratorOptions, t as createWeappTailwindcssGenerator } from "./generator-ITLd7PTl.mjs";
 import { createWeappTailwindcssPostcssPlugin } from "@weapp-tailwindcss/postcss";
 const weappTailwindcssPostcssPlugin = createWeappTailwindcssPostcssPlugin({
 	createGenerator: (source) => {

package/dist/{precheck-30zNPRlI.js → precheck-B0Z8yW7E.js}

@@ -1,15 +1,15 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CQE5JJNZ.js");
-const require_defaults = require("./defaults-Boc26eel.js");
-require("./utils-Dolmt8EO.js");
-const require_tailwindcss = require("./tailwindcss-Clpkz1oR.js");
-let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
-let lru_cache = require("lru-cache");
-let tailwindcss_patch = require("tailwindcss-patch");
+const require_v3_engine = require("./v3-engine-2rrgylhn.js");
+const require_defaults = require("./defaults-C_J_kBpw.js");
+require("./utils-BCa37Wqj.js");
+const require_tailwindcss = require("./tailwindcss-DZEwT3C_.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
+let lru_cache = require("lru-cache");
+let tailwindcss_patch = require("tailwindcss-patch");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let node_fs_promises = require("node:fs/promises");
 let node_buffer = require("node:buffer");
@@ -4552,22 +4552,45 @@ function resolveRuntimePackageReplacements(option) {
 //#region src/context/style-options.ts
 function resolveStyleOptionsFromContext(ctx) {
 	const resolvedUniAppXOptions = require_tailwindcss.resolveUniAppXOptions(ctx.uniAppX);
+	const hasCssOptions = ctx.cssOptions !== void 0;
+	const cssOptions = {
+		cssPreflight: ctx.cssOptions?.cssPreflight ?? ctx.cssPreflight,
+		cssPreflightRange: ctx.cssOptions?.cssPreflightRange ?? ctx.cssPreflightRange,
+		cssChildCombinatorReplaceValue: ctx.cssOptions?.cssChildCombinatorReplaceValue ?? ctx.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: ctx.cssOptions?.cssSelectorReplacement ?? ctx.cssSelectorReplacement,
+		rem2rpx: ctx.cssOptions?.rem2rpx ?? ctx.rem2rpx,
+		cssRemoveProperty: ctx.cssOptions?.cssRemoveProperty ?? ctx.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: ctx.cssOptions?.cssRemoveHoverPseudoClass ?? ctx.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: ctx.cssOptions?.tailwindcssV4GradientFallback ?? ctx.tailwindcssV4GradientFallback,
+		cssPresetEnv: ctx.cssOptions?.cssPresetEnv ?? ctx.cssPresetEnv,
+		atRules: ctx.cssOptions?.atRules ?? ctx.atRules,
+		autoprefixer: ctx.cssOptions?.autoprefixer ?? ctx.autoprefixer,
+		cssCalc: ctx.cssOptions?.cssCalc ?? ctx.cssCalc,
+		platform: ctx.cssOptions?.platform ?? ctx.platform,
+		px2rpx: ctx.cssOptions?.px2rpx ?? ctx.px2rpx,
+		unitsToPx: ctx.cssOptions?.unitsToPx ?? ctx.unitsToPx,
+		unitConversion: ctx.cssOptions?.unitConversion ?? ctx.unitConversion,
+		injectAdditionalCssVarScope: ctx.cssOptions?.injectAdditionalCssVarScope ?? ctx.injectAdditionalCssVarScope
+	};
 	return {
-		cssPreflight: ctx.cssPreflight,
-		cssPreflightRange: ctx.cssPreflightRange,
-		cssChildCombinatorReplaceValue: ctx.cssChildCombinatorReplaceValue,
-		cssSelectorReplacement: ctx.cssSelectorReplacement,
-		rem2rpx: ctx.rem2rpx,
-		cssRemoveProperty: ctx.cssRemoveProperty,
-		cssRemoveHoverPseudoClass: ctx.cssRemoveHoverPseudoClass,
-		cssPresetEnv: ctx.cssPresetEnv,
-		autoprefixer: ctx.autoprefixer,
-		cssCalc: ctx.cssCalc,
+		cssPreflight: cssOptions.cssPreflight,
+		cssPreflightRange: cssOptions.cssPreflightRange,
+		cssChildCombinatorReplaceValue: cssOptions.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: cssOptions.cssSelectorReplacement,
+		rem2rpx: cssOptions.rem2rpx,
+		...hasCssOptions ? { cssOptions } : {},
+		cssRemoveProperty: cssOptions.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: cssOptions.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: cssOptions.tailwindcssV4GradientFallback,
+		cssPresetEnv: cssOptions.cssPresetEnv,
+		atRules: cssOptions.atRules,
+		autoprefixer: cssOptions.autoprefixer,
+		cssCalc: cssOptions.cssCalc,
 		uniAppX: resolvedUniAppXOptions.enabled,
-		platform: ctx.platform,
-		px2rpx: ctx.px2rpx,
-		unitsToPx: ctx.unitsToPx,
-		unitConversion: ctx.unitConversion
+		platform: cssOptions.platform,
+		px2rpx: cssOptions.px2rpx,
+		unitsToPx: cssOptions.unitsToPx,
+		unitConversion: cssOptions.unitConversion
 	};
 }
 //#endregion
@@ -4576,12 +4599,13 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
 	const { escapeMap, injectAdditionalCssVarScope, postcssOptions, uniAppX, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
 	const resolvedUniAppXOptions = require_tailwindcss.resolveUniAppXOptions(uniAppX);
 	const styleOptions = resolveStyleOptionsFromContext(ctx);
+	const resolvedInjectAdditionalCssVarScope = styleOptions.cssOptions?.injectAdditionalCssVarScope ?? injectAdditionalCssVarScope;
 	const uniAppXEnabled = styleOptions.uniAppX === true;
 	const moduleSpecifierReplacements = resolveRuntimePackageReplacements(replaceRuntimePackages);
 	const styleHandler = (0, _weapp_tailwindcss_postcss.createStyleHandler)({
 		...styleOptions,
 		escapeMap,
-		injectAdditionalCssVarScope,
+		injectAdditionalCssVarScope: resolvedInjectAdditionalCssVarScope,
 		postcssOptions,
 		uniAppXUnsupported: resolvedUniAppXOptions.uvueUnsupported,
 		cssCalc: cssCalcOptions,
@@ -4626,14 +4650,59 @@ function applyLoggerLevel(logLevel) {
 //#endregion
 //#region src/context/index.ts
 function resolveContextCssPreflight(opts, ctx, majorVersion) {
-	const cssPreflight = require_defaults.resolveDefaultCssPreflight(opts?.cssPreflight, majorVersion);
+	const userCssPreflight = opts?.cssOptions?.cssPreflight ?? opts?.cssPreflight;
+	const cssPreflight = require_defaults.resolveDefaultCssPreflight(userCssPreflight, majorVersion);
 	if (majorVersion !== 4 || cssPreflight === false || !require_tailwindcss.resolveUniAppXOptions(ctx.uniAppX).enabled) return cssPreflight;
-	const userCssPreflight = opts?.cssPreflight && typeof opts.cssPreflight === "object" ? opts.cssPreflight : void 0;
+	const userCssPreflightObject = userCssPreflight && typeof userCssPreflight === "object" ? userCssPreflight : void 0;
 	return {
 		...cssPreflight,
-		"border-width": userCssPreflight && "border-width" in userCssPreflight ? cssPreflight["border-width"] ?? false : "0",
-		"border-style": userCssPreflight && "border-style" in userCssPreflight ? cssPreflight["border-style"] ?? false : false,
-		"border": userCssPreflight && "border" in userCssPreflight ? cssPreflight["border"] ?? false : false
+		"border-width": userCssPreflightObject && "border-width" in userCssPreflightObject ? cssPreflight["border-width"] ?? false : "0",
+		"border-style": userCssPreflightObject && "border-style" in userCssPreflightObject ? cssPreflight["border-style"] ?? false : false,
+		"border": userCssPreflightObject && "border" in userCssPreflightObject ? cssPreflight["border"] ?? false : false
+	};
+}
+function syncCssOptionsToLegacyFields(ctx) {
+	if (!ctx.cssOptions) return;
+	const cssOptions = ctx.cssOptions;
+	ctx.cssPreflight = cssOptions.cssPreflight ?? ctx.cssPreflight;
+	ctx.cssPreflightRange = cssOptions.cssPreflightRange ?? ctx.cssPreflightRange;
+	ctx.cssChildCombinatorReplaceValue = cssOptions.cssChildCombinatorReplaceValue ?? ctx.cssChildCombinatorReplaceValue;
+	ctx.cssSelectorReplacement = cssOptions.cssSelectorReplacement ?? ctx.cssSelectorReplacement;
+	ctx.rem2rpx = cssOptions.rem2rpx ?? ctx.rem2rpx;
+	ctx.cssRemoveProperty = cssOptions.cssRemoveProperty ?? ctx.cssRemoveProperty;
+	ctx.cssRemoveHoverPseudoClass = cssOptions.cssRemoveHoverPseudoClass ?? ctx.cssRemoveHoverPseudoClass;
+	ctx.tailwindcssV4GradientFallback = cssOptions.tailwindcssV4GradientFallback ?? ctx.tailwindcssV4GradientFallback;
+	ctx.cssPresetEnv = cssOptions.cssPresetEnv ?? ctx.cssPresetEnv;
+	ctx.atRules = cssOptions.atRules ?? ctx.atRules;
+	ctx.autoprefixer = cssOptions.autoprefixer ?? ctx.autoprefixer;
+	ctx.cssCalc = cssOptions.cssCalc ?? ctx.cssCalc;
+	ctx.platform = cssOptions.platform ?? ctx.platform;
+	ctx.px2rpx = cssOptions.px2rpx ?? ctx.px2rpx;
+	ctx.unitsToPx = cssOptions.unitsToPx ?? ctx.unitsToPx;
+	ctx.unitConversion = cssOptions.unitConversion ?? ctx.unitConversion;
+	ctx.injectAdditionalCssVarScope = cssOptions.injectAdditionalCssVarScope ?? ctx.injectAdditionalCssVarScope;
+}
+function syncLegacyFieldsToCssOptions(ctx) {
+	if (!ctx.cssOptions) return;
+	ctx.cssOptions = {
+		...ctx.cssOptions ?? {},
+		cssPreflight: ctx.cssPreflight,
+		cssPreflightRange: ctx.cssPreflightRange,
+		cssChildCombinatorReplaceValue: ctx.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: ctx.cssSelectorReplacement,
+		rem2rpx: ctx.rem2rpx,
+		cssRemoveProperty: ctx.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: ctx.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: ctx.tailwindcssV4GradientFallback,
+		cssPresetEnv: ctx.cssPresetEnv,
+		atRules: ctx.atRules,
+		autoprefixer: ctx.autoprefixer,
+		cssCalc: ctx.cssCalc,
+		platform: ctx.platform,
+		px2rpx: ctx.px2rpx,
+		unitsToPx: ctx.unitsToPx,
+		unitConversion: ctx.unitConversion,
+		injectAdditionalCssVarScope: ctx.injectAdditionalCssVarScope
 	};
 }
 async function clearTailwindcssPatcherCache(patcher, options) {
@@ -4668,6 +4737,7 @@ function createInternalCompilerContext(opts) {
 	const ctx = (0, _weapp_tailwindcss_shared.defuOverrideArray)(opts, require_defaults.getDefaultOptions(), {});
 	ctx.arbitraryValues = resolveUnocssBareArbitraryValues(ctx.arbitraryValues, ctx.unocss);
 	ctx.escapeMap = ctx.customReplaceDictionary;
+	syncCssOptionsToLegacyFields(ctx);
 	applyLoggerLevel(ctx.logLevel);
 	const twPatcher = require_tailwindcss.createTailwindcssPatcherFromContext(ctx);
 	logTailwindcssTarget(twPatcher, ctx.tailwindcssBasedir);
@@ -4676,6 +4746,7 @@ function createInternalCompilerContext(opts) {
 	ctx.cssPreflight = resolveContextCssPreflight(opts, ctx, twPatcher.majorVersion);
 	const cssCalcOptions = require_tailwindcss.applyV4CssCalcDefaults(ctx.cssCalc, twPatcher);
 	ctx.cssCalc = cssCalcOptions;
+	syncLegacyFieldsToCssOptions(ctx);
 	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, toCustomAttributesEntities(ctx.customAttributes), cssCalcOptions, twPatcher.majorVersion);
 	ctx.styleHandler = styleHandler;
 	ctx.jsHandler = jsHandler;

package/dist/{precheck-CsFr1q2l.mjs → precheck-CRI90iL1.mjs}

@@ -1,12 +1,12 @@
-import { S as resolveTailwindV4SourceFromPatcher, at as createDebug, c as ensureTailwindcssRuntimePatch, d as getRuntimeClassSetSignatureWithSources, dt as resolveBooleanObjectOption, f as invalidateRuntimeClassSet, ht as omitUndefined, l as getRuntimeClassSetCacheEntry, q as createTailwindV4Engine$1 } from "./v3-engine-DKBaKWGL.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-DH0ZQRhy.mjs";
-import { i as isMap, n as defuOverrideArray } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-CK84uGBp.mjs";
+import { C as resolveTailwindV4SourceFromPatcher, J as createTailwindV4Engine$1, c as ensureTailwindcssRuntimePatch, d as getRuntimeClassSetSignatureWithSources, f as invalidateRuntimeClassSet, ft as resolveBooleanObjectOption, gt as omitUndefined, l as getRuntimeClassSetCacheEntry, ot as createDebug } from "./v3-engine-C6eJ0YzK.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-Bqx18S1f.mjs";
+import { i as isMap, n as defuOverrideArray } from "./utils-DodxWHGz.mjs";
+import { i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssPatcherFromContext } from "./tailwindcss-DTq3uYBK.mjs";
+import path from "node:path";
+import process from "node:process";
 import { createStyleHandler } from "@weapp-tailwindcss/postcss";
 import { LRUCache } from "lru-cache";
 import { splitCandidateTokens } from "tailwindcss-patch";
-import path from "node:path";
-import process from "node:process";
 import { logger, pc } from "@weapp-tailwindcss/logger";
 import { rm } from "node:fs/promises";
 import { Buffer } from "node:buffer";
@@ -4545,22 +4545,45 @@ function resolveRuntimePackageReplacements(option) {
 //#region src/context/style-options.ts
 function resolveStyleOptionsFromContext(ctx) {
 	const resolvedUniAppXOptions = resolveUniAppXOptions(ctx.uniAppX);
+	const hasCssOptions = ctx.cssOptions !== void 0;
+	const cssOptions = {
+		cssPreflight: ctx.cssOptions?.cssPreflight ?? ctx.cssPreflight,
+		cssPreflightRange: ctx.cssOptions?.cssPreflightRange ?? ctx.cssPreflightRange,
+		cssChildCombinatorReplaceValue: ctx.cssOptions?.cssChildCombinatorReplaceValue ?? ctx.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: ctx.cssOptions?.cssSelectorReplacement ?? ctx.cssSelectorReplacement,
+		rem2rpx: ctx.cssOptions?.rem2rpx ?? ctx.rem2rpx,
+		cssRemoveProperty: ctx.cssOptions?.cssRemoveProperty ?? ctx.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: ctx.cssOptions?.cssRemoveHoverPseudoClass ?? ctx.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: ctx.cssOptions?.tailwindcssV4GradientFallback ?? ctx.tailwindcssV4GradientFallback,
+		cssPresetEnv: ctx.cssOptions?.cssPresetEnv ?? ctx.cssPresetEnv,
+		atRules: ctx.cssOptions?.atRules ?? ctx.atRules,
+		autoprefixer: ctx.cssOptions?.autoprefixer ?? ctx.autoprefixer,
+		cssCalc: ctx.cssOptions?.cssCalc ?? ctx.cssCalc,
+		platform: ctx.cssOptions?.platform ?? ctx.platform,
+		px2rpx: ctx.cssOptions?.px2rpx ?? ctx.px2rpx,
+		unitsToPx: ctx.cssOptions?.unitsToPx ?? ctx.unitsToPx,
+		unitConversion: ctx.cssOptions?.unitConversion ?? ctx.unitConversion,
+		injectAdditionalCssVarScope: ctx.cssOptions?.injectAdditionalCssVarScope ?? ctx.injectAdditionalCssVarScope
+	};
 	return {
-		cssPreflight: ctx.cssPreflight,
-		cssPreflightRange: ctx.cssPreflightRange,
-		cssChildCombinatorReplaceValue: ctx.cssChildCombinatorReplaceValue,
-		cssSelectorReplacement: ctx.cssSelectorReplacement,
-		rem2rpx: ctx.rem2rpx,
-		cssRemoveProperty: ctx.cssRemoveProperty,
-		cssRemoveHoverPseudoClass: ctx.cssRemoveHoverPseudoClass,
-		cssPresetEnv: ctx.cssPresetEnv,
-		autoprefixer: ctx.autoprefixer,
-		cssCalc: ctx.cssCalc,
+		cssPreflight: cssOptions.cssPreflight,
+		cssPreflightRange: cssOptions.cssPreflightRange,
+		cssChildCombinatorReplaceValue: cssOptions.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: cssOptions.cssSelectorReplacement,
+		rem2rpx: cssOptions.rem2rpx,
+		...hasCssOptions ? { cssOptions } : {},
+		cssRemoveProperty: cssOptions.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: cssOptions.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: cssOptions.tailwindcssV4GradientFallback,
+		cssPresetEnv: cssOptions.cssPresetEnv,
+		atRules: cssOptions.atRules,
+		autoprefixer: cssOptions.autoprefixer,
+		cssCalc: cssOptions.cssCalc,
 		uniAppX: resolvedUniAppXOptions.enabled,
-		platform: ctx.platform,
-		px2rpx: ctx.px2rpx,
-		unitsToPx: ctx.unitsToPx,
-		unitConversion: ctx.unitConversion
+		platform: cssOptions.platform,
+		px2rpx: cssOptions.px2rpx,
+		unitsToPx: cssOptions.unitsToPx,
+		unitConversion: cssOptions.unitConversion
 	};
 }
 //#endregion
@@ -4569,12 +4592,13 @@ function createHandlersFromContext(ctx, customAttributesEntities, cssCalcOptions
 	const { escapeMap, injectAdditionalCssVarScope, postcssOptions, uniAppX, arbitraryValues, jsPreserveClass, jsArbitraryValueFallback, babelParserOptions, ignoreCallExpressionIdentifiers, ignoreTaggedTemplateExpressionIdentifiers, inlineWxs, disabledDefaultTemplateHandler, replaceRuntimePackages } = ctx;
 	const resolvedUniAppXOptions = resolveUniAppXOptions(uniAppX);
 	const styleOptions = resolveStyleOptionsFromContext(ctx);
+	const resolvedInjectAdditionalCssVarScope = styleOptions.cssOptions?.injectAdditionalCssVarScope ?? injectAdditionalCssVarScope;
 	const uniAppXEnabled = styleOptions.uniAppX === true;
 	const moduleSpecifierReplacements = resolveRuntimePackageReplacements(replaceRuntimePackages);
 	const styleHandler = createStyleHandler({
 		...styleOptions,
 		escapeMap,
-		injectAdditionalCssVarScope,
+		injectAdditionalCssVarScope: resolvedInjectAdditionalCssVarScope,
 		postcssOptions,
 		uniAppXUnsupported: resolvedUniAppXOptions.uvueUnsupported,
 		cssCalc: cssCalcOptions,
@@ -4619,14 +4643,59 @@ function applyLoggerLevel(logLevel) {
 //#endregion
 //#region src/context/index.ts
 function resolveContextCssPreflight(opts, ctx, majorVersion) {
-	const cssPreflight = resolveDefaultCssPreflight(opts?.cssPreflight, majorVersion);
+	const userCssPreflight = opts?.cssOptions?.cssPreflight ?? opts?.cssPreflight;
+	const cssPreflight = resolveDefaultCssPreflight(userCssPreflight, majorVersion);
 	if (majorVersion !== 4 || cssPreflight === false || !resolveUniAppXOptions(ctx.uniAppX).enabled) return cssPreflight;
-	const userCssPreflight = opts?.cssPreflight && typeof opts.cssPreflight === "object" ? opts.cssPreflight : void 0;
+	const userCssPreflightObject = userCssPreflight && typeof userCssPreflight === "object" ? userCssPreflight : void 0;
 	return {
 		...cssPreflight,
-		"border-width": userCssPreflight && "border-width" in userCssPreflight ? cssPreflight["border-width"] ?? false : "0",
-		"border-style": userCssPreflight && "border-style" in userCssPreflight ? cssPreflight["border-style"] ?? false : false,
-		"border": userCssPreflight && "border" in userCssPreflight ? cssPreflight["border"] ?? false : false
+		"border-width": userCssPreflightObject && "border-width" in userCssPreflightObject ? cssPreflight["border-width"] ?? false : "0",
+		"border-style": userCssPreflightObject && "border-style" in userCssPreflightObject ? cssPreflight["border-style"] ?? false : false,
+		"border": userCssPreflightObject && "border" in userCssPreflightObject ? cssPreflight["border"] ?? false : false
+	};
+}
+function syncCssOptionsToLegacyFields(ctx) {
+	if (!ctx.cssOptions) return;
+	const cssOptions = ctx.cssOptions;
+	ctx.cssPreflight = cssOptions.cssPreflight ?? ctx.cssPreflight;
+	ctx.cssPreflightRange = cssOptions.cssPreflightRange ?? ctx.cssPreflightRange;
+	ctx.cssChildCombinatorReplaceValue = cssOptions.cssChildCombinatorReplaceValue ?? ctx.cssChildCombinatorReplaceValue;
+	ctx.cssSelectorReplacement = cssOptions.cssSelectorReplacement ?? ctx.cssSelectorReplacement;
+	ctx.rem2rpx = cssOptions.rem2rpx ?? ctx.rem2rpx;
+	ctx.cssRemoveProperty = cssOptions.cssRemoveProperty ?? ctx.cssRemoveProperty;
+	ctx.cssRemoveHoverPseudoClass = cssOptions.cssRemoveHoverPseudoClass ?? ctx.cssRemoveHoverPseudoClass;
+	ctx.tailwindcssV4GradientFallback = cssOptions.tailwindcssV4GradientFallback ?? ctx.tailwindcssV4GradientFallback;
+	ctx.cssPresetEnv = cssOptions.cssPresetEnv ?? ctx.cssPresetEnv;
+	ctx.atRules = cssOptions.atRules ?? ctx.atRules;
+	ctx.autoprefixer = cssOptions.autoprefixer ?? ctx.autoprefixer;
+	ctx.cssCalc = cssOptions.cssCalc ?? ctx.cssCalc;
+	ctx.platform = cssOptions.platform ?? ctx.platform;
+	ctx.px2rpx = cssOptions.px2rpx ?? ctx.px2rpx;
+	ctx.unitsToPx = cssOptions.unitsToPx ?? ctx.unitsToPx;
+	ctx.unitConversion = cssOptions.unitConversion ?? ctx.unitConversion;
+	ctx.injectAdditionalCssVarScope = cssOptions.injectAdditionalCssVarScope ?? ctx.injectAdditionalCssVarScope;
+}
+function syncLegacyFieldsToCssOptions(ctx) {
+	if (!ctx.cssOptions) return;
+	ctx.cssOptions = {
+		...ctx.cssOptions ?? {},
+		cssPreflight: ctx.cssPreflight,
+		cssPreflightRange: ctx.cssPreflightRange,
+		cssChildCombinatorReplaceValue: ctx.cssChildCombinatorReplaceValue,
+		cssSelectorReplacement: ctx.cssSelectorReplacement,
+		rem2rpx: ctx.rem2rpx,
+		cssRemoveProperty: ctx.cssRemoveProperty,
+		cssRemoveHoverPseudoClass: ctx.cssRemoveHoverPseudoClass,
+		tailwindcssV4GradientFallback: ctx.tailwindcssV4GradientFallback,
+		cssPresetEnv: ctx.cssPresetEnv,
+		atRules: ctx.atRules,
+		autoprefixer: ctx.autoprefixer,
+		cssCalc: ctx.cssCalc,
+		platform: ctx.platform,
+		px2rpx: ctx.px2rpx,
+		unitsToPx: ctx.unitsToPx,
+		unitConversion: ctx.unitConversion,
+		injectAdditionalCssVarScope: ctx.injectAdditionalCssVarScope
 	};
 }
 async function clearTailwindcssPatcherCache(patcher, options) {
@@ -4661,6 +4730,7 @@ function createInternalCompilerContext(opts) {
 	const ctx = defuOverrideArray(opts, getDefaultOptions(), {});
 	ctx.arbitraryValues = resolveUnocssBareArbitraryValues(ctx.arbitraryValues, ctx.unocss);
 	ctx.escapeMap = ctx.customReplaceDictionary;
+	syncCssOptionsToLegacyFields(ctx);
 	applyLoggerLevel(ctx.logLevel);
 	const twPatcher = createTailwindcssPatcherFromContext(ctx);
 	logTailwindcssTarget(twPatcher, ctx.tailwindcssBasedir);
@@ -4669,6 +4739,7 @@ function createInternalCompilerContext(opts) {
 	ctx.cssPreflight = resolveContextCssPreflight(opts, ctx, twPatcher.majorVersion);
 	const cssCalcOptions = applyV4CssCalcDefaults(ctx.cssCalc, twPatcher);
 	ctx.cssCalc = cssCalcOptions;
+	syncLegacyFieldsToCssOptions(ctx);
 	const { styleHandler, jsHandler, templateHandler } = createHandlersFromContext(ctx, toCustomAttributesEntities(ctx.customAttributes), cssCalcOptions, twPatcher.majorVersion);
 	ctx.styleHandler = styleHandler;
 	ctx.jsHandler = jsHandler;

package/dist/presets.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CQE5JJNZ.js");
-const require_utils = require("./utils-Dolmt8EO.js");
-const require_tailwindcss = require("./tailwindcss-Clpkz1oR.js");
+const require_v3_engine = require("./v3-engine-2rrgylhn.js");
+const require_utils = require("./utils-BCa37Wqj.js");
+const require_tailwindcss = require("./tailwindcss-DZEwT3C_.js");
 require("./logger-TlKT3xmR.js");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);

package/dist/presets.mjs

@@ -1,6 +1,6 @@
-import { ht as omitUndefined } from "./v3-engine-DKBaKWGL.mjs";
-import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
-import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-CK84uGBp.mjs";
+import { gt as omitUndefined } from "./v3-engine-C6eJ0YzK.mjs";
+import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DodxWHGz.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-DTq3uYBK.mjs";
 import { t as logger } from "./logger-BNzxZbZj.mjs";
 import path from "node:path";
 import process from "node:process";

package/dist/{tailwindcss-CK84uGBp.mjs → tailwindcss-DTq3uYBK.mjs}

@@ -1,5 +1,5 @@
-import { ft as findNearestPackageRoot, ht as omitUndefined, mt as findWorkspaceRoot, ot as createTailwindcssPatcher, p as runtimeSignaturePatchersSymbol, pt as findWorkspacePackageDir, st as readInstalledPackageMajorVersion, ut as normalizeStringListOption } from "./v3-engine-DKBaKWGL.mjs";
-import { n as defuOverrideArray } from "./utils-DsaS975I.mjs";
+import { ct as readInstalledPackageMajorVersion, dt as normalizeStringListOption, gt as omitUndefined, ht as findWorkspaceRoot, mt as findWorkspacePackageDir, p as runtimeSignaturePatchersSymbol, pt as findNearestPackageRoot, st as createTailwindcssPatcher } from "./v3-engine-C6eJ0YzK.mjs";
+import { n as defuOverrideArray } from "./utils-DodxWHGz.mjs";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";

package/dist/{tailwindcss-Clpkz1oR.js → tailwindcss-DZEwT3C_.js}

@@ -1,12 +1,12 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
-const require_v3_engine = require("./v3-engine-CQE5JJNZ.js");
-require("./utils-Dolmt8EO.js");
-let node_module = require("node:module");
+const require_v3_engine = require("./v3-engine-2rrgylhn.js");
+require("./utils-BCa37Wqj.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let node_module = require("node:module");
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let node_url = require("node:url");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");