@weapp-tailwindcss/merge 1.0.0 → 1.0.2

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

@@ -1,4 +1,4 @@
-"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
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// ../../node_modules/.pnpm/@weapp-core+escape@4.0.1/node_modules/@weapp-core/escape/dist/index.mjs
 var ComplexMappingChars2String = {
   "[": "_bl_",
   "]": "_br_",
@@ -172,7 +172,7 @@ function escape(selectors, options) {
   return sb.join("");
 }
 
-// ../weapp-tailwindcss/dist/chunk-PCBSAFQF.mjs
+// ../weapp-tailwindcss/dist/chunk-Q67IXIAH.mjs
 function replaceWxml(original, options = {
   keepEOL: false,
   escapeMap: MappingChars2String

package/dist/{chunk-TQWB53Z6.js → chunk-SHRVGHJ4.js}

@@ -1,6 +1,6 @@
 import {
   replaceWxml
-} from "./chunk-YLSVCIIK.js";
+} from "./chunk-YWRMBDAW.js";
 
 // src/v4.ts
 import { clsx } from "clsx";

package/dist/{chunk-BV6XHTF4.cjs → chunk-XUZIFJCO.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
+var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
 
 // src/v4.ts
 var _clsx = require('clsx');
@@ -13,21 +13,21 @@ 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)));
+  return _chunkNDXSFOW3cjs.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)));
+  return _chunkNDXSFOW3cjs.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)));
+    return _chunkNDXSFOW3cjs.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)));
+    return _chunkNDXSFOW3cjs.replaceWxml.call(void 0, customTwMerge(_clsx.clsx.call(void 0, inputs)));
   };
 };
 

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

@@ -1,4 +1,4 @@
-// ../../node_modules/.pnpm/@weapp-core+escape@4.0.0/node_modules/@weapp-core/escape/dist/index.mjs
+// ../../node_modules/.pnpm/@weapp-core+escape@4.0.1/node_modules/@weapp-core/escape/dist/index.mjs
 var ComplexMappingChars2String = {
   "[": "_bl_",
   "]": "_br_",
@@ -172,7 +172,7 @@ function escape(selectors, options) {
   return sb.join("");
 }
 
-// ../weapp-tailwindcss/dist/chunk-PCBSAFQF.mjs
+// ../weapp-tailwindcss/dist/chunk-Q67IXIAH.mjs
 function replaceWxml(original, options = {
   keepEOL: false,
   escapeMap: MappingChars2String

package/dist/cva.cjs

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

package/dist/cva.js

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

package/dist/index.cjs

@@ -5,10 +5,10 @@
 
 
 
-var _chunkBV6XHTF4cjs = require('./chunk-BV6XHTF4.cjs');
+var _chunkXUZIFJCOcjs = require('./chunk-XUZIFJCO.cjs');
 
 
-var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
+var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
 
 
 
@@ -17,4 +17,4 @@ 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;
+exports.createTailwindMerge = _chunkXUZIFJCOcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkXUZIFJCOcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkXUZIFJCOcjs.getDefaultConfig; exports.mergeConfigs = _chunkXUZIFJCOcjs.mergeConfigs; exports.twJoin = _chunkXUZIFJCOcjs.twJoin; exports.twMerge = _chunkXUZIFJCOcjs.twMerge; exports.weappTwIgnore = _chunkNDXSFOW3cjs.weappTwIgnore;

package/dist/index.js

@@ -5,10 +5,10 @@ import {
   mergeConfigs,
   twJoin,
   twMerge
-} from "./chunk-TQWB53Z6.js";
+} from "./chunk-SHRVGHJ4.js";
 import {
   weappTwIgnore
-} from "./chunk-YLSVCIIK.js";
+} from "./chunk-YWRMBDAW.js";
 export {
   createTailwindMerge,
   extendTailwindMerge,

package/dist/v3.cjs

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

package/dist/v3.js

@@ -1,7 +1,7 @@
 import {
   replaceWxml,
   weappTwIgnore
-} from "./chunk-YLSVCIIK.js";
+} from "./chunk-YWRMBDAW.js";
 
 // src/v3.ts
 import { clsx } from "clsx";

package/dist/v4.cjs

@@ -5,10 +5,10 @@
 
 
 
-var _chunkBV6XHTF4cjs = require('./chunk-BV6XHTF4.cjs');
+var _chunkXUZIFJCOcjs = require('./chunk-XUZIFJCO.cjs');
 
 
-var _chunkD36KUYOCcjs = require('./chunk-D36KUYOC.cjs');
+var _chunkNDXSFOW3cjs = require('./chunk-NDXSFOW3.cjs');
 
 
 
@@ -17,4 +17,4 @@ 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;
+exports.createTailwindMerge = _chunkXUZIFJCOcjs.createTailwindMerge; exports.extendTailwindMerge = _chunkXUZIFJCOcjs.extendTailwindMerge; exports.getDefaultConfig = _chunkXUZIFJCOcjs.getDefaultConfig; exports.mergeConfigs = _chunkXUZIFJCOcjs.mergeConfigs; exports.twJoin = _chunkXUZIFJCOcjs.twJoin; exports.twMerge = _chunkXUZIFJCOcjs.twMerge; exports.weappTwIgnore = _chunkNDXSFOW3cjs.weappTwIgnore;

package/dist/v4.js

@@ -5,10 +5,10 @@ import {
   mergeConfigs,
   twJoin,
   twMerge
-} from "./chunk-TQWB53Z6.js";
+} from "./chunk-SHRVGHJ4.js";
 import {
   weappTwIgnore
-} from "./chunk-YLSVCIIK.js";
+} from "./chunk-YWRMBDAW.js";
 export {
   createTailwindMerge,
   extendTailwindMerge,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/merge",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "weapp-tailwindcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -38,16 +38,18 @@
     }
   },
   "files": [
-    "dist"
+    "dist",
+    "scripts"
   ],
   "dependencies": {
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "tailwind-merge": "^3.0.1",
+    "semver": "^7.7.1",
+    "tailwind-merge": "^3.0.2",
     "tailwind-merge-v2": "npm:tailwind-merge@^2.6.0"
   },
   "devDependencies": {
-    "weapp-tailwindcss": "4.0.0"
+    "weapp-tailwindcss": "4.0.6"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",
@@ -56,7 +58,8 @@
     "test:dev": "vitest",
     "release": "pnpm publish",
     "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
+    "lint:fix": "eslint . --fix",
+    "postinstall": "node scripts/postinstall.js"
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

package/scripts/postinstall.js

@@ -0,0 +1,64 @@
+import fs from 'node:fs'
+import { createRequire } from 'node:module'
+import path from 'node:path'
+import process from 'node:process'
+import satisfies from 'semver/functions/satisfies.js'
+
+const require = createRequire(import.meta.url)
+
+function getPackageVersion(pkgName) {
+  try {
+    const pkgPath = path.join(process.cwd(), 'node_modules', pkgName, 'package.json')
+    if (fs.existsSync(pkgPath)) {
+      const pkg = require(pkgPath)
+      return pkg.version
+    }
+
+    // 尝试从 package.json 读取
+    const rootPkgPath = path.join(process.cwd(), 'package.json')
+    if (fs.existsSync(rootPkgPath)) {
+      const rootPkg = require(rootPkgPath)
+      return rootPkg.dependencies?.[pkgName] || rootPkg.devDependencies?.[pkgName] || null
+    }
+  }
+  catch (error) {
+    console.error(`Error reading ${pkgName} version:`, error)
+  }
+  return null
+}
+
+function main() {
+  const distDir = path.resolve(import.meta.dirname, '../dist')
+
+  if (!fs.existsSync(distDir)) {
+    return
+  }
+
+  const tailwindVersion = getPackageVersion('tailwindcss')
+
+  if (!tailwindVersion) {
+    console.warn('tailwindcss not found in the project. Skipping swicth version of tailwind-merge.')
+    return
+  }
+
+  let targetVersion = null
+
+  if (satisfies(tailwindVersion, '^4.0.0')) {
+    targetVersion = 4
+  }
+  else {
+    targetVersion = 3
+  }
+  console.log(`tailwindcss version: ${tailwindVersion}`)
+  console.log(`Switch version of tailwind-merge to v${targetVersion - 1}.`)
+  for (const ext of ['cjs', 'd.cts', 'd.ts', 'js']) {
+    const file = `v${targetVersion}.${ext}`
+    fs.copyFileSync(
+      path.resolve(distDir, file),
+      path.resolve(distDir, `index.${ext}`),
+    )
+  }
+  console.log('Switch version of tailwind-merge success.')
+}
+
+main()