chore: add /img/framer.png

sonofmagic · sonofmagic · commit cd73a8bcef37 · 2025-01-15T17:53:05.000+08:00
diff --git a/demo/gulp-app/package.json b/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": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.20",
     "cross-env": "^7.0.3",
     "del": "^6.1.1",
diff --git a/demo/gulp-app/yarn.lock b/demo/gulp-app/yarn.lock
@@ -851,10 +851,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/mpx-app/package.json b/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": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.20",
     "babel-jest": "^29.7.0",
     "cross-env": "^7.0.3",
diff --git a/demo/mpx-app/yarn.lock b/demo/mpx-app/yarn.lock
@@ -2815,10 +2815,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/native-mina/package.json b/demo/native-mina/package.json
@@ -35,7 +35,7 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@types/lodash": "^4.17.14",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.2.1",
     "babel-plugin-lodash": "^3.3.4",
diff --git a/demo/native-mina/yarn.lock b/demo/native-mina/yarn.lock
@@ -1147,10 +1147,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/native-ts/package.json b/demo/native-ts/package.json
@@ -17,7 +17,7 @@
   "dependencies": {},
   "devDependencies": {
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.20",
     "miniprogram-api-typings": "^4.0.1",
     "postcss": "^8.4.49",
diff --git a/demo/native-ts/yarn.lock b/demo/native-ts/yarn.lock
@@ -1510,10 +1510,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/native/package.json b/demo/native/package.json
@@ -12,7 +12,7 @@
   "license": "ISC",
   "devDependencies": {
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "postcss-rem-to-responsive-pixel": "^6.0.2",
     "postcss-rpx-transform": "^1.0.1",
     "tailwind-css-variables-theme-generator": "^0.4.0",
diff --git a/demo/native/yarn.lock b/demo/native/yarn.lock
@@ -378,10 +378,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/package.json b/demo/package.json
@@ -61,7 +61,7 @@
   "author": "ice breaker <1324318532@qq.com>",
   "devDependencies": {
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "postcss-rem-to-responsive-pixel": "^6.0.2",
     "postcss-rpx-transform": "^1.0.1",
     "tailwind-css-variables-theme-generator": "^0.4.0",
diff --git a/demo/rax-app/package.json b/demo/rax-app/package.json
@@ -39,7 +39,7 @@
     "@iceworks/spec": "^1.6.0",
     "@types/rax": "^1.0.18",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.20",
     "cross-env": "^7.0.3",
     "eslint": "^9.18.0",
diff --git a/demo/rax-app/yarn.lock b/demo/rax-app/yarn.lock
@@ -2230,10 +2230,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/taro-app-vite/package.json b/demo/taro-app-vite/package.json
@@ -76,7 +76,7 @@
     "@types/react": "^18.3.11",
     "@vitejs/plugin-react": "^4.3.2",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.20",
     "babel-preset-taro": "4.0.6",
     "eslint": "^8.57.0",
diff --git a/demo/taro-app-vite/yarn.lock b/demo/taro-app-vite/yarn.lock
@@ -3040,10 +3040,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/taro-app/package.json b/demo/taro-app/package.json
@@ -65,7 +65,7 @@
     "@typescript-eslint/eslint-plugin": "^8.19.1",
     "@typescript-eslint/parser": "^8.19.1",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.20",
     "babel-plugin-import": "^1.13.8",
     "babel-preset-taro": "4.0.8",
diff --git a/demo/taro-app/yarn.lock b/demo/taro-app/yarn.lock
@@ -4665,10 +4665,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/taro-vue2-app/package.json b/demo/taro-vue2-app/package.json
@@ -81,7 +81,7 @@
     "@typescript-eslint/parser": "^7.13.0",
     "@vue/babel-preset-jsx": "^1.2.4",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.19",
     "babel-preset-taro": "3.6.35",
     "cross-env": "^7.0.3",
diff --git a/demo/taro-vue2-app/yarn.lock b/demo/taro-vue2-app/yarn.lock
@@ -3360,10 +3360,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/taro-vue3-app/package.json b/demo/taro-vue3-app/package.json
@@ -76,7 +76,7 @@
     "@vue/babel-plugin-jsx": "^1.1.5",
     "@vue/compiler-sfc": "^3.5.13",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "^10.4.19",
     "babel-preset-taro": "3.6.35",
     "cross-env": "^7.0.3",
diff --git a/demo/taro-vue3-app/yarn.lock b/demo/taro-vue3-app/yarn.lock
@@ -3036,10 +3036,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/uni-app-vue3-vite/package.json b/demo/uni-app-vue3-vite/package.json
@@ -84,7 +84,7 @@
     "@tailwindcss/typography": "^0.5.10",
     "@vue/runtime-core": "^3.4.21",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "@weapp-tailwindcss/typography": "^0.2.4",
     "autoprefixer": "^10.4.18",
     "miniprogram-api-typings": "^3.12.2",
diff --git a/demo/uni-app-vue3-vite/yarn.lock b/demo/uni-app-vue3-vite/yarn.lock
@@ -3042,10 +3042,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/uni-app-webpack5/package.json b/demo/uni-app-webpack5/package.json
@@ -101,7 +101,7 @@
     "@vue/cli-plugin-typescript": "~5.0.8",
     "@vue/cli-service": "~5.0.0",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "babel-plugin-import": "^1.11.0",
     "cross-env": "^7.0.2",
     "jest": "^25.4.0",
diff --git a/demo/uni-app-webpack5/yarn.lock b/demo/uni-app-webpack5/yarn.lock
@@ -3135,10 +3135,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/uni-app/package.json b/demo/uni-app/package.json
@@ -101,7 +101,7 @@
     "@vue/cli-plugin-typescript": "~5.0.8",
     "@vue/cli-service": "~5.0.8",
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "autoprefixer": "10.4.18",
     "babel-plugin-import": "^1.11.0",
     "cross-env": "^7.0.2",
diff --git a/demo/uni-app/yarn.lock b/demo/uni-app/yarn.lock
@@ -3464,10 +3464,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/web/package.json b/demo/web/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@weapp-tailwindcss/cli": "^3.0.0",
-    "@weapp-tailwindcss/merge": "^1.0.0-alpha.1",
+    "@weapp-tailwindcss/merge": "^1.0.0-alpha.2",
     "postcss-rem-to-responsive-pixel": "^6.0.2",
     "postcss-rpx-transform": "^1.0.1",
     "tailwind-css-variables-theme-generator": "^0.4.0",
diff --git a/demo/web/yarn.lock b/demo/web/yarn.lock
@@ -400,10 +400,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/demo/yarn.lock b/demo/yarn.lock
@@ -370,10 +370,10 @@
     "@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==
+"@weapp-tailwindcss/merge@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.npmmirror.com/@weapp-tailwindcss/merge/-/merge-1.0.0-alpha.2.tgz#45b6a12f125713facf8f2bcb1827d96d9bde3a30"
+  integrity sha512-p94vDcEqcpPxtxp5KJi2GmovxeBMF5tNLTUjIO+By/kt7PUOsoE1wojXO+TVkRmbhPXDkungX9SU7b8dqdQONw==
   dependencies:
     class-variance-authority "^0.7.1"
     clsx "^2.1.1"
diff --git a/package.json b/package.json
@@ -109,7 +109,7 @@
     "@commitlint/config-conventional": "^19.6.0",
     "@commitlint/prompt-cli": "^19.7.0",
     "@commitlint/types": "^19.5.0",
-    "@eslint/config-inspector": "^0.7.1",
+    "@eslint/config-inspector": "^1.0.0",
     "@icebreakers/eslint-config": "^0.7.12",
     "@icebreakers/monorepo": "^0.6.22",
     "@icebreakers/readme": "0.1.0",
@@ -203,7 +203,7 @@
     "npm-registry-fetch": "^18.0.2",
     "only-allow": "^1.2.1",
     "pathe": "^2.0.1",
-    "pkg-types": "^1.3.0",
+    "pkg-types": "^1.3.1",
     "postcss": "^8.5.1",
     "postcss-js": "^4.0.1",
     "postcss-load-config": "^6.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx
diff --git a/website/src/theme/Layout.tsx b/website/src/theme/Layout.tsx
diff --git a/website/static/img/framer.png b/website/static/img/framer.png
