chore: bump version

.changeset/poor-islands-stick.md

@@ -0,0 +1,5 @@
+---
+"weapp-tailwindcss": patch
+---
+
+fix: 添加 TailwindcssPatcherOptions 给更高程度的自定义策略

.changeset/seven-places-drum.md

@@ -0,0 +1,5 @@
+---
+"@weapp-tailwindcss/merge": patch
+---
+
+chore: 升级相关的依赖

apps/web-postcss7-compat/package.json

@@ -22,7 +22,7 @@
     "postinstall": "weapp-tw patch"
   },
   "dependencies": {
-    "tailwindcss-patch": "^7.0.1"
+    "tailwindcss-patch": "^7.0.2"
   },
   "devDependencies": {
     "autoprefixer": "^9.8.8",

package.json

@@ -209,7 +209,7 @@
     "postcss-loader": "^8.1.1",
     "postcss-preset-env": "^10.1.5",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.5.2",
+    "prettier": "^3.5.3",
     "promisify-loader-runner": "^1.0.1",
     "rimraf": "^6.0.1",
     "rollup": "^4.34.9",

packages/merge/package.json

@@ -62,7 +62,7 @@
   "dependencies": {
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "local-pkg": "^1.1.0",
+    "local-pkg": "^1.1.1",
     "semver": "^7.7.1",
     "tailwind-merge": "^3.0.2",
     "tailwind-merge-v2": "npm:tailwind-merge@^2.6.0"

packages/weapp-tailwindcss/package.json

@@ -174,12 +174,12 @@
     "debug": "~4.4.0",
     "htmlparser2": "10.0.0",
     "loader-utils": "2.0.4",
-    "local-pkg": "^1.1.0",
+    "local-pkg": "^1.1.1",
     "lru-cache": "10.4.3",
     "magic-string": "0.30.17",
     "md5": "2.3.0",
     "semver": "~7.7.1",
-    "tailwindcss-patch": "~7.0.1",
+    "tailwindcss-patch": "~7.0.2",
     "webpack-sources": "3.2.3"
   }
 }

packages/weapp-tailwindcss/src/context/index.ts

@@ -54,7 +54,7 @@ export function getCompilerContext(opts?: UserDefinedOptions): InternalUserDefin
     ignoreTaggedTemplateExpressionIdentifiers,
     cssPresetEnv,
     tailwindcss,
-    patch,
+    tailwindcssPatcherOptions,
   } = ctx
 
   const customAttributesEntities: ICustomAttributesEntities = isMap(customAttributes)
@@ -109,7 +109,7 @@ export function getCompilerContext(opts?: UserDefinedOptions): InternalUserDefin
       cacheDir: appType === 'mpx' ? 'node_modules/tailwindcss-patch/.cache' : undefined,
       supportCustomLengthUnitsPatch: supportCustomLengthUnitsPatch ?? true,
       tailwindcss,
-      patch,
+      tailwindcssPatcherOptions,
     },
   )
   ctx.setMangleRuntimeSet = setMangleRuntimeSet

packages/weapp-tailwindcss/src/defaults.ts

@@ -115,9 +115,11 @@ export function getDefaultOptions(): UserDefinedOptions {
     cssRemoveHoverPseudoClass: true,
     ignoreCallExpressionIdentifiers: isPackageExists('@weapp-tailwindcss/merge') ? ['twMerge', 'twJoin', 'cva'] : [],
     ignoreTaggedTemplateExpressionIdentifiers: ['weappTwIgnore'],
-    patch: {
-      filter(className) {
-        return !isAllowedClassName(className)
+    tailwindcssPatcherOptions: {
+      patch: {
+        filter(className) {
+          return !isAllowedClassName(className)
+        },
       },
     },
   }

packages/weapp-tailwindcss/src/tailwindcss/patcher.ts

@@ -1,4 +1,4 @@
-import type { CacheOptions, ILengthUnitsPatchOptions, PatchOptions, TailwindcssUserConfig } from 'tailwindcss-patch'
+import type { CacheOptions, ILengthUnitsPatchOptions, TailwindcssPatcherOptions, TailwindcssUserConfig } from 'tailwindcss-patch'
 import path from 'node:path'
 import process from 'node:process'
 import { defuOverrideArray } from '@weapp-tailwindcss/shared'
@@ -9,11 +9,11 @@ export interface CreateTailwindcssPatcherOptions {
   cacheDir?: string
   supportCustomLengthUnitsPatch?: boolean | ILengthUnitsPatchOptions
   tailwindcss?: TailwindcssUserConfig
-  patch?: PatchOptions
+  tailwindcssPatcherOptions?: TailwindcssPatcherOptions
 }
 
 export function createTailwindcssPatcher(options?: CreateTailwindcssPatcherOptions) {
-  const { basedir, cacheDir, supportCustomLengthUnitsPatch, tailwindcss, patch } = options || {}
+  const { basedir, cacheDir, supportCustomLengthUnitsPatch, tailwindcss, tailwindcssPatcherOptions } = options || {}
   const cache: CacheOptions = {}
 
   if (cacheDir) {
@@ -28,23 +28,23 @@ export function createTailwindcssPatcher(options?: CreateTailwindcssPatcherOptio
     }
   }
 
-  return new TailwindcssPatcher({
-    cache,
-    patch: defuOverrideArray<PatchOptions, PatchOptions[]>(patch!, {
-      basedir,
-      applyPatches: {
-        exportContext: true,
-        extendLengthUnits: supportCustomLengthUnitsPatch,
+  return new TailwindcssPatcher(defuOverrideArray<TailwindcssPatcherOptions, TailwindcssPatcherOptions[]>(
+    tailwindcssPatcherOptions!,
+    {
+      cache,
+      patch: {
+        basedir,
+        applyPatches: {
+          exportContext: true,
+          extendLengthUnits: supportCustomLengthUnitsPatch,
+        },
+        tailwindcss,
+        resolve: {
+          paths: [
+            import.meta.url,
+          ],
+        },
       },
-      tailwindcss,
-      resolve: {
-        paths: [
-          import.meta.url,
-        ],
-      },
-      // filter: (x) => {
-      //   return !isAllowedClassName(x)
-      // },
-    }),
-  })
+    },
+  ))
 }

packages/weapp-tailwindcss/src/typedoc.export.ts

@@ -2,7 +2,7 @@ import type { ParserOptions } from '@babel/parser'
 import type { IMangleOptions } from '@weapp-tailwindcss/mangle'
 import type { CssPreflightOptions, CustomRuleCallback, LoadedPostcssOptions } from '@weapp-tailwindcss/postcss'
 import type { pluginOptions as PresetEnvOptions } from 'postcss-preset-env'
-import type { ILengthUnitsPatchOptions, PatchOptions } from 'tailwindcss-patch'
+import type { ILengthUnitsPatchOptions, PatchOptions, TailwindcssPatcherOptions } from 'tailwindcss-patch'
 import type { ICreateCacheReturnType } from './cache'
 import type { AppType, IArbitraryValues, ICustomAttributes } from './types'
 
@@ -416,7 +416,7 @@ export interface UserDefinedOptions {
    * @group 3.一般配置
    * @description 自定义 patcher 参数
    */
-  patch?: PatchOptions
+  tailwindcssPatcherOptions?: TailwindcssPatcherOptions
 }
 
 // 4.即将废弃配置

packages/weapp-tailwindcss/test/__snapshots__/options.test.ts.snap

@@ -144,12 +144,14 @@ exports[`get options > default options 1`] = `
   "onLoad": [Function],
   "onStart": [Function],
   "onUpdate": [Function],
-  "patch": {
-    "filter": [Function],
-  },
   "postcssOptions": {},
   "setMangleRuntimeSet": [Function],
   "styleHandler": [Function],
+  "tailwindcssPatcherOptions": {
+    "patch": {
+      "filter": [Function],
+    },
+  },
   "templateHandler": [Function],
   "wxsMatcher": [Function],
 }