refactor: use TailwindcssPatcher

Author: sonofmagic

package.json

@@ -27,7 +27,7 @@
     "@tailwindcss-mangle/shared": "workspace:*",
     "@tsconfig/recommended": "^1.0.6",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.14.1",
+    "@types/node": "^20.14.2",
     "@vitest/coverage-v8": "^1.6.0",
     "bumpp": "^9.4.1",
     "cross-env": "^7.0.3",
@@ -38,14 +38,15 @@
     "eslint-config-icebreaker": "^1.2.3",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
+    "local-pkg": "^0.5.0",
     "lodash-es": "^4.17.21",
     "only-allow": "^1.2.1",
     "pathe": "^1.1.2",
     "prettier": "^3.3.0",
     "rollup": "^4.18.0",
     "tailwindcss-patch": "workspace:*",
     "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
+    "tslib": "^2.6.3",
     "tsup": "^8.1.0",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
@@ -56,4 +57,4 @@
     "node": ">=18.0.0"
   },
   "packageManager": "[email protected]"
-}
+}

packages/tailwindcss-patch/package.json

@@ -54,9 +54,8 @@
     "@babel/types": "^7.24.6",
     "@tailwindcss-mangle/config": "workspace:^",
     "cac": "^6.7.14",
-    "jiti": "^1.21.0",
+    "jiti": "^1.21.1",
     "lilconfig": "^3.1.1",
-    "local-pkg": "^0.5.0",
     "postcss": "^8.4.38",
     "resolve": "^1.22.8",
     "semver": "^7.6.2"

packages/tailwindcss-patch/src/cli.ts

@@ -1,7 +1,8 @@
 import process from 'node:process'
 import cac from 'cac'
 import { configName, getConfig, initConfig } from './config'
-import { TailwindcssPatcher, createPatch, getPatchOptions } from './core'
+import { TailwindcssPatcher } from './core'
+import { getPatchOptions } from '@/defaults'
 
 function init() {
   const cwd = process.cwd()
@@ -11,9 +12,10 @@ function init() {
 const cli = cac()
 
 cli.command('install', 'patch install').action(() => {
-  const opt = getPatchOptions()
-  const patch = createPatch(opt)
-  patch()
+  const twPatcher = new TailwindcssPatcher({
+    patch: getPatchOptions(),
+  })
+  twPatcher.patch()
 })
 
 cli.command('init').action(async () => {

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

@@ -3,11 +3,7 @@ import process from 'node:process'
 import postcss from 'postcss'
 import { lilconfig } from 'lilconfig'
 import createJiti from 'jiti'
-// const jiti = require('jiti')(__filename)
-// const importDefault = async (filepath: string) => {
-//   const module = await import(url.pathToFileURL(filepath).href)
-//   return module.default
-// }
+
 const jiti = createJiti(__filename)
 
 export async function processTailwindcss(options: { cwd?: string, config?: string }) {

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

@@ -1,55 +1,11 @@
 import path from 'node:path'
 import fs from 'node:fs'
-import process from 'node:process'
 import { gte } from 'semver'
 import type { PackageJson } from 'pkg-types'
-import { defu } from 'defu'
 import { inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext } from './inspector'
 import { inspectPostcssPlugin as inspectPostcssPluginCompat, inspectProcessTailwindFeaturesReturnContext as inspectProcessTailwindFeaturesReturnContextCompat } from './inspector-postcss7-compat'
-import type { InternalPatchOptions, PatchOptions } from '@/types'
-import { getDefaultPatchOptions } from '@/defaults'
-import { ensureFileContent, requireResolve } from '@/utils'
-
-export function getInstalledPkgJsonPath(options: PatchOptions = {}) {
-  try {
-    // const cwd = process.cwd()
-    const tmpJsonPath = requireResolve(`tailwindcss/package.json`, {
-      paths: options.paths,
-      basedir: options.basedir,
-    })
-
-    return tmpJsonPath
-    // https://github.com/sonofmagic/weapp-tailwindcss-webpack-plugin
-    // only tailwindcss version > 3.0.0
-  }
-  catch (error) {
-    if ((<Error & { code: string }>error).code === 'MODULE_NOT_FOUND') {
-      console.warn('Can\'t find npm pkg: `tailwindcss`, Please ensure it has been installed!')
-    }
-  }
-}
-
-export function getPatchOptions(options: PatchOptions = {}) {
-  return defu(
-    options,
-    {
-      basedir: process.cwd(),
-    },
-    getDefaultPatchOptions(),
-  ) as InternalPatchOptions
-}
-
-export function createPatch(opt: InternalPatchOptions) {
-  return () => {
-    try {
-      const pkgJsonPath = getInstalledPkgJsonPath(opt)
-      return internalPatch(pkgJsonPath, opt)
-    }
-    catch (error) {
-      console.warn(`patch tailwindcss failed:${(<Error>error).message}`)
-    }
-  }
-}
+import type { InternalPatchOptions } from '@/types'
+import { ensureFileContent } from '@/utils'
 
 export function monkeyPatchForExposingContextV3(twDir: string, opt: InternalPatchOptions) {
   const processTailwindFeaturesFilePath = path.resolve(twDir, 'lib/processTailwindFeatures.js')

packages/tailwindcss-patch/src/core/tw-patcher.ts

@@ -1,9 +1,10 @@
 import path from 'node:path'
 import fs from 'node:fs'
 import { CacheManager, getCacheOptions } from './cache'
-import { createPatch, getPatchOptions } from './runtime-patcher'
+import { internalPatch } from './runtime-patcher'
 import { processTailwindcss } from './postcss'
 import type { UserConfig } from '@/config'
+import { getPatchOptions } from '@/defaults'
 import { ensureDir, getPackageInfoSync, isObject } from '@/utils'
 import type { CacheStrategy, InternalCacheOptions, InternalPatchOptions, PackageInfo, TailwindcssClassCache, TailwindcssPatcherOptions, TailwindcssRuntimeContext } from '@/types'
 
@@ -20,12 +21,20 @@ export class TailwindcssPatcher {
     this.rawOptions = options
     this.cacheOptions = getCacheOptions(options.cache)
     this.patchOptions = getPatchOptions(options.patch)
-    this.patch = createPatch(this.patchOptions)
+
     this.cacheManager = new CacheManager(this.cacheOptions)
     this.packageInfo = getPackageInfoSync('tailwindcss', { basedir: this.patchOptions.basedir })
     if (this.packageInfo && this.packageInfo.version) {
       this.majorVersion = Number.parseInt(this.packageInfo.version[0])
     }
+    this.patch = () => {
+      try {
+        return internalPatch(this.packageInfo?.packageJsonPath, this.patchOptions)
+      }
+      catch (error) {
+        console.warn(`patch tailwindcss failed: ${(<Error>error).message}`)
+      }
+    }
   }
 
   setCache(set: Set<string>) {

packages/tailwindcss-patch/src/defaults.ts

@@ -1,7 +1,19 @@
-import type { DeepRequired, PatchOptions } from './types'
+import process from 'node:process'
+import { defu } from 'defu'
+import type { DeepRequired, InternalPatchOptions, PatchOptions } from './types'
 
 export function getDefaultPatchOptions(): DeepRequired<PatchOptions> {
   return {
     overwrite: true,
   }
 }
+
+export function getPatchOptions(options: PatchOptions = {}) {
+  return defu(
+    options,
+    {
+      basedir: process.cwd(),
+    },
+    getDefaultPatchOptions(),
+  ) as InternalPatchOptions
+}

packages/tailwindcss-patch/test/runtime-patcher.test.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
-import { getInstalledPkgJsonPath } from '@/core'
+// import { getInstalledPkgJsonPath } from '@/core'
 
-describe('patcher', () => {
+describe.skip('patcher', () => {
   it('getInstalledPkgJsonPath common options', () => {
     const pkgJsonPath = getInstalledPkgJsonPath()
     expect(pkgJsonPath).toBeTruthy()