@weapp-tailwindcss/merge 1.0.2 → 1.0.4

package/dist/cva.d.cts

@@ -1,6 +1,6 @@
 import * as class_variance_authority_types from 'class-variance-authority/types';
 import { cva as cva$1 } from 'class-variance-authority';
 
-declare function cva(...inputs: Parameters<typeof cva$1>): (props?: class_variance_authority_types.ClassProp | undefined) => string;
+declare function cva(...inputs: Parameters<typeof cva$1>): (...props: Parameters<(props?: class_variance_authority_types.ClassProp | undefined) => string>) => string;
 
 export { cva };

package/dist/cva.d.ts

@@ -1,6 +1,6 @@
 import * as class_variance_authority_types from 'class-variance-authority/types';
 import { cva as cva$1 } from 'class-variance-authority';
 
-declare function cva(...inputs: Parameters<typeof cva$1>): (props?: class_variance_authority_types.ClassProp | undefined) => string;
+declare function cva(...inputs: Parameters<typeof cva$1>): (...props: Parameters<(props?: class_variance_authority_types.ClassProp | undefined) => string>) => string;
 
 export { cva };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/merge",
   "type": "module",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "weapp-tailwindcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -44,12 +44,13 @@
   "dependencies": {
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "local-pkg": "^1.1.1",
     "semver": "^7.7.1",
     "tailwind-merge": "^3.0.2",
     "tailwind-merge-v2": "npm:tailwind-merge@^2.6.0"
   },
   "devDependencies": {
-    "weapp-tailwindcss": "4.0.6"
+    "weapp-tailwindcss": "4.0.10"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",

package/scripts/postinstall.js

@@ -1,54 +1,29 @@
 import fs from 'node:fs'
-import { createRequire } from 'node:module'
 import path from 'node:path'
-import process from 'node:process'
+import { getPackageInfoSync } from 'local-pkg'
 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 packageInfo = getPackageInfoSync('tailwindcss')
 
-  const tailwindVersion = getPackageVersion('tailwindcss')
-
-  if (!tailwindVersion) {
+  if (!packageInfo) {
     console.warn('tailwindcss not found in the project. Skipping swicth version of tailwind-merge.')
     return
   }
 
-  let targetVersion = null
+  const tailwindVersion = packageInfo.version
+
+  let targetVersion = 3
 
   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']) {