@weapp-tailwindcss/merge 1.2.3 → 1.3.0

package/README.md

@@ -23,7 +23,7 @@
 > [!NOTE]
 > 降低开发维护成本，提升开发效率的 `小程序` `tailwindcss` 全方面解决方案
 >
-> 小程序原生工具链 `weapp-vite` 已经发布，使用它改善你的原生小程序开发体验吧，更多详见 [官方文档](https://vite.icebreaker.top/)
+> `weapp-tailwindcss@4.2.x` 现已支持 `uni-app x` 同时构建 `Web`,`小程序`,`安卓`,`IOS`,`鸿蒙`，详见 [**uni-app x 专题**](https://tw.icebreaker.top/docs/uni-app-x)
 
 \[[文档地址](https://tw.icebreaker.top)\] \| \[[备用文档地址](https://ice-tw.netlify.app/)\] \| \[[加入技术交流群](https://tw.icebreaker.top/docs/community/group)\]
 
@@ -35,7 +35,6 @@
 - [各个框架的模板](#各个框架的模板)
 - [旧版本迁移指南](#旧版本迁移指南)
 - [配置项参考](#配置项参考)
-- [变更日志](#变更日志)
 - [Contribute](#contribute)
 - [License](#license)
 - [Star History](#star-history)
@@ -48,9 +47,9 @@
 | --------------------------------------------------- | ----------------------------------------------- |
 | ![wepback+vite+gulp](./assets/weapp-tw-plugins.png) | ![frameworks](./assets/weapp-tw-frameworks.png) |
 
-核心插件支持 `webpack`/`vite`/`gulp` 为基底的框架类小程序开发，涵盖了市面上几乎所有的主流的开发框架。
+核心插件支持 `webpack`/`vite`/`rspack`/`rollup`/`rolldown`/`gulp` 为基底的框架类小程序开发，涵盖了市面上几乎所有的主流的开发框架。
 
-同时也支持最原生的开发者工具创建的原生小程序应用。
+也支持直接从各个开发者工具中，直接创建的原生小程序应用。
 
 这些插件能够自动识别并精确处理所有 `tailwindcss` 的工具类来适配小程序环境。
 
@@ -75,8 +74,6 @@
 
 ## [配置项参考](https://tw.icebreaker.top/docs/api/interfaces/UserDefinedOptions)
 
-## [变更日志](./CHANGELOG.md)
-
 ## Contribute
 
 我们邀请你来贡献和帮助改进 `weapp-tailwindcss` 💚💚💚

package/dist/{chunk-BNLHSQB7.js → chunk-4KECYPIX.js}

@@ -195,50 +195,16 @@ function replaceWxml(original, options = {
 // ../weapp-tailwindcss/dist/escape.mjs
 var weappTwIgnore = String.raw;
 
-// src/utils.ts
-import { clsx } from "clsx";
-function noop(x) {
-  return x;
-}
-function createFactory(opts) {
-  const {
-    twMerge: _twMerge,
-    twJoin: _twJoin,
-    createTailwindMerge: _createTailwindMerge,
-    extendTailwindMerge: _extendTailwindMerge
-  } = opts;
-  return function create(options) {
-    const e = options?.disableEscape ? noop : replaceWxml;
-    function twMerge(...inputs) {
-      return e(_twMerge(clsx(inputs)));
-    }
-    function twJoin(...inputs) {
-      return e(_twJoin(clsx(inputs)));
-    }
-    const extendTailwindMerge = (...args) => {
-      const customTwMerge = _extendTailwindMerge(...args);
-      return function cn(...inputs) {
-        return e(customTwMerge(clsx(inputs)));
-      };
-    };
-    const createTailwindMerge = (...args) => {
-      const customTwMerge = _createTailwindMerge(...args);
-      return function cn(...inputs) {
-        return e(customTwMerge(clsx(inputs)));
-      };
-    };
-    return {
-      twMerge,
-      twJoin,
-      extendTailwindMerge,
-      createTailwindMerge
-    };
-  };
+// src/core/escape.ts
+var noop = (value) => value;
+function resolveEscape(options) {
+  if (options?.disableEscape) {
+    return noop;
+  }
+  return options?.escapeFn ?? replaceWxml;
 }
 
 export {
-  replaceWxml,
   weappTwIgnore,
-  noop,
-  createFactory
+  resolveEscape
 };

package/dist/{chunk-SQBQEUQE.cjs → chunk-BWF73VRW.cjs}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// ../../node_modules/.pnpm/@weapp-core+escape@4.0.1/node_modules/@weapp-core/escape/dist/index.mjs
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// ../../node_modules/.pnpm/@weapp-core+escape@4.0.1/node_modules/@weapp-core/escape/dist/index.mjs
 var ComplexMappingChars2String = {
   "[": "_bl_",
   "]": "_br_",
@@ -195,50 +195,16 @@ function replaceWxml(original, options = {
 // ../weapp-tailwindcss/dist/escape.mjs
 var weappTwIgnore = String.raw;
 
-// src/utils.ts
-var _clsx = require('clsx');
-function noop(x) {
-  return x;
-}
-function createFactory(opts) {
-  const {
-    twMerge: _twMerge,
-    twJoin: _twJoin,
-    createTailwindMerge: _createTailwindMerge,
-    extendTailwindMerge: _extendTailwindMerge
-  } = opts;
-  return function create(options) {
-    const e = _optionalChain([options, 'optionalAccess', _ => _.disableEscape]) ? noop : replaceWxml;
-    function twMerge(...inputs) {
-      return e(_twMerge(_clsx.clsx.call(void 0, inputs)));
-    }
-    function twJoin(...inputs) {
-      return e(_twJoin(_clsx.clsx.call(void 0, inputs)));
-    }
-    const extendTailwindMerge = (...args) => {
-      const customTwMerge = _extendTailwindMerge(...args);
-      return function cn(...inputs) {
-        return e(customTwMerge(_clsx.clsx.call(void 0, inputs)));
-      };
-    };
-    const createTailwindMerge = (...args) => {
-      const customTwMerge = _createTailwindMerge(...args);
-      return function cn(...inputs) {
-        return e(customTwMerge(_clsx.clsx.call(void 0, inputs)));
-      };
-    };
-    return {
-      twMerge,
-      twJoin,
-      extendTailwindMerge,
-      createTailwindMerge
-    };
-  };
+// src/core/escape.ts
+var noop = (value) => value;
+function resolveEscape(options) {
+  if (_optionalChain([options, 'optionalAccess', _ => _.disableEscape])) {
+    return noop;
+  }
+  return _nullishCoalesce(_optionalChain([options, 'optionalAccess', _2 => _2.escapeFn]), () => ( replaceWxml));
 }
 
 
 
 
-
-
-exports.replaceWxml = replaceWxml; exports.weappTwIgnore = weappTwIgnore; exports.noop = noop; exports.createFactory = createFactory;
+exports.weappTwIgnore = weappTwIgnore; exports.resolveEscape = resolveEscape;

package/dist/{chunk-DGEFFMGT.js → chunk-HLKKHLS5.js}

@@ -1,6 +1,6 @@
 import {
-  createFactory
-} from "./chunk-BNLHSQB7.js";
+  createRuntimeFactory
+} from "./chunk-NNOJ7CWV.js";
 
 // src/v4.ts
 import {
@@ -11,19 +11,26 @@ import {
   getDefaultConfig,
   mergeConfigs
 } from "tailwind-merge";
-var create = createFactory({
+var create = createRuntimeFactory({
   createTailwindMerge: _createTailwindMerge,
   extendTailwindMerge: _extendTailwindMerge,
   twJoin: _twJoin,
   twMerge: _twMerge,
   version: 3
 });
-var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
+var {
+  version: tailwindMergeVersion,
+  twMerge,
+  twJoin,
+  extendTailwindMerge,
+  createTailwindMerge
+} = create();
 
 export {
   getDefaultConfig,
   mergeConfigs,
   create,
+  tailwindMergeVersion,
   twMerge,
   twJoin,
   extendTailwindMerge,

package/dist/chunk-JONLHXMV.cjs

@@ -0,0 +1,44 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+var _chunkBWF73VRWcjs = require('./chunk-BWF73VRW.cjs');
+
+// src/core/create-runtime.ts
+var _clsx = require('clsx');
+function wrapClassAggregator(fn, escapeFn) {
+  return (...inputs) => {
+    return escapeFn(fn(_clsx.clsx.call(void 0, ...inputs)));
+  };
+}
+function wrapFactory(factory, escapeFn) {
+  return (...args) => {
+    const runtime = factory(...args);
+    return wrapClassAggregator(runtime, escapeFn);
+  };
+}
+function createRuntimeFactory(options) {
+  const {
+    version,
+    twMerge: _twMerge,
+    twJoin: _twJoin,
+    extendTailwindMerge: _extendTailwindMerge,
+    createTailwindMerge: _createTailwindMerge
+  } = options;
+  return function createRuntime(createOptions) {
+    const escapeFn = _chunkBWF73VRWcjs.resolveEscape.call(void 0, createOptions);
+    const twMerge = wrapClassAggregator(_twMerge, escapeFn);
+    const twJoin = wrapClassAggregator(_twJoin, escapeFn);
+    const extendTailwindMerge = wrapFactory(_extendTailwindMerge, escapeFn);
+    const createTailwindMerge = wrapFactory(_createTailwindMerge, escapeFn);
+    return {
+      version,
+      twMerge,
+      twJoin,
+      extendTailwindMerge,
+      createTailwindMerge
+    };
+  };
+}
+
+
+
+exports.createRuntimeFactory = createRuntimeFactory;

package/dist/chunk-NNOJ7CWV.js

@@ -0,0 +1,44 @@
+import {
+  resolveEscape
+} from "./chunk-4KECYPIX.js";
+
+// src/core/create-runtime.ts
+import { clsx } from "clsx";
+function wrapClassAggregator(fn, escapeFn) {
+  return (...inputs) => {
+    return escapeFn(fn(clsx(...inputs)));
+  };
+}
+function wrapFactory(factory, escapeFn) {
+  return (...args) => {
+    const runtime = factory(...args);
+    return wrapClassAggregator(runtime, escapeFn);
+  };
+}
+function createRuntimeFactory(options) {
+  const {
+    version,
+    twMerge: _twMerge,
+    twJoin: _twJoin,
+    extendTailwindMerge: _extendTailwindMerge,
+    createTailwindMerge: _createTailwindMerge
+  } = options;
+  return function createRuntime(createOptions) {
+    const escapeFn = resolveEscape(createOptions);
+    const twMerge = wrapClassAggregator(_twMerge, escapeFn);
+    const twJoin = wrapClassAggregator(_twJoin, escapeFn);
+    const extendTailwindMerge = wrapFactory(_extendTailwindMerge, escapeFn);
+    const createTailwindMerge = wrapFactory(_createTailwindMerge, escapeFn);
+    return {
+      version,
+      twMerge,
+      twJoin,
+      extendTailwindMerge,
+      createTailwindMerge
+    };
+  };
+}
+
+export {
+  createRuntimeFactory
+};

package/dist/{chunk-DFAJWCXT.cjs → chunk-QKJSGQ4H.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
+var _chunkJONLHXMVcjs = require('./chunk-JONLHXMV.cjs');
 
 // src/v4.ts
 
@@ -11,14 +11,20 @@ var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
 
 
 var _tailwindmerge = require('tailwind-merge');
-var create = _chunkSQBQEUQEcjs.createFactory.call(void 0, {
+var create = _chunkJONLHXMVcjs.createRuntimeFactory.call(void 0, {
   createTailwindMerge: _tailwindmerge.createTailwindMerge,
   extendTailwindMerge: _tailwindmerge.extendTailwindMerge,
   twJoin: _tailwindmerge.twJoin,
   twMerge: _tailwindmerge.twMerge,
   version: 3
 });
-var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
+var {
+  version: tailwindMergeVersion,
+  twMerge,
+  twJoin,
+  extendTailwindMerge,
+  createTailwindMerge
+} = create();
 
 
 
@@ -28,4 +34,5 @@ var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
 
 
 
-exports.getDefaultConfig = _tailwindmerge.getDefaultConfig; exports.mergeConfigs = _tailwindmerge.mergeConfigs; exports.create = create; exports.twMerge = twMerge; exports.twJoin = twJoin; exports.extendTailwindMerge = extendTailwindMerge; exports.createTailwindMerge = createTailwindMerge;
+
+exports.getDefaultConfig = _tailwindmerge.getDefaultConfig; exports.mergeConfigs = _tailwindmerge.mergeConfigs; exports.create = create; exports.tailwindMergeVersion = tailwindMergeVersion; exports.twMerge = twMerge; exports.twJoin = twJoin; exports.extendTailwindMerge = extendTailwindMerge; exports.createTailwindMerge = createTailwindMerge;

package/dist/cva.cjs

@@ -1,16 +1,15 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-
-var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
+var _chunkBWF73VRWcjs = require('./chunk-BWF73VRW.cjs');
 
 // src/cva.ts
 var _classvarianceauthority = require('class-variance-authority');
 function create(options) {
-  const e = _optionalChain([options, 'optionalAccess', _ => _.disableEscape]) ? _chunkSQBQEUQEcjs.noop : _chunkSQBQEUQEcjs.replaceWxml;
+  const escapeFn = _chunkBWF73VRWcjs.resolveEscape.call(void 0, options);
   function cva2(base, config) {
     const fn = _classvarianceauthority.cva.call(void 0, base, config);
     return (...props) => {
-      return e(fn(...props));
+      return escapeFn(fn(...props));
     };
   }
   return {

package/dist/cva.d.cts

@@ -1,5 +1,5 @@
 import * as CLSX from 'clsx';
-import { C as CreateOptions } from './types-CXrD0bcD.cjs';
+import { C as CreateOptions } from './types-NMbxxvgq.cjs';
 
 type ClassValue = CLSX.ClassValue
 type ClassProp = {

package/dist/cva.d.ts

@@ -1,5 +1,5 @@
 import * as CLSX from 'clsx';
-import { C as CreateOptions } from './types-CXrD0bcD.js';
+import { C as CreateOptions } from './types-NMbxxvgq.js';
 
 type ClassValue = CLSX.ClassValue
 type ClassProp = {

package/dist/cva.js

@@ -1,16 +1,15 @@
 import {
-  noop,
-  replaceWxml
-} from "./chunk-BNLHSQB7.js";
+  resolveEscape
+} from "./chunk-4KECYPIX.js";
 
 // src/cva.ts
 import { cva as _cva } from "class-variance-authority";
 function create(options) {
-  const e = options?.disableEscape ? noop : replaceWxml;
+  const escapeFn = resolveEscape(options);
   function cva2(base, config) {
     const fn = _cva(base, config);
     return (...props) => {
-      return e(fn(...props));
+      return escapeFn(fn(...props));
     };
   }
   return {

package/dist/index.cjs

@@ -6,11 +6,12 @@
 
 
 
-var _chunkDFAJWCXTcjs = require('./chunk-DFAJWCXT.cjs');
 
+var _chunkQKJSGQ4Hcjs = require('./chunk-QKJSGQ4H.cjs');
+require('./chunk-JONLHXMV.cjs');
 
-var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
 
+var _chunkBWF73VRWcjs = require('./chunk-BWF73VRW.cjs');
 
 
 
@@ -19,4 +20,6 @@ var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
 
 
 
-exports.create = _chunkDFAJWCXTcjs.create; exports.createTailwindMerge = _chunkDFAJWCXTcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkDFAJWCXTcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkDFAJWCXTcjs.getDefaultConfig; exports.mergeConfigs = _chunkDFAJWCXTcjs.mergeConfigs; exports.twJoin = _chunkDFAJWCXTcjs.twJoin; exports.twMerge = _chunkDFAJWCXTcjs.twMerge; exports.weappTwIgnore = _chunkSQBQEUQEcjs.weappTwIgnore;
+
+
+exports.create = _chunkQKJSGQ4Hcjs.create; exports.createTailwindMerge = _chunkQKJSGQ4Hcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkQKJSGQ4Hcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkQKJSGQ4Hcjs.getDefaultConfig; exports.mergeConfigs = _chunkQKJSGQ4Hcjs.mergeConfigs; exports.tailwindMergeVersion = _chunkQKJSGQ4Hcjs.tailwindMergeVersion; exports.twJoin = _chunkQKJSGQ4Hcjs.twJoin; exports.twMerge = _chunkQKJSGQ4Hcjs.twMerge; exports.weappTwIgnore = _chunkBWF73VRWcjs.weappTwIgnore;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.cjs';
+export { create, createTailwindMerge, extendTailwindMerge, tailwindMergeVersion, twJoin, twMerge } from './v4.cjs';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 export { ClassValue } from 'clsx';
-import './types-CXrD0bcD.cjs';
+import './types-NMbxxvgq.cjs';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.js';
+export { create, createTailwindMerge, extendTailwindMerge, tailwindMergeVersion, twJoin, twMerge } from './v4.js';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 export { ClassValue } from 'clsx';
-import './types-CXrD0bcD.js';
+import './types-NMbxxvgq.js';

package/dist/index.js

@@ -4,18 +4,21 @@ import {
   extendTailwindMerge,
   getDefaultConfig,
   mergeConfigs,
+  tailwindMergeVersion,
   twJoin,
   twMerge
-} from "./chunk-DGEFFMGT.js";
+} from "./chunk-HLKKHLS5.js";
+import "./chunk-NNOJ7CWV.js";
 import {
   weappTwIgnore
-} from "./chunk-BNLHSQB7.js";
+} from "./chunk-4KECYPIX.js";
 export {
   create,
   createTailwindMerge,
   extendTailwindMerge,
   getDefaultConfig,
   mergeConfigs,
+  tailwindMergeVersion,
   twJoin,
   twMerge,
   weappTwIgnore

package/dist/types-NMbxxvgq.d.cts

@@ -0,0 +1,13 @@
+import { ClassValue } from 'clsx';
+
+type EscapeFn = (value: string) => string;
+interface CreateOptions {
+    disableEscape?: boolean;
+    escapeFn?: EscapeFn;
+}
+type TailwindMergeLibraryFn = (...inputs: any[]) => string;
+type TailwindMergeRuntime = (...inputs: ClassValue[]) => string;
+type TailwindMergeFactory<TFactory extends (...args: any[]) => TailwindMergeLibraryFn> = (...args: Parameters<TFactory>) => TailwindMergeRuntime;
+type TailwindMergeVersion = 2 | 3;
+
+export type { CreateOptions as C, TailwindMergeVersion as T, TailwindMergeRuntime as a, TailwindMergeFactory as b };

package/dist/types-NMbxxvgq.d.ts

@@ -0,0 +1,13 @@
+import { ClassValue } from 'clsx';
+
+type EscapeFn = (value: string) => string;
+interface CreateOptions {
+    disableEscape?: boolean;
+    escapeFn?: EscapeFn;
+}
+type TailwindMergeLibraryFn = (...inputs: any[]) => string;
+type TailwindMergeRuntime = (...inputs: ClassValue[]) => string;
+type TailwindMergeFactory<TFactory extends (...args: any[]) => TailwindMergeLibraryFn> = (...args: Parameters<TFactory>) => TailwindMergeRuntime;
+type TailwindMergeVersion = 2 | 3;
+
+export type { CreateOptions as C, TailwindMergeVersion as T, TailwindMergeRuntime as a, TailwindMergeFactory as b };

package/dist/v3.cjs

@@ -1,7 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
+var _chunkJONLHXMVcjs = require('./chunk-JONLHXMV.cjs');
 
-var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
+
+var _chunkBWF73VRWcjs = require('./chunk-BWF73VRW.cjs');
 
 // src/v3.ts
 
@@ -12,14 +14,21 @@ var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
 
 
 var _tailwindmergev2 = require('tailwind-merge-v2');
-var create = _chunkSQBQEUQEcjs.createFactory.call(void 0, {
+var create = _chunkJONLHXMVcjs.createRuntimeFactory.call(void 0, {
   createTailwindMerge: _tailwindmergev2.createTailwindMerge,
   extendTailwindMerge: _tailwindmergev2.extendTailwindMerge,
   twJoin: _tailwindmergev2.twJoin,
   twMerge: _tailwindmergev2.twMerge,
   version: 2
 });
-var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
+var {
+  version: tailwindMergeVersion,
+  twMerge,
+  twJoin,
+  extendTailwindMerge,
+  createTailwindMerge
+} = create();
+
 
 
 
@@ -29,4 +38,4 @@ var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
 
 
 
-exports.create = create; exports.createTailwindMerge = createTailwindMerge; exports.extendTailwindMerge = extendTailwindMerge; exports.getDefaultConfig = _tailwindmergev2.getDefaultConfig; exports.mergeConfigs = _tailwindmergev2.mergeConfigs; exports.twJoin = twJoin; exports.twMerge = twMerge; exports.weappTwIgnore = _chunkSQBQEUQEcjs.weappTwIgnore;
+exports.create = create; exports.createTailwindMerge = createTailwindMerge; exports.extendTailwindMerge = extendTailwindMerge; exports.getDefaultConfig = _tailwindmergev2.getDefaultConfig; exports.mergeConfigs = _tailwindmergev2.mergeConfigs; exports.tailwindMergeVersion = tailwindMergeVersion; exports.twJoin = twJoin; exports.twMerge = twMerge; exports.weappTwIgnore = _chunkBWF73VRWcjs.weappTwIgnore;

package/dist/v3.d.cts

@@ -1,19 +1,21 @@
 import * as tailwind_merge_v2 from 'tailwind-merge-v2';
+import { createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge-v2';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
-import { C as CreateOptions } from './types-CXrD0bcD.cjs';
-import { ClassValue } from 'clsx';
+import { C as CreateOptions, T as TailwindMergeVersion, a as TailwindMergeRuntime, b as TailwindMergeFactory } from './types-NMbxxvgq.cjs';
 export { ClassValue } from 'clsx';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 
-declare const create: (options?: CreateOptions) => {
-    twMerge: (...inputs: ClassValue[]) => string;
-    twJoin: (...inputs: ClassValue[]) => string;
-    extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-    createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const create: (createOptions?: CreateOptions) => {
+    version: TailwindMergeVersion;
+    twMerge: TailwindMergeRuntime;
+    twJoin: TailwindMergeRuntime;
+    extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge_v2.ConfigExtension<tailwind_merge_v2.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge_v2.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>), ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...classLists: tailwind_merge_v2.ClassNameValue[]) => string)>;
+    createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 };
-declare const twMerge: (...inputs: ClassValue[]) => string;
-declare const twJoin: (...inputs: ClassValue[]) => string;
-declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const tailwindMergeVersion: TailwindMergeVersion;
+declare const twMerge: TailwindMergeRuntime;
+declare const twJoin: TailwindMergeRuntime;
+declare const extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge_v2.ConfigExtension<tailwind_merge_v2.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge_v2.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>), ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...classLists: tailwind_merge_v2.ClassNameValue[]) => string)>;
+declare const createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 
-export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
+export { create, createTailwindMerge, extendTailwindMerge, tailwindMergeVersion, twJoin, twMerge };

package/dist/v3.d.ts

@@ -1,19 +1,21 @@
 import * as tailwind_merge_v2 from 'tailwind-merge-v2';
+import { createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge-v2';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
-import { C as CreateOptions } from './types-CXrD0bcD.js';
-import { ClassValue } from 'clsx';
+import { C as CreateOptions, T as TailwindMergeVersion, a as TailwindMergeRuntime, b as TailwindMergeFactory } from './types-NMbxxvgq.js';
 export { ClassValue } from 'clsx';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 
-declare const create: (options?: CreateOptions) => {
-    twMerge: (...inputs: ClassValue[]) => string;
-    twJoin: (...inputs: ClassValue[]) => string;
-    extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-    createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const create: (createOptions?: CreateOptions) => {
+    version: TailwindMergeVersion;
+    twMerge: TailwindMergeRuntime;
+    twJoin: TailwindMergeRuntime;
+    extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge_v2.ConfigExtension<tailwind_merge_v2.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge_v2.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>), ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...classLists: tailwind_merge_v2.ClassNameValue[]) => string)>;
+    createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 };
-declare const twMerge: (...inputs: ClassValue[]) => string;
-declare const twJoin: (...inputs: ClassValue[]) => string;
-declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>) | tailwind_merge_v2.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge_v2.Config<string, string>, ...createConfigRest: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const tailwindMergeVersion: TailwindMergeVersion;
+declare const twMerge: TailwindMergeRuntime;
+declare const twJoin: TailwindMergeRuntime;
+declare const extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge_v2.ConfigExtension<tailwind_merge_v2.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge_v2.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>), ...createConfig: ((config: tailwind_merge_v2.Config<string, string>) => tailwind_merge_v2.Config<string, string>)[]) => (...classLists: tailwind_merge_v2.ClassNameValue[]) => string)>;
+declare const createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 
-export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
+export { create, createTailwindMerge, extendTailwindMerge, tailwindMergeVersion, twJoin, twMerge };

package/dist/v3.js

@@ -1,7 +1,9 @@
 import {
-  createFactory,
+  createRuntimeFactory
+} from "./chunk-NNOJ7CWV.js";
+import {
   weappTwIgnore
-} from "./chunk-BNLHSQB7.js";
+} from "./chunk-4KECYPIX.js";
 
 // src/v3.ts
 import {
@@ -12,20 +14,27 @@ import {
   getDefaultConfig,
   mergeConfigs
 } from "tailwind-merge-v2";
-var create = createFactory({
+var create = createRuntimeFactory({
   createTailwindMerge: _createTailwindMerge,
   extendTailwindMerge: _extendTailwindMerge,
   twJoin: _twJoin,
   twMerge: _twMerge,
   version: 2
 });
-var { twMerge, twJoin, extendTailwindMerge, createTailwindMerge } = create();
+var {
+  version: tailwindMergeVersion,
+  twMerge,
+  twJoin,
+  extendTailwindMerge,
+  createTailwindMerge
+} = create();
 export {
   create,
   createTailwindMerge,
   extendTailwindMerge,
   getDefaultConfig,
   mergeConfigs,
+  tailwindMergeVersion,
   twJoin,
   twMerge,
   weappTwIgnore

package/dist/v4.cjs

@@ -6,11 +6,12 @@
 
 
 
-var _chunkDFAJWCXTcjs = require('./chunk-DFAJWCXT.cjs');
 
+var _chunkQKJSGQ4Hcjs = require('./chunk-QKJSGQ4H.cjs');
+require('./chunk-JONLHXMV.cjs');
 
-var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
 
+var _chunkBWF73VRWcjs = require('./chunk-BWF73VRW.cjs');
 
 
 
@@ -19,4 +20,6 @@ var _chunkSQBQEUQEcjs = require('./chunk-SQBQEUQE.cjs');
 
 
 
-exports.create = _chunkDFAJWCXTcjs.create; exports.createTailwindMerge = _chunkDFAJWCXTcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkDFAJWCXTcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkDFAJWCXTcjs.getDefaultConfig; exports.mergeConfigs = _chunkDFAJWCXTcjs.mergeConfigs; exports.twJoin = _chunkDFAJWCXTcjs.twJoin; exports.twMerge = _chunkDFAJWCXTcjs.twMerge; exports.weappTwIgnore = _chunkSQBQEUQEcjs.weappTwIgnore;
+
+
+exports.create = _chunkQKJSGQ4Hcjs.create; exports.createTailwindMerge = _chunkQKJSGQ4Hcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkQKJSGQ4Hcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkQKJSGQ4Hcjs.getDefaultConfig; exports.mergeConfigs = _chunkQKJSGQ4Hcjs.mergeConfigs; exports.tailwindMergeVersion = _chunkQKJSGQ4Hcjs.tailwindMergeVersion; exports.twJoin = _chunkQKJSGQ4Hcjs.twJoin; exports.twMerge = _chunkQKJSGQ4Hcjs.twMerge; exports.weappTwIgnore = _chunkBWF73VRWcjs.weappTwIgnore;

package/dist/v4.d.cts

@@ -1,19 +1,21 @@
 import * as tailwind_merge from 'tailwind-merge';
+import { createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
-import { C as CreateOptions } from './types-CXrD0bcD.cjs';
-import { ClassValue } from 'clsx';
+import { C as CreateOptions, T as TailwindMergeVersion, a as TailwindMergeRuntime, b as TailwindMergeFactory } from './types-NMbxxvgq.cjs';
 export { ClassValue } from 'clsx';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 
-declare const create: (options?: CreateOptions) => {
-    twMerge: (...inputs: ClassValue[]) => string;
-    twJoin: (...inputs: ClassValue[]) => string;
-    extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-    createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const create: (createOptions?: CreateOptions) => {
+    version: TailwindMergeVersion;
+    twMerge: TailwindMergeRuntime;
+    twJoin: TailwindMergeRuntime;
+    extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge.ConfigExtension<tailwind_merge.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>), ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...classLists: tailwind_merge.ClassNameValue[]) => string)>;
+    createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 };
-declare const twMerge: (...inputs: ClassValue[]) => string;
-declare const twJoin: (...inputs: ClassValue[]) => string;
-declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const tailwindMergeVersion: TailwindMergeVersion;
+declare const twMerge: TailwindMergeRuntime;
+declare const twJoin: TailwindMergeRuntime;
+declare const extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge.ConfigExtension<tailwind_merge.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>), ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...classLists: tailwind_merge.ClassNameValue[]) => string)>;
+declare const createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 
-export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
+export { create, createTailwindMerge, extendTailwindMerge, tailwindMergeVersion, twJoin, twMerge };

package/dist/v4.d.ts

@@ -1,19 +1,21 @@
 import * as tailwind_merge from 'tailwind-merge';
+import { createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
-import { C as CreateOptions } from './types-CXrD0bcD.js';
-import { ClassValue } from 'clsx';
+import { C as CreateOptions, T as TailwindMergeVersion, a as TailwindMergeRuntime, b as TailwindMergeFactory } from './types-NMbxxvgq.js';
 export { ClassValue } from 'clsx';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 
-declare const create: (options?: CreateOptions) => {
-    twMerge: (...inputs: ClassValue[]) => string;
-    twJoin: (...inputs: ClassValue[]) => string;
-    extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-    createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const create: (createOptions?: CreateOptions) => {
+    version: TailwindMergeVersion;
+    twMerge: TailwindMergeRuntime;
+    twJoin: TailwindMergeRuntime;
+    extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge.ConfigExtension<tailwind_merge.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>), ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...classLists: tailwind_merge.ClassNameValue[]) => string)>;
+    createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 };
-declare const twMerge: (...inputs: ClassValue[]) => string;
-declare const twJoin: (...inputs: ClassValue[]) => string;
-declare const extendTailwindMerge: (configExtension: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>) | tailwind_merge.ConfigExtension<string, string>, ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
-declare const createTailwindMerge: (createConfigFirst: () => tailwind_merge.Config<string, string>, ...createConfigRest: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...inputs: ClassValue[]) => string;
+declare const tailwindMergeVersion: TailwindMergeVersion;
+declare const twMerge: TailwindMergeRuntime;
+declare const twJoin: TailwindMergeRuntime;
+declare const extendTailwindMerge: TailwindMergeFactory<(<AdditionalClassGroupIds extends string = never, AdditionalThemeGroupIds extends string = never>(configExtension: tailwind_merge.ConfigExtension<tailwind_merge.DefaultClassGroupIds | AdditionalClassGroupIds, tailwind_merge.DefaultThemeGroupIds | AdditionalThemeGroupIds> | ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>), ...createConfig: ((config: tailwind_merge.Config<string, string>) => tailwind_merge.Config<string, string>)[]) => (...classLists: tailwind_merge.ClassNameValue[]) => string)>;
+declare const createTailwindMerge: TailwindMergeFactory<typeof createTailwindMerge$1>;
 
-export { create, createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
+export { create, createTailwindMerge, extendTailwindMerge, tailwindMergeVersion, twJoin, twMerge };

package/dist/v4.js

@@ -4,18 +4,21 @@ import {
   extendTailwindMerge,
   getDefaultConfig,
   mergeConfigs,
+  tailwindMergeVersion,
   twJoin,
   twMerge
-} from "./chunk-DGEFFMGT.js";
+} from "./chunk-HLKKHLS5.js";
+import "./chunk-NNOJ7CWV.js";
 import {
   weappTwIgnore
-} from "./chunk-BNLHSQB7.js";
+} from "./chunk-4KECYPIX.js";
 export {
   create,
   createTailwindMerge,
   extendTailwindMerge,
   getDefaultConfig,
   mergeConfigs,
+  tailwindMergeVersion,
   twJoin,
   twMerge,
   weappTwIgnore

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/merge",
   "type": "module",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "description": "weapp-tailwindcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -50,14 +50,14 @@
   "dependencies": {
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "local-pkg": "^1.1.1",
-    "semver": "^7.7.2",
+    "local-pkg": "^1.1.2",
+    "semver": "^7.7.3",
     "tailwind-merge": "^3.3.1",
     "tailwind-merge-v2": "npm:tailwind-merge@^2.6.0",
-    "tailwind-variants": "^1.0.0"
+    "tailwind-variants": "^3.1.1"
   },
   "devDependencies": {
-    "weapp-tailwindcss": "4.2.0"
+    "weapp-tailwindcss": "4.4.0"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",

package/dist/types-CXrD0bcD.d.cts

@@ -1,5 +0,0 @@
-interface CreateOptions {
-    disableEscape?: boolean;
-}
-
-export type { CreateOptions as C };

package/dist/types-CXrD0bcD.d.ts

@@ -1,5 +0,0 @@
-interface CreateOptions {
-    disableEscape?: boolean;
-}
-
-export type { CreateOptions as C };