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

package/dist/types/index.d.ts

@@ -5,13 +5,16 @@ import type { Document, Result as PostcssResult, Root } from 'postcss';
 import type { ILengthUnitsPatchOptions, TailwindcssPatcher } from 'tailwindcss-patch';
 import type { ICreateCacheReturnType } from '../cache';
 import type { ItemOrItemArray } from './base';
-import type { DisabledOptions } from './disabled-options';
 import type { AppType, IArbitraryValues, ICustomAttributesEntities } from './shared';
 import type { UniAppXComponentLocalStylesOptions, UniAppXOptions as UniAppXUserDefinedOptions, UserDefinedOptions } from './user-defined-options';
 type AsyncableMethod<T> = T extends (...args: infer A) => infer R ? (...args: A) => Promise<Awaited<R>> | Awaited<R> : never;
-export type { DisabledOptions, UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
+export type { UniAppXComponentLocalStylesOptions, UniAppXUserDefinedOptions, UserDefinedOptions, };
 export type { CssPreflightOptions, IStyleHandlerOptions, ItemOrItemArray };
-export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities } from './shared';
+export type { AppType, IArbitraryValues, ICustomAttributes, ICustomAttributesEntities, IUnocssCompatibilityOptions } from './shared';
+export type RequiredDefined<T> = {
+    [K in keyof T]-?: Exclude<T[K], undefined>;
+};
+type InternalUserDefinedOptionsBase = RequiredDefined<Omit<UserDefinedOptions, 'supportCustomLengthUnitsPatch' | 'customReplaceDictionary' | 'cache' | 'twPatcher' | 'refreshTailwindcssPatcher' | 'templateHandler' | 'styleHandler' | 'jsHandler'>>;
 export interface LinkedJsModuleResult {
     code: string;
 }
@@ -23,57 +26,62 @@ export interface JsHandlerResult {
 }
 export interface TailwindcssPatcherLike {
     packageInfo: TailwindcssPatcher['packageInfo'];
-    majorVersion?: TailwindcssPatcher['majorVersion'];
-    patch: TailwindcssPatcher['patch'];
+    majorVersion?: TailwindcssPatcher['majorVersion'] | undefined;
+    patch?: TailwindcssPatcher['patch'] | undefined;
     getClassSet: AsyncableMethod<TailwindcssPatcher['getClassSet']>;
-    getClassSetSync?: TailwindcssPatcher['getClassSetSync'];
+    getClassSetSync?: TailwindcssPatcher['getClassSetSync'] | undefined;
     extract: TailwindcssPatcher['extract'];
-    collectContentTokens?: TailwindcssPatcher['collectContentTokens'];
-    options?: TailwindcssPatcher['options'];
+    collectContentTokens?: TailwindcssPatcher['collectContentTokens'] | undefined;
+    options?: TailwindcssPatcher['options'] | undefined;
 }
+export type BabelParserOptions = ParserOptions & {
+    cache?: boolean | undefined;
+    cacheKey?: string | undefined;
+    cacheMaxEntries?: number | undefined;
+    cacheMaxSourceLength?: number | undefined;
+};
 export interface RefreshTailwindcssPatcherOptions {
-    clearCache?: boolean;
+    clearCache?: boolean | undefined;
 }
 export interface IJsHandlerOptions {
-    escapeMap?: Record<string, string>;
-    classNameSet?: Set<string>;
-    staleClassNameFallback?: boolean;
-    jsArbitraryValueFallback?: boolean | 'auto';
-    tailwindcssMajorVersion?: number;
-    arbitraryValues?: IArbitraryValues;
-    jsPreserveClass?: (keyword: string) => boolean | undefined;
-    needEscaped?: boolean;
-    generateMap?: boolean;
-    alwaysEscape?: boolean;
-    unescapeUnicode?: boolean;
-    babelParserOptions?: ParserOptions;
-    ignoreTaggedTemplateExpressionIdentifiers?: (string | RegExp)[];
-    ignoreCallExpressionIdentifiers?: (string | RegExp)[];
-    uniAppX?: boolean;
-    moduleSpecifierReplacements?: Record<string, string>;
-    wrapExpression?: boolean;
-    filename?: string;
-    moduleGraph?: JsModuleGraphOptions;
+    escapeMap?: Record<string, string> | undefined;
+    classNameSet?: Set<string> | undefined;
+    jsArbitraryValueFallback?: boolean | 'auto' | undefined;
+    tailwindcssMajorVersion?: number | undefined;
+    arbitraryValues?: IArbitraryValues | undefined;
+    jsPreserveClass?: ((keyword: string) => boolean | undefined) | undefined;
+    needEscaped?: boolean | undefined;
+    generateMap?: boolean | undefined;
+    alwaysEscape?: boolean | undefined;
+    unescapeUnicode?: boolean | undefined;
+    babelParserOptions?: BabelParserOptions | undefined;
+    ignoreTaggedTemplateExpressionIdentifiers?: (string | RegExp)[] | undefined;
+    ignoreCallExpressionIdentifiers?: (string | RegExp)[] | undefined;
+    uniAppX?: boolean | undefined;
+    moduleSpecifierReplacements?: Record<string, string> | undefined;
+    wrapExpression?: boolean | undefined;
+    filename?: string | undefined;
+    moduleGraph?: JsModuleGraphOptions | undefined;
 }
 export interface JsHandler {
     (rawSource: string, set?: Set<string>, options?: CreateJsHandlerOptions): JsHandlerResult;
 }
 export interface ICommonReplaceOptions {
-    keepEOL?: boolean;
-    escapeMap?: Record<string, string>;
+    keepEOL?: boolean | undefined;
+    escapeMap?: Record<string, string> | undefined;
 }
 export interface ITemplateHandlerOptions extends ICommonReplaceOptions {
-    customAttributesEntities?: ICustomAttributesEntities;
-    escapeMap?: Record<string, string>;
-    inlineWxs?: boolean;
-    jsHandler?: JsHandler;
-    runtimeSet?: Set<string>;
-    disabledDefaultTemplateHandler?: boolean;
-    quote?: string | null;
-    ignoreHead?: boolean;
-    wrapExpression?: boolean;
+    customAttributesEntities?: ICustomAttributesEntities | undefined;
+    escapeMap?: Record<string, string> | undefined;
+    inlineWxs?: boolean | undefined;
+    jsHandler?: JsHandler | undefined;
+    runtimeSet?: Set<string> | undefined;
+    disabledDefaultTemplateHandler?: boolean | undefined;
+    quote?: string | null | undefined;
+    ignoreHead?: boolean | undefined;
+    wrapExpression?: boolean | undefined;
 }
-export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, 'supportCustomLengthUnitsPatch' | 'customReplaceDictionary' | 'cache'> & {
+export interface InternalUserDefinedOptions extends InternalUserDefinedOptionsBase {
     supportCustomLengthUnitsPatch: ILengthUnitsPatchOptions | boolean;
     templateHandler: (rawSource: string, options?: ITemplateHandlerOptions) => Promise<string>;
     styleHandler: (rawSource: string, options?: IStyleHandlerOptions) => Promise<PostcssResult<Root | Document>>;
@@ -83,22 +91,17 @@ export type InternalUserDefinedOptions = Required<Omit<UserDefinedOptions, 'supp
     cache: ICreateCacheReturnType;
     twPatcher: TailwindcssPatcherLike;
     refreshTailwindcssPatcher: (options?: RefreshTailwindcssPatcherOptions) => Promise<TailwindcssPatcherLike>;
-}>;
+}
 export type InternalPostcssOptions = Pick<UserDefinedOptions, 'cssMatcher' | 'mainCssChunkMatcher' | 'cssPreflight' | 'cssPreflightRange' | 'disabled'>;
 export interface IBaseWebpackPlugin {
     options: InternalUserDefinedOptions;
-    appType?: AppType;
+    appType?: AppType | undefined;
     apply: (compiler: any) => void;
 }
-export interface InternalPatchResult {
-    dataTypes?: string;
-    processTailwindFeatures?: string;
-    plugin?: string;
-}
 export type CreateJsHandlerOptions = Omit<IJsHandlerOptions, 'classNameSet'>;
 export interface JsModuleGraphOptions {
     resolve: (specifier: string, importer: string) => string | undefined;
     load: (id: string) => string | undefined;
-    filter?: (id: string, specifier: string, importer: string) => boolean;
-    maxDepth?: number;
+    filter?: ((id: string, specifier: string, importer: string) => boolean) | undefined;
+    maxDepth?: number | undefined;
 }

package/dist/types/shared.d.ts

@@ -4,4 +4,10 @@ export type ICustomAttributes = Record<string, ItemOrItemArray<string | RegExp>>
 export type ICustomAttributesEntities = [string | RegExp, ItemOrItemArray<string | RegExp>][];
 export interface IArbitraryValues {
     allowDoubleQuotes?: boolean;
+    bareArbitraryValues?: boolean | {
+        units?: string[];
+    };
+}
+export interface IUnocssCompatibilityOptions {
+    bareArbitraryValues?: IArbitraryValues['bareArbitraryValues'];
 }

package/dist/types/user-defined-options/general.d.ts

@@ -3,29 +3,30 @@ import type { LoadedPostcssOptions } from '@weapp-tailwindcss/postcss/types';
 import type { ILengthUnitsPatchOptions, TailwindCssPatchOptions } from 'tailwindcss-patch';
 import type { ICreateCacheReturnType } from '../../cache';
 import type { WeappTailwindcssGeneratorUserOptions } from '../../generator';
-import type { AppType, IArbitraryValues } from '../shared';
+import type { AppType, IArbitraryValues, IUnocssCompatibilityOptions } from '../shared';
 export interface UserDefinedOptionsGeneralPart {
-    supportCustomLengthUnitsPatch?: ILengthUnitsPatchOptions | boolean;
-    appType?: AppType;
-    arbitraryValues?: IArbitraryValues;
-    jsPreserveClass?: (keyword: string) => boolean | undefined;
-    staleClassNameFallback?: boolean;
-    jsArbitraryValueFallback?: boolean | 'auto';
-    replaceRuntimePackages?: boolean | Record<string, string>;
-    generator?: WeappTailwindcssGeneratorUserOptions;
-    disabledDefaultTemplateHandler?: boolean;
-    runtimeLoaderPath?: string;
-    runtimeCssImportRewriteLoaderPath?: string;
-    tailwindcssBasedir?: string;
-    cache?: boolean | ICreateCacheReturnType;
-    babelParserOptions?: ParserOptions & {
-        cache?: boolean;
-        cacheKey?: string;
-    };
-    cssChildCombinatorReplaceValue?: string | string[];
-    postcssOptions?: LoadedPostcssOptions;
-    cssRemoveHoverPseudoClass?: boolean;
-    cssRemoveProperty?: boolean;
-    tailwindcssPatcherOptions?: TailwindCssPatchOptions;
-    logLevel?: 'info' | 'warn' | 'error' | 'silent';
+    supportCustomLengthUnitsPatch?: ILengthUnitsPatchOptions | boolean | undefined;
+    appType?: AppType | undefined;
+    arbitraryValues?: IArbitraryValues | undefined;
+    unocss?: boolean | IUnocssCompatibilityOptions | undefined;
+    jsPreserveClass?: ((keyword: string) => boolean | undefined) | undefined;
+    jsArbitraryValueFallback?: boolean | 'auto' | undefined;
+    replaceRuntimePackages?: boolean | Record<string, string> | undefined;
+    generator?: WeappTailwindcssGeneratorUserOptions | undefined;
+    disabledDefaultTemplateHandler?: boolean | undefined;
+    runtimeLoaderPath?: string | undefined;
+    tailwindcssBasedir?: string | undefined;
+    cache?: boolean | ICreateCacheReturnType | undefined;
+    babelParserOptions?: (ParserOptions & {
+        cache?: boolean | undefined;
+        cacheKey?: string | undefined;
+        cacheMaxEntries?: number | undefined;
+        cacheMaxSourceLength?: number | undefined;
+    }) | undefined;
+    cssChildCombinatorReplaceValue?: string | string[] | undefined;
+    postcssOptions?: LoadedPostcssOptions | undefined;
+    cssRemoveHoverPseudoClass?: boolean | undefined;
+    cssRemoveProperty?: boolean | undefined;
+    tailwindcssPatcherOptions?: TailwindCssPatchOptions | undefined;
+    logLevel?: 'info' | 'warn' | 'error' | 'silent' | undefined;
 }

package/dist/types/user-defined-options/important.d.ts

@@ -1,37 +1,42 @@
-import type { CssCalcOptions, CssPreflightOptions, PresetEnvOptions, Px2rpxOptions, Rem2rpxOptions, UniAppXUnsupportedMode, UnitsToPxOptions, WeappAutoprefixerOptions } from '@weapp-tailwindcss/postcss/types';
+import type { CssCalcOptions, CssPreflightOptions, IStyleHandlerOptions, PresetEnvOptions, Px2rpxOptions, Rem2rpxOptions, UniAppXUnsupportedMode, UnitConversionOptions, UnitsToPxOptions, WeappAutoprefixerOptions } from '@weapp-tailwindcss/postcss/types';
 import type { TailwindCssPatchOptions } from 'tailwindcss-patch';
-import type { DisabledOptions } from '../disabled-options';
 import type { ICustomAttributes } from '../shared';
 export interface UniAppXComponentLocalStylesOptions {
-    enabled?: boolean;
-    onlyWhenStyleIsolationVersion2?: boolean;
+    enabled?: boolean | undefined;
+    onlyWhenStyleIsolationVersion2?: boolean | undefined;
 }
 export interface UniAppXOptions {
-    enabled?: boolean;
-    componentLocalStyles?: boolean | UniAppXComponentLocalStylesOptions;
-    uvueUnsupported?: UniAppXUnsupportedMode;
+    enabled?: boolean | undefined;
+    componentLocalStyles?: boolean | UniAppXComponentLocalStylesOptions | undefined;
+    uvueUnsupported?: UniAppXUnsupportedMode | undefined;
 }
 export interface UserDefinedOptionsImportantPart {
-    disabled?: boolean | DisabledOptions;
-    customAttributes?: ICustomAttributes;
-    customReplaceDictionary?: Record<string, string>;
-    ignoreTaggedTemplateExpressionIdentifiers?: (string | RegExp)[];
-    ignoreCallExpressionIdentifiers?: (string | RegExp)[];
-    cssPreflight?: CssPreflightOptions;
-    cssPreflightRange?: 'all';
-    cssCalc?: boolean | CssCalcOptions | (string | RegExp)[];
-    injectAdditionalCssVarScope?: boolean;
-    rewriteCssImports?: boolean;
+    disabled?: boolean | {
+        plugin?: boolean | undefined;
+    } | undefined;
+    customAttributes?: ICustomAttributes | undefined;
+    customReplaceDictionary?: Record<string, string> | undefined;
+    ignoreTaggedTemplateExpressionIdentifiers?: (string | RegExp)[] | undefined;
+    ignoreCallExpressionIdentifiers?: (string | RegExp)[] | undefined;
+    cssPreflight?: CssPreflightOptions | undefined;
+    cssPreflightRange?: 'all' | undefined;
+    cssCalc?: boolean | CssCalcOptions | (string | RegExp)[] | undefined;
+    injectAdditionalCssVarScope?: boolean | undefined;
     cssSelectorReplacement?: {
-        root?: string | string[] | false;
-        universal?: string | string[] | false;
-    };
-    rem2rpx?: boolean | Rem2rpxOptions;
-    px2rpx?: boolean | Px2rpxOptions;
-    unitsToPx?: boolean | UnitsToPxOptions;
-    cssPresetEnv?: PresetEnvOptions;
-    autoprefixer?: WeappAutoprefixerOptions;
-    tailwindcss?: TailwindCssPatchOptions['tailwindcss'];
-    cssEntries?: string[];
-    uniAppX?: boolean | UniAppXOptions;
+        root?: string | string[] | false | undefined;
+        universal?: string | string[] | false | undefined;
+    } | undefined;
+    rem2rpx?: boolean | Rem2rpxOptions | undefined;
+    px2rpx?: boolean | Px2rpxOptions | undefined;
+    unitsToPx?: boolean | UnitsToPxOptions | undefined;
+    platform?: IStyleHandlerOptions['platform'] | undefined;
+    unitConversion?: UnitConversionOptions | undefined;
+    cssPresetEnv?: PresetEnvOptions | undefined;
+    atRules?: IStyleHandlerOptions['atRules'] | undefined;
+    autoprefixer?: WeappAutoprefixerOptions | undefined;
+    tailwindcss?: TailwindCssPatchOptions['tailwindcss'] | undefined;
+    cssEntries?: string[] | undefined;
+    uniAppX?: boolean | UniAppXOptions | undefined;
+    uniAppXCssTarget?: IStyleHandlerOptions['uniAppXCssTarget'] | undefined;
+    uniAppXUnsupported?: IStyleHandlerOptions['uniAppXUnsupported'] | undefined;
 }

package/dist/types/user-defined-options/lifecycle.d.ts

@@ -1,6 +1,6 @@
 export interface UserDefinedOptionsLifecyclePart {
-    onLoad?: () => void;
-    onStart?: () => void;
-    onUpdate?: (filename: string, oldVal: string, newVal: string) => void;
-    onEnd?: () => void;
+    onLoad?: (() => void) | undefined;
+    onStart?: (() => void) | undefined;
+    onUpdate?: ((filename: string, oldVal: string, newVal: string) => void) | undefined;
+    onEnd?: (() => void) | undefined;
 }

package/dist/types/user-defined-options/matcher.d.ts

@@ -1,9 +1,9 @@
 import type { AppType } from '../shared';
 export interface UserDefinedOptionsMatcherPart {
-    htmlMatcher?: (name: string) => boolean;
-    cssMatcher?: (name: string) => boolean;
-    jsMatcher?: (name: string) => boolean;
-    mainCssChunkMatcher?: (name: string, appType?: AppType) => boolean;
-    wxsMatcher?: (name: string) => boolean;
-    inlineWxs?: boolean;
+    htmlMatcher?: ((name: string) => boolean) | undefined;
+    cssMatcher?: ((name: string) => boolean) | undefined;
+    jsMatcher?: ((name: string) => boolean) | undefined;
+    mainCssChunkMatcher?: ((name: string, appType?: AppType) => boolean) | undefined;
+    wxsMatcher?: ((name: string) => boolean) | undefined;
+    inlineWxs?: boolean | undefined;
 }

package/dist/uni-app-x/vite.d.ts

@@ -3,7 +3,7 @@ import type { Plugin, ResolvedConfig } from 'vite';
 import type { ICreateCacheReturnType } from '../cache';
 import type { AppType, CreateJsHandlerOptions, ICustomAttributesEntities, InternalUserDefinedOptions, JsHandler, LinkedJsModuleResult } from '../types';
 interface UniAppXRuntimeState {
-    patchPromise: Promise<unknown>;
+    readyPromise: Promise<unknown>;
 }
 interface CreateUniAppXPluginsOptions {
     appType: AppType;

package/dist/unocss/index.d.ts

@@ -0,0 +1,2 @@
+import type { IArbitraryValues, UserDefinedOptions } from '../types';
+export declare function resolveUnocssBareArbitraryValues(arbitraryValues: IArbitraryValues | undefined, unocss: UserDefinedOptions['unocss']): IArbitraryValues;

package/dist/utils/disabled.d.ts

@@ -1,6 +1,5 @@
 import type { UserDefinedOptions } from '../types';
-export interface ResolvedDisabledOptions {
+export interface ResolvedPluginDisabledState {
     plugin: boolean;
-    rewriteCssImports: boolean;
 }
-export declare function resolveDisabledOptions(disabled: UserDefinedOptions['disabled']): ResolvedDisabledOptions;
+export declare function resolvePluginDisabledState(disabled: UserDefinedOptions['disabled']): ResolvedPluginDisabledState;

package/dist/utils/object.d.ts

@@ -0,0 +1,9 @@
+type DefinedEntry<T extends object> = {
+    [K in keyof T]: undefined extends T[K] ? [K, Exclude<T[K], undefined>] : [K, T[K]];
+}[keyof T];
+export type UndefinedOptional<T extends object> = {
+    [K in keyof T]?: T[K] | undefined;
+};
+export declare function definedEntries<T extends object>(value: UndefinedOptional<T>): DefinedEntry<T>[];
+export declare function omitUndefined<T extends object>(value: UndefinedOptional<T>): Partial<T>;
+export {};

package/dist/utils/options.d.ts

@@ -0,0 +1,2 @@
+export declare function resolveBooleanObjectOption<T extends object>(value: boolean | T | undefined, enabledValue: T): T | false;
+export declare function normalizeStringListOption(value: unknown): string[] | undefined;

package/dist/utils/regex.d.ts

@@ -0,0 +1 @@
+export declare function escapeStringRegexp(str: string): string;

package/dist/{utils-DmC9_In3.js → utils-D7Ygohep.js}

@@ -1,4 +1,4 @@
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_chunk = require("./chunk-C5U5_Hdc.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 require("@weapp-tailwindcss/shared");
@@ -6,7 +6,7 @@ require("@weapp-tailwindcss/shared");
 function normalizePlatform(value) {
 	return value?.trim().toLowerCase() || void 0;
 }
-function resolveUniUtsPlatform(value = node_process.default.env.UNI_UTS_PLATFORM) {
+function resolveUniUtsPlatform(value = node_process.default.env["UNI_UTS_PLATFORM"]) {
 	const normalized = normalizePlatform(value);
 	const isAppAndroid = normalized === "app-android";
 	const isAppIos = normalized === "app-ios";

package/dist/{utils-7DUGTFED.mjs → utils-DsaS975I.mjs}

@@ -4,7 +4,7 @@ import { defu, defuOverrideArray as defuOverrideArray$1, isMap, noop } from "@we
 function normalizePlatform(value) {
 	return value?.trim().toLowerCase() || void 0;
 }
-function resolveUniUtsPlatform(value = process.env.UNI_UTS_PLATFORM) {
+function resolveUniUtsPlatform(value = process.env["UNI_UTS_PLATFORM"]) {
 	const normalized = normalizePlatform(value);
 	const isAppAndroid = normalized === "app-android";
 	const isAppIos = normalized === "app-ios";