chore: demo upgrade alpha

Author: sonofmagic

.changeset/modern-kangaroos-talk.md

@@ -8,4 +8,14 @@
 "weapp-tailwindcss": major
 ---
 
-chore: monorepo changes
+
+
+## Feature
+
+增加 `@weapp-tailwindcss/merge` 支持，这是 `weapp-tailwindcss` 版本的 `tailwindcss-merge` 和 `cva` 方法
+
+## Breaking Changes
+
+1. 去除 `weapp-tailwindcss/postcss` (可直接安装使用 `@weapp-tailwindcss/postcss`)
+2. 增加 `weapp-tailwindcss/escape` 来取代 `weapp-tailwindcss/replace`
+3. 项目 monorepo 区分包

benchmark/data/2025-01-11.json

@@ -0,0 +1,72 @@
+{
+  "mpx": {
+    "babel": [
+      51.84654199999977,
+      0.2810420000000704,
+      0.24474999999983993,
+      0.2719170000000304,
+      0.2358749999993961,
+      0.26529200000004494,
+      226.5332500000004,
+      299.4494579999998
+    ]
+  },
+  "native-webpack": {
+    "babel": [
+      47.077,
+      46.39608300000009
+    ]
+  },
+  "rax": {
+    "babel": [
+      0.34324999999989814,
+      0.09891700000025594,
+      0.2615409999998519,
+      0.26370900000028996,
+      0.1360829999998714,
+      0.3392499999999927,
+      73.29016700000011,
+      122.63954200000012
+    ]
+  },
+  "taro-react": {
+    "babel": [
+      264.7210409999998,
+      151.42391700000007,
+      384.9939999999997,
+      240.23995899999954,
+      139.36562500000036,
+      358.8942499999994
+    ]
+  },
+  "taro-vue2": {
+    "babel": [
+      180.58545800000047,
+      207.8494999999998
+    ]
+  },
+  "taro-vue3": {
+    "babel": [
+      176.39979200000016,
+      218.2922910000002
+    ]
+  },
+  "uni-app-webpack-vue2": {
+    "babel": [
+      227.7779169999999,
+      198.9627499999997
+    ]
+  },
+  "uni-app-vite-vue3": {
+    "babel": [
+      299.3712919999998,
+      307.39599999999996
+    ]
+  },
+  "uni-app-webpack5-vue2": {
+    "babel": [
+      111.73979099999997,
+      106.07937500000025
+    ]
+  }
+}

demo/gulp-app/gulpfile.ts

@@ -43,6 +43,7 @@ const tsProject = ts.createProject('tsconfig.json')
 
 // 在 gulp 里使用，先使用 postcss 转化 css，触发 tailwindcss ，然后转化 transformWxss， 然后 transformJs, transformWxml
 const { transformJs, transformWxml, transformWxss } = createPlugins({
+  // @ts-ignore
   rem2rpx: true,
   jsAstTool: useBabel ? 'babel' : 'ast-grep',
 })

demo/gulp-app/package.json

@@ -55,7 +55,7 @@
     "@types/gulp-util": "^3.0.41",
     "@types/node": "^22.7.4",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^0.0.1-alpha.0",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
     "autoprefixer": "^10.4.20",
     "cross-env": "^7.0.3",
     "del": "^6.1.1",
@@ -88,7 +88,7 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.6.2",
     "weapp-ide-cli": "^2.0.9",
-    "weapp-tailwindcss": "^3.8.0-alpha.1",
+    "weapp-tailwindcss": "^4.0.0-alpha.3",
     "weapp-tailwindcss-children": "^0.1.0"
   }
 }

demo/gulp-app/yarn.lock

@@ -161,7 +161,7 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@csstools/postcss-is-pseudo-class@~5.0.1":
+"@csstools/postcss-is-pseudo-class@^5.0.1":
   version "5.0.1"
   resolved "https://registry.npmmirror.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.1.tgz#12041448fedf01090dd4626022c28b7f7623f58e"
   integrity sha512-JLp3POui4S1auhDR0n8wHd/zTOWmMsmK3nQd3hhL6FhWPaox5W7j1se6zXOG/aP07wV2ww0lxbKYGwbBszOtfQ==
@@ -824,35 +824,58 @@
     postcss-load-config "^6.0.1"
     postcss-scss "^4.0.9"
 
-"@weapp-tailwindcss/init@0.0.1-alpha.0":
-  version "0.0.1-alpha.0"
-  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/init/-/init-0.0.1-alpha.0.tgz#2077eb646f5b39f45ab840456373e058be708230"
-  integrity sha512-UgimUkvr4jTXCGDE+Liq+9JXOkWVm9ticeXEYPb9ZxwDN0SddX2mGjtEsDX9bxXbEERUYoIZDVx2ZA0HBCdKOw==
+"@weapp-tailwindcss/init@1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/init/-/init-1.0.0-alpha.2.tgz#db695e1588a9630a29f80d6e8c7aa4a3a7599eac"
+  integrity sha512-Mk0kpIx4L7/3jt+2F5emnc+PeOzjfbXFWkAOc9fCbJ/PMkSjoqEIxEyY6kSfTxzo1cCTn8AZNWlSkYPnPOBaPw==
   dependencies:
-    "@weapp-tailwindcss/logger" "0.0.0"
-    "@weapp-tailwindcss/shared" "0.0.0"
+    "@weapp-tailwindcss/logger" "1.0.0-alpha.0"
+    "@weapp-tailwindcss/shared" "1.0.0-alpha.1"
+    fs-extra "^11.2.0"
     npm-registry-fetch "^18.0.2"
+    pathe "^2.0.1"
 
-"@weapp-tailwindcss/logger@0.0.0":
-  version "0.0.0"
-  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/logger/-/logger-0.0.0.tgz#d42c87bda5765cc1cc4ccbbd6158595cc0a28102"
-  integrity sha512-ZQ+GBRm+cK2P4qMpAatnUMCC1RF99Ow0wvz2E/osCqLzPu5X8cKuzzCPQhsY+e1NX/gj2cKlASM6LoMtby7vsg==
+"@weapp-tailwindcss/logger@1.0.0-alpha.0":
+  version "1.0.0-alpha.0"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/logger/-/logger-1.0.0-alpha.0.tgz#4e699a356aae272abdefc49bd02f6e57dc0c6237"
+  integrity sha512-f7voyNmxgp0JLZb7HZTXwjc5zng2I/gCFGd444a8OJTgq8oYLDlU+EwOoXOHf5q+04/NmQgPZhHJsD6TqYKFmg==
   dependencies:
     consola "^3.3.3"
 
-"@weapp-tailwindcss/merge@^0.0.1-alpha.0":
-  version "0.0.1-alpha.0"
-  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-0.0.1-alpha.0.tgz#67093d6534e31bcbe12fbe53e3d5db439bf4da43"
-  integrity sha512-WZPl51nBYJJWcakF8NqIIH+qz3GLQGXApGGwM2rDvK7lCBzs6LkvUfuoPHv7dRc7jNSGXo+l4ibCsG62OxbOTA==
+"@weapp-tailwindcss/mangle@1.0.0-alpha.1":
+  version "1.0.0-alpha.1"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/mangle/-/mangle-1.0.0-alpha.1.tgz#ac0b127b3934e1ad9a47e4e91145ff5dc908020d"
+  integrity sha512-K7KnrkD+xBRYZUdkjYZ0Og6RvgmYt+PJixRPQ9p6DvvUWzjModhN4V8yFD+q4fJaot/UtbYgcCnWhTsJetxENw==
+  dependencies:
+    "@tailwindcss-mangle/shared" "~4.0.1"
+    "@weapp-core/regex" "~1.0.1"
+    "@weapp-tailwindcss/shared" "1.0.0-alpha.1"
+
+"@weapp-tailwindcss/merge@^1.0.0-alpha.1":
+  version "1.0.0-alpha.1"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.1.tgz#320cb5189e63ce4104cf35be1907b4d0ffa885d1"
+  integrity sha512-CmZxf009frAQhtiY/1ZFJ47QvWZHHXwmiQjK0hMJU6n9JitJD6HuA1wnlJ7D+B4Z1DtXM0SY9KuQbg+GJHuxzQ==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
     tailwind-merge "^2.6.0"
 
-"@weapp-tailwindcss/shared@0.0.0":
-  version "0.0.0"
-  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/shared/-/shared-0.0.0.tgz#96f986cd043993a470940845b18748ee8de3666d"
-  integrity sha512-SaKF7mhpy2bXeJRPvzPKUnp7pgTmvmYCJvEmYwnW5LBRUuTAQE+RFusYUwRiOMX7B4+RvU2RZweYaTgi+eu+Lw==
+"@weapp-tailwindcss/postcss@1.0.0-alpha.1":
+  version "1.0.0-alpha.1"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/postcss/-/postcss-1.0.0-alpha.1.tgz#2bc4cb20ef14966d94f7cb23c16097a84fc15454"
+  integrity sha512-fXByMWtoIMG5M/GOHPXnITZnQiDlPMBTCrYLLBRFbOzAcM/ax8B+415phAPFIoIm877UxicSiUVyGvNpFNSrfw==
+  dependencies:
+    "@csstools/postcss-is-pseudo-class" "^5.0.1"
+    "@weapp-core/escape" "~3.0.2"
+    "@weapp-tailwindcss/shared" "1.0.0-alpha.1"
+    postcss "~8.4.49"
+    postcss-rem-to-responsive-pixel "~6.0.2"
+    postcss-selector-parser "~7.0.0"
+
+"@weapp-tailwindcss/shared@1.0.0-alpha.1":
+  version "1.0.0-alpha.1"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/shared/-/shared-1.0.0-alpha.1.tgz#d7b9155c3c38122316ba052bd1a8272cf97d6c4b"
+  integrity sha512-eEQ1nKnGPPI/rVfoSTo7QjTTNIiAGgQlLOGHaG/c78N5Nadgqn4akaL3YXG0rmkrWkE3U22Ru7G/xHIG5MaKBA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -3979,6 +4002,14 @@ local-pkg@^0.5.0:
     mlly "^1.4.2"
     pkg-types "^1.0.3"
 
+local-pkg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmmirror.com/local-pkg/-/local-pkg-1.0.0.tgz#a8d14dd41e78884f199ecd8b3eedaf0d376e2167"
+  integrity sha512-bbgPw/wmroJsil/GgL4qjDzs5YLTBMQ99weRsok1XCDccQeehbHA/I1oRvk2NPtr7KGZgT/Y5tPRnAtMqeG2Kg==
+  dependencies:
+    mlly "^1.7.3"
+    pkg-types "^1.3.0"
+
 locate-path@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmmirror.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -4408,6 +4439,16 @@ mlly@^1.7.2:
     pkg-types "^1.2.0"
     ufo "^1.5.4"
 
+mlly@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.npmmirror.com/mlly/-/mlly-1.7.3.tgz#d86c0fcd8ad8e16395eb764a5f4b831590cee48c"
+  integrity sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==
+  dependencies:
+    acorn "^8.14.0"
+    pathe "^1.1.2"
+    pkg-types "^1.2.1"
+    ufo "^1.5.4"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz"
@@ -5032,6 +5073,15 @@ pkg-types@^1.2.0:
     mlly "^1.7.2"
     pathe "^1.1.2"
 
+pkg-types@^1.2.1, pkg-types@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.3.0.tgz#53d915eb99485798c554ad8eb2dc2af7c03006eb"
+  integrity sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==
+  dependencies:
+    confbox "^0.1.8"
+    mlly "^1.7.3"
+    pathe "^1.1.2"
+
 plugin-error@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmmirror.com/plugin-error/-/plugin-error-0.1.2.tgz"
@@ -6607,32 +6657,30 @@ weapp-tailwindcss-children@^0.1.0:
   resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1"
   integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g==
 
-weapp-tailwindcss@^3.8.0-alpha.1:
-  version "3.8.0-alpha.1"
-  resolved "https://registry.npmmirror.com/weapp-tailwindcss/-/weapp-tailwindcss-3.8.0-alpha.1.tgz#c2f0db4f25bf2529c64b3b8a4eb37924e1199bfa"
-  integrity sha512-Whw3Hhlw9jzIcqR16msfm2eJZQbzoNGhYiOwOAPhuItl40MmKlByCjZlGkM1xYfDCzdWTETsBnzhhqAxNqUSbA==
+weapp-tailwindcss@^4.0.0-alpha.3:
+  version "4.0.0-alpha.3"
+  resolved "https://registry.npmmirror.com/weapp-tailwindcss/-/weapp-tailwindcss-4.0.0-alpha.3.tgz#b0d744592852e0ec759349af593719b698e122f0"
+  integrity sha512-HX+WkIO0aN8rAfScl5RvlEeZ1Llr8fJ4i6cjUJkiefJEz8MfjW82rSRWTF9VqVoZaygWDW5wcus+GgZiulrEIA==
   dependencies:
     "@ast-core/escape" "~1.0.1"
     "@babel/generator" "~7.26.3"
     "@babel/parser" "~7.26.3"
     "@babel/traverse" "~7.26.4"
     "@babel/types" "~7.26.3"
-    "@csstools/postcss-is-pseudo-class" "~5.0.1"
-    "@tailwindcss-mangle/shared" "~4.0.1"
     "@weapp-core/escape" "~3.0.2"
     "@weapp-core/regex" "~1.0.1"
-    "@weapp-tailwindcss/init" "0.0.1-alpha.0"
-    "@weapp-tailwindcss/logger" "0.0.0"
-    "@weapp-tailwindcss/shared" "0.0.0"
+    "@weapp-tailwindcss/init" "1.0.0-alpha.2"
+    "@weapp-tailwindcss/logger" "1.0.0-alpha.0"
+    "@weapp-tailwindcss/mangle" "1.0.0-alpha.1"
+    "@weapp-tailwindcss/postcss" "1.0.0-alpha.1"
+    "@weapp-tailwindcss/shared" "1.0.0-alpha.1"
     debug "~4.4.0"
     htmlparser2 "10.0.0"
     loader-utils "2.0.4"
+    local-pkg "^1.0.0"
     lru-cache "10.4.3"
     magic-string "0.30.17"
     md5 "2.3.0"
-    postcss "~8.4.49"
-    postcss-rem-to-responsive-pixel "~6.0.2"
-    postcss-selector-parser "~7.0.0"
     semver "~7.6.3"
     tailwindcss-patch "~5.0.2"
     webpack-sources "3.2.3"

demo/mpx-app/package.json

@@ -56,7 +56,7 @@
     "@mpxjs/webpack-plugin": "^2.9.62",
     "@vue/cli-service": "~5.0.0",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^0.0.1-alpha.0",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
     "autoprefixer": "^10.4.20",
     "babel-jest": "^29.7.0",
     "cross-env": "^7.0.3",
@@ -78,7 +78,7 @@
     "typescript": "^5.5.2",
     "vue-template-compiler": "^2.7.16",
     "weapp-ide-cli": "^2.0.9",
-    "weapp-tailwindcss": "^3.8.0-alpha.1",
+    "weapp-tailwindcss": "^4.0.0-alpha.3",
     "weapp-tailwindcss-children": "^0.1.0",
     "webpack": "^5.95.0"
   },