feat: change patch return

Author: sonofmagic

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

@@ -3,14 +3,15 @@ import fs from 'fs-extra'
 import { inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext } from './postcss-v3'
 import { inspectPostcssPlugin as inspectPostcssPluginCompat, inspectProcessTailwindFeaturesReturnContext as inspectProcessTailwindFeaturesReturnContextCompat } from './postcss-v2'
 import type { InternalPatchOptions } from '@/types'
-import { ensureFileContent } from '@/utils'
 import logger from '@/logger'
 
 export function monkeyPatchForExposingContextV3(twDir: string, opt: InternalPatchOptions) {
-  const processTailwindFeaturesFilePath = path.resolve(twDir, 'lib/processTailwindFeatures.js')
+  const k0 = 'lib/processTailwindFeatures.js'
+  const processTailwindFeaturesFilePath = path.resolve(twDir, k0)
+
+  const processTailwindFeaturesContent = fs.readFileSync(processTailwindFeaturesFilePath, 'utf8')
+  const result: Record<string, any> = {}
 
-  const processTailwindFeaturesContent = ensureFileContent(processTailwindFeaturesFilePath)
-  const result: { processTailwindFeatures?: string, plugin?: string } & Record<string, any> = {}
   if (processTailwindFeaturesContent) {
     const { code, hasPatched } = inspectProcessTailwindFeaturesReturnContext(processTailwindFeaturesContent)
     if (!hasPatched && opt.overwrite) {
@@ -19,31 +20,46 @@ export function monkeyPatchForExposingContextV3(twDir: string, opt: InternalPatc
       })
       logger.success('patch tailwindcss processTailwindFeatures for return content successfully!')
     }
-    result.processTailwindFeatures = code
+    result[k0] = code
+  }
+  let injectFilepath
+  let k1
+  const try0 = 'lib/plugin.js'
+  const try1 = 'lib/index.js'
+  const pluginFilePath = path.resolve(twDir, try0)
+  const indexFilePath = path.resolve(twDir, try1)
+  if (fs.existsSync(pluginFilePath)) {
+    k1 = try0
+    injectFilepath = pluginFilePath
+  }
+  else if (fs.existsSync(indexFilePath)) {
+    k1 = try1
+    injectFilepath = indexFilePath
   }
 
-  const pluginFilePath = path.resolve(twDir, 'lib/plugin.js')
-  const indexFilePath = path.resolve(twDir, 'lib/index.js')
-  const pluginContent = ensureFileContent([pluginFilePath, indexFilePath])
-  if (pluginContent) {
-    const { code, hasPatched } = inspectPostcssPlugin(pluginContent)
-    if (!hasPatched && opt.overwrite) {
-      fs.writeFileSync(pluginFilePath, code, {
-        encoding: 'utf8',
-      })
-      logger.success('patch tailwindcss for expose runtime context successfully!')
+  if (injectFilepath && k1) {
+    const pluginContent = fs.readFileSync(injectFilepath, 'utf8')
+    if (pluginContent) {
+      const { code, hasPatched } = inspectPostcssPlugin(pluginContent)
+      if (!hasPatched && opt.overwrite) {
+        fs.writeFileSync(injectFilepath, code, {
+          encoding: 'utf8',
+        })
+        logger.success('patch tailwindcss for expose runtime context successfully!')
+      }
+      result[k1] = code
     }
-    result.plugin = code
-  }
 
-  return result
+    return result
+  }
 }
 
 export function monkeyPatchForExposingContextV2(twDir: string, opt: InternalPatchOptions) {
-  const processTailwindFeaturesFilePath = path.resolve(twDir, 'lib/jit/processTailwindFeatures.js')
+  const k0 = 'lib/jit/processTailwindFeatures.js'
+  const processTailwindFeaturesFilePath = path.resolve(twDir, k0)
 
-  const processTailwindFeaturesContent = ensureFileContent(processTailwindFeaturesFilePath)
-  const result: { processTailwindFeatures?: string, plugin?: string } & Record<string, any> = {}
+  const processTailwindFeaturesContent = fs.readFileSync(processTailwindFeaturesFilePath, 'utf8')
+  const result: Record<string, any> = {}
   if (processTailwindFeaturesContent) {
     const { code, hasPatched } = inspectProcessTailwindFeaturesReturnContextCompat(processTailwindFeaturesContent)
     if (!hasPatched && opt.overwrite) {
@@ -52,11 +68,11 @@ export function monkeyPatchForExposingContextV2(twDir: string, opt: InternalPatc
       })
       logger.success('patch tailwindcss processTailwindFeatures for return content successfully!')
     }
-    result.processTailwindFeatures = code
+    result[k0] = code
   }
-
-  const indexFilePath = path.resolve(twDir, 'lib/jit/index.js')
-  const pluginContent = ensureFileContent([indexFilePath])
+  const k1 = 'lib/jit/index.js'
+  const indexFilePath = path.resolve(twDir, k1)
+  const pluginContent = fs.readFileSync(indexFilePath, 'utf8')
   if (pluginContent) {
     const { code, hasPatched } = inspectPostcssPluginCompat(pluginContent)
     if (!hasPatched && opt.overwrite) {
@@ -65,7 +81,7 @@ export function monkeyPatchForExposingContextV2(twDir: string, opt: InternalPatc
       })
       logger.success('patch tailwindcss for expose runtime content successfully!')
     }
-    result.plugin = code
+    result[k1] = code
   }
 
   return result

packages/tailwindcss-patch/src/utils.ts

@@ -7,22 +7,6 @@ import type { PackageJson } from 'pkg-types'
 export { defu } from 'defu'
 const { sync } = pkg
 
-export function ensureFileContent(filepaths: string | string[]) {
-  if (typeof filepaths === 'string') {
-    filepaths = [filepaths]
-  }
-  let content
-  for (const filepath of filepaths) {
-    if (fs.existsSync(filepath)) {
-      content = fs.readFileSync(filepath, {
-        encoding: 'utf8',
-      })
-      break
-    }
-  }
-  return content
-}
-
 export function requireResolve(id: string, opts?: SyncOpts) {
   return sync(id, opts)
 }