@weapp-tailwindcss/merge 1.0.0-alpha.3 → 1.0.0-alpha.5

package/dist/{chunk-VR7IWN2Z.cjs → chunk-D36KUYOC.cjs}

@@ -1,5 +1,5 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});// ../../node_modules/.pnpm/@weapp-core+escape@3.0.2/node_modules/@weapp-core/escape/dist/index.mjs
-var MappingChars2String = {
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// ../../node_modules/.pnpm/@weapp-core+escape@4.0.0/node_modules/@weapp-core/escape/dist/index.mjs
+var ComplexMappingChars2String = {
   "[": "_bl_",
   "]": "_br_",
   "(": "_pl_",
@@ -34,14 +34,15 @@ var MappingChars2String = {
   "$": "_do_"
   // _: '_u_'
 };
-var MappingChars2StringEntries = Object.entries(MappingChars2String);
-var SimpleMappingChars2String = {
+var ComplexMappingChars2StringEntries = Object.entries(ComplexMappingChars2String);
+var MappingChars2String = {
   "[": "_",
   "]": "_",
-  "(": "_",
-  ")": "_",
-  "{": "_",
-  "}": "_",
+  // for tailwindcss v4
+  "(": "y",
+  ")": "y",
+  "{": "z",
+  "}": "z",
   "+": "a",
   ",": "b",
   ":": "c",
@@ -67,7 +68,7 @@ var SimpleMappingChars2String = {
   "\\": "w",
   '"': "x"
 };
-var SimpleMappingChars2StringEntries = Object.entries(SimpleMappingChars2String);
+var MappingChars2StringEntries = Object.entries(MappingChars2String);
 var MAX_ASCII_CHAR_CODE = 127;
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") {
@@ -146,7 +147,7 @@ function escape(selectors, options) {
     return "";
   }
   const { map, ignoreHead } = defu(options, {
-    map: SimpleMappingChars2String,
+    map: MappingChars2String,
     ignoreHead: false
   });
   const sb = [];
@@ -171,10 +172,10 @@ function escape(selectors, options) {
   return sb.join("");
 }
 
-// ../weapp-tailwindcss/dist/chunk-U7O2XXYR.mjs
+// ../weapp-tailwindcss/dist/chunk-PCBSAFQF.mjs
 function replaceWxml(original, options = {
   keepEOL: false,
-  escapeMap: SimpleMappingChars2String
+  escapeMap: MappingChars2String
 }) {
   const { keepEOL, escapeMap, mangleContext, ignoreHead } = options;
   let res = original;

package/dist/{chunk-YR5LCHCZ.js → chunk-YLSVCIIK.js}

@@ -1,5 +1,5 @@
-// ../../node_modules/.pnpm/@weapp-core+escape@3.0.2/node_modules/@weapp-core/escape/dist/index.mjs
-var MappingChars2String = {
+// ../../node_modules/.pnpm/@weapp-core+escape@4.0.0/node_modules/@weapp-core/escape/dist/index.mjs
+var ComplexMappingChars2String = {
   "[": "_bl_",
   "]": "_br_",
   "(": "_pl_",
@@ -34,14 +34,15 @@ var MappingChars2String = {
   "$": "_do_"
   // _: '_u_'
 };
-var MappingChars2StringEntries = Object.entries(MappingChars2String);
-var SimpleMappingChars2String = {
+var ComplexMappingChars2StringEntries = Object.entries(ComplexMappingChars2String);
+var MappingChars2String = {
   "[": "_",
   "]": "_",
-  "(": "_",
-  ")": "_",
-  "{": "_",
-  "}": "_",
+  // for tailwindcss v4
+  "(": "y",
+  ")": "y",
+  "{": "z",
+  "}": "z",
   "+": "a",
   ",": "b",
   ":": "c",
@@ -67,7 +68,7 @@ var SimpleMappingChars2String = {
   "\\": "w",
   '"': "x"
 };
-var SimpleMappingChars2StringEntries = Object.entries(SimpleMappingChars2String);
+var MappingChars2StringEntries = Object.entries(MappingChars2String);
 var MAX_ASCII_CHAR_CODE = 127;
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") {
@@ -146,7 +147,7 @@ function escape(selectors, options) {
     return "";
   }
   const { map, ignoreHead } = defu(options, {
-    map: SimpleMappingChars2String,
+    map: MappingChars2String,
     ignoreHead: false
   });
   const sb = [];
@@ -171,10 +172,10 @@ function escape(selectors, options) {
   return sb.join("");
 }
 
-// ../weapp-tailwindcss/dist/chunk-U7O2XXYR.mjs
+// ../weapp-tailwindcss/dist/chunk-PCBSAFQF.mjs
 function replaceWxml(original, options = {
   keepEOL: false,
-  escapeMap: SimpleMappingChars2String
+  escapeMap: MappingChars2String
 }) {
   const { keepEOL, escapeMap, mangleContext, ignoreHead } = options;
   let res = original;

package/dist/cva.cjs

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkVR7IWN2Zcjs = require('./chunk-VR7IWN2Z.cjs');
+var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
 
 // src/cva.ts
 var _classvarianceauthority = require('class-variance-authority');
 function cva(...inputs) {
   const fn = _classvarianceauthority.cva.call(void 0, ...inputs);
   return (...props) => {
-    return _chunkVR7IWN2Zcjs.replaceWxml.call(void 0, fn(...props));
+    return _chunkD36KUYOCcjs.replaceWxml.call(void 0, fn(...props));
   };
 }
 

package/dist/cva.js

@@ -1,6 +1,6 @@
 import {
   replaceWxml
-} from "./chunk-YR5LCHCZ.js";
+} from "./chunk-YLSVCIIK.js";
 
 // src/cva.ts
 import { cva as _cva } from "class-variance-authority";

package/dist/index.cjs

@@ -1,15 +1,42 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkVR7IWN2Zcjs = require('./chunk-VR7IWN2Z.cjs');
+var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
 
 // src/index.ts
 var _clsx = require('clsx');
+
+
+
+
+
+
+
 var _tailwindmerge = require('tailwind-merge');
-function cn(...inputs) {
-  return _chunkVR7IWN2Zcjs.replaceWxml.call(void 0, _tailwindmerge.twMerge.call(void 0, _clsx.clsx.call(void 0, inputs)));
+function twMerge(...inputs) {
+  return _chunkD36KUYOCcjs.replaceWxml.call(void 0, _tailwindmerge.twMerge.call(void 0, _clsx.clsx.call(void 0, inputs)));
 }
+function twJoin(...inputs) {
+  return _chunkD36KUYOCcjs.replaceWxml.call(void 0, _tailwindmerge.twJoin.call(void 0, _clsx.clsx.call(void 0, inputs)));
+}
+var extendTailwindMerge = (...args) => {
+  const customTwMerge = _tailwindmerge.extendTailwindMerge.call(void 0, ...args);
+  return function cn(...inputs) {
+    return _chunkD36KUYOCcjs.replaceWxml.call(void 0, customTwMerge(_clsx.clsx.call(void 0, inputs)));
+  };
+};
+var createTailwindMerge = (...args) => {
+  const customTwMerge = _tailwindmerge.createTailwindMerge.call(void 0, ...args);
+  return function cn(...inputs) {
+    return _chunkD36KUYOCcjs.replaceWxml.call(void 0, customTwMerge(_clsx.clsx.call(void 0, inputs)));
+  };
+};
+
+
+
+
+
 
 
 
-exports.cn = cn; exports.weappTwIgnore = _chunkVR7IWN2Zcjs.weappTwIgnore;
+exports.createTailwindMerge = createTailwindMerge; exports.extendTailwindMerge = extendTailwindMerge; exports.getDefaultConfig = _tailwindmerge.getDefaultConfig; exports.mergeConfigs = _tailwindmerge.mergeConfigs; exports.twJoin = twJoin; exports.twMerge = twMerge; exports.weappTwIgnore = _chunkD36KUYOCcjs.weappTwIgnore;

package/dist/index.d.cts

@@ -1,6 +1,12 @@
 import { ClassValue } from 'clsx';
+export { ClassValue } from 'clsx';
+import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
+export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 
-declare function cn(...inputs: ClassValue[]): string;
+declare function twMerge(...inputs: ClassValue[]): string;
+declare function twJoin(...inputs: ClassValue[]): string;
+declare const extendTailwindMerge: typeof extendTailwindMerge$1;
+declare const createTailwindMerge: typeof createTailwindMerge$1;
 
-export { cn };
+export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };

package/dist/index.d.ts

@@ -1,6 +1,12 @@
 import { ClassValue } from 'clsx';
+export { ClassValue } from 'clsx';
+import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
+export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
 
-declare function cn(...inputs: ClassValue[]): string;
+declare function twMerge(...inputs: ClassValue[]): string;
+declare function twJoin(...inputs: ClassValue[]): string;
+declare const extendTailwindMerge: typeof extendTailwindMerge$1;
+declare const createTailwindMerge: typeof createTailwindMerge$1;
 
-export { cn };
+export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };

package/dist/index.js

@@ -1,15 +1,42 @@
 import {
   replaceWxml,
   weappTwIgnore
-} from "./chunk-YR5LCHCZ.js";
+} from "./chunk-YLSVCIIK.js";
 
 // src/index.ts
 import { clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
-function cn(...inputs) {
-  return replaceWxml(twMerge(clsx(inputs)));
+import {
+  createTailwindMerge as _createTailwindMerge,
+  extendTailwindMerge as _extendTailwindMerge,
+  twJoin as _twJoin,
+  twMerge as _twMerge,
+  getDefaultConfig,
+  mergeConfigs
+} from "tailwind-merge";
+function twMerge(...inputs) {
+  return replaceWxml(_twMerge(clsx(inputs)));
+}
+function twJoin(...inputs) {
+  return replaceWxml(_twJoin(clsx(inputs)));
 }
+var extendTailwindMerge = (...args) => {
+  const customTwMerge = _extendTailwindMerge(...args);
+  return function cn(...inputs) {
+    return replaceWxml(customTwMerge(clsx(inputs)));
+  };
+};
+var createTailwindMerge = (...args) => {
+  const customTwMerge = _createTailwindMerge(...args);
+  return function cn(...inputs) {
+    return replaceWxml(customTwMerge(clsx(inputs)));
+  };
+};
 export {
-  cn,
+  createTailwindMerge,
+  extendTailwindMerge,
+  getDefaultConfig,
+  mergeConfigs,
+  twJoin,
+  twMerge,
   weappTwIgnore
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/merge",
   "type": "module",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "weapp-tailwindcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -33,10 +33,10 @@
   "dependencies": {
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "tailwind-merge": "^2.6.0"
+    "tailwind-merge": "^3.0.1"
   },
   "devDependencies": {
-    "weapp-tailwindcss": "4.0.0-alpha.7"
+    "weapp-tailwindcss": "4.0.0-alpha.10"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",