feat: commit codes

Author: sonofmagic

packages/tailwindcss-patch/src/core/patches/supportCustomUnits/index.ts

@@ -2,7 +2,7 @@ import path from 'node:path'
 import fs from 'fs-extra'
 import * as t from '@babel/types'
 import type { ArrayExpression, StringLiteral } from '@babel/types'
-import { defu } from '@/utils'
+import { defuOverrideArray } from '@/utils'
 import type { ILengthUnitsPatchOptions } from '@/types'
 import { generate, parse, traverse } from '@/babel'
 import logger from '@/logger'
@@ -51,7 +51,7 @@ function findAstNode(content: string, options: ILengthUnitsPatchOptions) {
 }
 
 export function monkeyPatchForSupportingCustomUnit(rootDir: string, options?: Partial<ILengthUnitsPatchOptions>) {
-  const opts = defu<Required<ILengthUnitsPatchOptions>, ILengthUnitsPatchOptions[]>(options, {
+  const opts = defuOverrideArray<Required<ILengthUnitsPatchOptions>, ILengthUnitsPatchOptions[]>(options as Required<ILengthUnitsPatchOptions>, {
     units: ['rpx'],
     lengthUnitsFilePath: 'lib/util/dataTypes.js',
     variableName: 'lengthUnits',
@@ -81,6 +81,8 @@ export function monkeyPatchForSupportingCustomUnit(rootDir: string, options?: Pa
         logger.success('patch tailwindcss for custom length unit successfully!')
       }
     }
-    return code
+    return {
+      [opts.lengthUnitsFilePath]: code,
+    }
   }
 }

packages/tailwindcss-patch/src/core/runtime.ts

@@ -2,8 +2,8 @@ import path from 'node:path'
 import { gte } from 'semver'
 import type { PackageJson } from 'pkg-types'
 import { monkeyPatchForExposingContextV2, monkeyPatchForExposingContextV3, monkeyPatchForSupportingCustomUnit } from './patches'
-
-import type { InternalPatchOptions } from '@/types'
+import { defu } from '@/utils'
+import type { ILengthUnitsPatchOptions, InternalPatchOptions } from '@/types'
 
 export function internalPatch(pkgJsonPath: string | undefined, options: InternalPatchOptions) {
   if (pkgJsonPath) {
@@ -12,22 +12,21 @@ export function internalPatch(pkgJsonPath: string | undefined, options: Internal
     const twDir = path.dirname(pkgJsonPath)
     options.version = pkgJson.version
     if (gte(pkgJson.version!, '3.0.0')) {
-      options.version = pkgJson.version
-
+      let result: Record<string, any> | undefined = {}
+      if (options.applyPatches?.exportContext) {
+        result = monkeyPatchForExposingContextV3(twDir, options)
+      }
       if (options.applyPatches?.extendLengthUnits) {
         try {
-          monkeyPatchForSupportingCustomUnit(twDir, {
+          Object.assign(result ?? {}, monkeyPatchForSupportingCustomUnit(twDir, defu<Partial<ILengthUnitsPatchOptions>, Partial<ILengthUnitsPatchOptions>[]>(options.applyPatches.extendLengthUnits === true ? undefined : options.applyPatches.extendLengthUnits, {
             overwrite: options.overwrite,
-          })
+          })))
         }
         catch {
 
         }
       }
-
-      if (options.applyPatches?.exportContext) {
-        return monkeyPatchForExposingContextV3(twDir, options)
-      }
+      return result
     }
     else if (gte(pkgJson.version!, '2.0.0')) {
       if (options.applyPatches?.exportContext) {

packages/tailwindcss-patch/src/utils.ts

@@ -3,10 +3,18 @@ import fs from 'fs-extra'
 import type { SyncOpts } from 'resolve'
 import pkg from 'resolve'
 import type { PackageJson } from 'pkg-types'
+import { createDefu } from 'defu'
 
 export { defu } from 'defu'
 const { sync } = pkg
 
+export const defuOverrideArray = createDefu((obj, key, value) => {
+  if (Array.isArray(obj[key]) && Array.isArray(value)) {
+    obj[key] = value
+    return true
+  }
+})
+
 export function requireResolve(id: string, opts?: SyncOpts) {
   return sync(id, opts)
 }