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

package/dist/chunk-BV6XHTF4.cjs

@@ -0,0 +1,41 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
+
+// src/v4.ts
+var _clsx = require('clsx');
+
+
+
+
+
+
+
+var _tailwindmerge = require('tailwind-merge');
+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.getDefaultConfig = _tailwindmerge.getDefaultConfig; exports.mergeConfigs = _tailwindmerge.mergeConfigs; exports.twMerge = twMerge; exports.twJoin = twJoin; exports.extendTailwindMerge = extendTailwindMerge; exports.createTailwindMerge = createTailwindMerge;

package/dist/chunk-TQWB53Z6.js

@@ -0,0 +1,41 @@
+import {
+  replaceWxml
+} from "./chunk-YLSVCIIK.js";
+
+// src/v4.ts
+import { clsx } from "clsx";
+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 {
+  getDefaultConfig,
+  mergeConfigs,
+  twMerge,
+  twJoin,
+  extendTailwindMerge,
+  createTailwindMerge
+};

package/dist/index.cjs

@@ -1,36 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
-
-// src/index.ts
-var _clsx = require('clsx');
 
 
 
 
+var _chunkBV6XHTF4cjs = require('./chunk-BV6XHTF4.cjs');
 
 
-
-var _tailwindmerge = require('tailwind-merge');
-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)));
-  };
-};
+var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
 
 
 
@@ -39,4 +17,4 @@ var createTailwindMerge = (...args) => {
 
 
 
-exports.createTailwindMerge = createTailwindMerge; exports.extendTailwindMerge = extendTailwindMerge; exports.getDefaultConfig = _tailwindmerge.getDefaultConfig; exports.mergeConfigs = _tailwindmerge.mergeConfigs; exports.twJoin = twJoin; exports.twMerge = twMerge; exports.weappTwIgnore = _chunkD36KUYOCcjs.weappTwIgnore;
+exports.createTailwindMerge = _chunkBV6XHTF4cjs.createTailwindMerge; exports.extendTailwindMerge = _chunkBV6XHTF4cjs.extendTailwindMerge; exports.getDefaultConfig = _chunkBV6XHTF4cjs.getDefaultConfig; exports.mergeConfigs = _chunkBV6XHTF4cjs.mergeConfigs; exports.twJoin = _chunkBV6XHTF4cjs.twJoin; exports.twMerge = _chunkBV6XHTF4cjs.twMerge; exports.weappTwIgnore = _chunkD36KUYOCcjs.weappTwIgnore;

package/dist/index.d.cts

@@ -1,12 +1,4 @@
-import { ClassValue } from 'clsx';
-export { ClassValue } from 'clsx';
-import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
+export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.cjs';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
-
-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 { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
+export { ClassValue } from 'clsx';

package/dist/index.d.ts

@@ -1,12 +1,4 @@
-import { ClassValue } from 'clsx';
-export { ClassValue } from 'clsx';
-import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge';
+export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge } from './v4.js';
 export { getDefaultConfig, mergeConfigs } from 'tailwind-merge';
 export { weappTwIgnore } from 'weapp-tailwindcss/escape';
-
-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 { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };
+export { ClassValue } from 'clsx';

package/dist/index.js

@@ -1,36 +1,14 @@
 import {
-  replaceWxml,
+  createTailwindMerge,
+  extendTailwindMerge,
+  getDefaultConfig,
+  mergeConfigs,
+  twJoin,
+  twMerge
+} from "./chunk-TQWB53Z6.js";
+import {
   weappTwIgnore
 } from "./chunk-YLSVCIIK.js";
-
-// src/index.ts
-import { clsx } from "clsx";
-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 {
   createTailwindMerge,
   extendTailwindMerge,

package/dist/v3.cjs

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

package/dist/v3.d.cts

@@ -0,0 +1,12 @@
+import { ClassValue } from 'clsx';
+export { ClassValue } from 'clsx';
+import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge-v2';
+export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
+export { weappTwIgnore } from 'weapp-tailwindcss/escape';
+
+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 { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };

package/dist/v3.d.ts

@@ -0,0 +1,12 @@
+import { ClassValue } from 'clsx';
+export { ClassValue } from 'clsx';
+import { extendTailwindMerge as extendTailwindMerge$1, createTailwindMerge as createTailwindMerge$1 } from 'tailwind-merge-v2';
+export { getDefaultConfig, mergeConfigs } from 'tailwind-merge-v2';
+export { weappTwIgnore } from 'weapp-tailwindcss/escape';
+
+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 { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };

package/dist/v3.js

@@ -0,0 +1,42 @@
+import {
+  replaceWxml,
+  weappTwIgnore
+} from "./chunk-YLSVCIIK.js";
+
+// src/v3.ts
+import { clsx } from "clsx";
+import {
+  createTailwindMerge as _createTailwindMerge,
+  extendTailwindMerge as _extendTailwindMerge,
+  twJoin as _twJoin,
+  twMerge as _twMerge,
+  getDefaultConfig,
+  mergeConfigs
+} from "tailwind-merge-v2";
+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 {
+  createTailwindMerge,
+  extendTailwindMerge,
+  getDefaultConfig,
+  mergeConfigs,
+  twJoin,
+  twMerge,
+  weappTwIgnore
+};

package/dist/v4.cjs

@@ -0,0 +1,20 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+
+
+
+
+
+var _chunkBV6XHTF4cjs = require('./chunk-BV6XHTF4.cjs');
+
+
+var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
+
+
+
+
+
+
+
+
+exports.createTailwindMerge = _chunkBV6XHTF4cjs.createTailwindMerge; exports.extendTailwindMerge = _chunkBV6XHTF4cjs.extendTailwindMerge; exports.getDefaultConfig = _chunkBV6XHTF4cjs.getDefaultConfig; exports.mergeConfigs = _chunkBV6XHTF4cjs.mergeConfigs; exports.twJoin = _chunkBV6XHTF4cjs.twJoin; exports.twMerge = _chunkBV6XHTF4cjs.twMerge; exports.weappTwIgnore = _chunkD36KUYOCcjs.weappTwIgnore;

package/dist/v4.d.cts

@@ -0,0 +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 twMerge(...inputs: ClassValue[]): string;
+declare function twJoin(...inputs: ClassValue[]): string;
+declare const extendTailwindMerge: typeof extendTailwindMerge$1;
+declare const createTailwindMerge: typeof createTailwindMerge$1;
+
+export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };

package/dist/v4.d.ts

@@ -0,0 +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 twMerge(...inputs: ClassValue[]): string;
+declare function twJoin(...inputs: ClassValue[]): string;
+declare const extendTailwindMerge: typeof extendTailwindMerge$1;
+declare const createTailwindMerge: typeof createTailwindMerge$1;
+
+export { createTailwindMerge, extendTailwindMerge, twJoin, twMerge };

package/dist/v4.js

@@ -0,0 +1,20 @@
+import {
+  createTailwindMerge,
+  extendTailwindMerge,
+  getDefaultConfig,
+  mergeConfigs,
+  twJoin,
+  twMerge
+} from "./chunk-TQWB53Z6.js";
+import {
+  weappTwIgnore
+} from "./chunk-YLSVCIIK.js";
+export {
+  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.5",
+  "version": "1.0.0-alpha.6",
   "description": "weapp-tailwindcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -25,6 +25,16 @@
       "types": "./dist/cva.d.ts",
       "import": "./dist/cva.js",
       "require": "./dist/cva.cjs"
+    },
+    "./v3": {
+      "types": "./dist/v3.d.ts",
+      "import": "./dist/v3.js",
+      "require": "./dist/v3.cjs"
+    },
+    "./v4": {
+      "types": "./dist/v4.d.ts",
+      "import": "./dist/v4.js",
+      "require": "./dist/v4.cjs"
     }
   },
   "files": [
@@ -33,10 +43,11 @@
   "dependencies": {
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "tailwind-merge": "^3.0.1"
+    "tailwind-merge": "^3.0.1",
+    "tailwind-merge-v2": "npm:tailwind-merge@^2.6.0"
   },
   "devDependencies": {
-    "weapp-tailwindcss": "4.0.0-alpha.10"
+    "weapp-tailwindcss": "4.0.0-alpha.13"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",