@weapp-tailwindcss/merge 1.1.0 → 1.2.0

package/dist/postinstall.cjs

@@ -0,0 +1,32 @@
+"use strict"; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }// src/postinstall.ts
+var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+var _localpkg = require('local-pkg');
+var _satisfiesjs = require('semver/functions/satisfies.js'); var _satisfiesjs2 = _interopRequireDefault(_satisfiesjs);
+function main() {
+  const distDir = _path2.default.resolve(__dirname, "../dist");
+  if (!_fs2.default.existsSync(distDir)) {
+    return;
+  }
+  const packageInfo = _localpkg.getPackageInfoSync.call(void 0, "tailwindcss");
+  if (!packageInfo) {
+    console.warn("tailwindcss not found in the project. Skipping swicth version of tailwind-merge.");
+    return;
+  }
+  const tailwindVersion = packageInfo.version;
+  let targetVersion = 3;
+  if (_satisfiesjs2.default.call(void 0, tailwindVersion, "^4.0.0")) {
+    targetVersion = 4;
+  }
+  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}`;
+    _fs2.default.copyFileSync(
+      _path2.default.resolve(distDir, file),
+      _path2.default.resolve(distDir, `index.${ext}`)
+    );
+  }
+  console.log("Switch version of tailwind-merge success.");
+}
+main();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/merge",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "weapp-tailwindcss",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -52,11 +52,11 @@
     "clsx": "^2.1.1",
     "local-pkg": "^1.1.1",
     "semver": "^7.7.1",
-    "tailwind-merge": "^3.1.0",
+    "tailwind-merge": "^3.3.0",
     "tailwind-merge-v2": "npm:tailwind-merge@^2.6.0"
   },
   "devDependencies": {
-    "weapp-tailwindcss": "4.1.3"
+    "weapp-tailwindcss": "4.1.7"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",
@@ -66,6 +66,6 @@
     "release": "pnpm publish",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "postinstall": "node scripts/postinstall.js"
+    "postinstall": "node scripts/postinstall.cjs"
   }
 }

package/scripts/postinstall.cjs

@@ -0,0 +1,14 @@
+const fs = require('node:fs')
+const path = require('node:path')
+
+function main() {
+  const targetPath = path.resolve(__dirname, '../dist/postinstall.cjs')
+  if (fs.existsSync(targetPath)) {
+    require(targetPath)
+  }
+  else {
+    console.log('postinstall.cjs not found')
+  }
+}
+
+main()

package/scripts/postinstall.js

@@ -1,39 +0,0 @@
-import fs from 'node:fs'
-import path from 'node:path'
-import { getPackageInfoSync } from 'local-pkg'
-import satisfies from 'semver/functions/satisfies.js'
-
-function main() {
-  const distDir = path.resolve(import.meta.dirname, '../dist')
-
-  if (!fs.existsSync(distDir)) {
-    return
-  }
-  const packageInfo = getPackageInfoSync('tailwindcss')
-
-  if (!packageInfo) {
-    console.warn('tailwindcss not found in the project. Skipping swicth version of tailwind-merge.')
-    return
-  }
-
-  const tailwindVersion = packageInfo.version
-
-  let targetVersion = 3
-
-  if (satisfies(tailwindVersion, '^4.0.0')) {
-    targetVersion = 4
-  }
-
-  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()