Merge pull request #69 from sonofmagic/alpha

Alpha

Author: sonofmagic

.changeset/young-shrimps-boil.md

@@ -32,35 +32,55 @@
     "@tailwindcss-mangle/core": "workspace:*",
     "@tailwindcss-mangle/shared": "workspace:*",
     "@tsconfig/recommended": "^1.0.7",
+    "@types/babel__generator": "^7.6.8",
+    "@types/babel__helper-plugin-utils": "^7.10.3",
+    "@types/babel__traverse": "^7.20.6",
     "@types/fs-extra": "^11.0.4",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.14.11",
+    "@types/resolve": "^1.20.6",
+    "@types/semver": "^7.5.8",
     "@vitest/coverage-v8": "^2.0.3",
+    "astro": "^4.12.2",
     "bumpp": "^9.4.1",
     "cross-env": "^7.0.3",
+    "css-loader": "^7.1.2",
     "dedent": "^1.5.3",
     "defu": "^6.1.4",
     "del": "^7.1.0",
     "eslint": "^9.7.0",
     "fs-extra": "^11.2.0",
     "html-minifier-terser": "^7.2.0",
+    "html-webpack-plugin": "^5.6.0",
     "local-pkg": "^0.5.0",
     "lodash-es": "^4.17.21",
+    "mini-css-extract-plugin": "^2.9.0",
+    "normalize-newline": "^4.1.0",
     "only-allow": "^1.2.1",
     "pathe": "^1.1.2",
+    "pkg-types": "^1.1.3",
+    "postcss": "^8.4.39",
+    "postcss-loader": "^8.1.1",
+    "postcss7": "npm:postcss@7",
     "prettier": "^3.3.3",
     "rollup": "^4.18.1",
+    "tailwindcss": "^3.4.6",
     "tailwindcss-patch": "workspace:*",
+    "tailwindcss2": "npm:@tailwindcss/postcss7-compat@^2.2.17",
     "ts-node": "^10.9.2",
     "tslib": "^2.6.3",
-    "tsup": "^8.1.2",
-    "turbo": "^2.0.7",
+    "tsup": "^8.2.0",
+    "tsx": "^4.16.2",
+    "turbo": "^2.0.8",
     "typescript": "^5.5.3",
     "unbuild": "^2.0.0",
     "unplugin": "^1.11.0",
     "unplugin-tailwindcss-mangle": "workspace:*",
+    "vite": "^5.3.4",
     "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "^2.0.3"
+    "vitest": "^2.0.3",
+    "webpack": "^5.93.0",
+    "webpack-build-utils": "^0.0.7"
   }
 }

package.json

@@ -62,8 +62,5 @@
     "magic-string": "^0.30.10",
     "postcss": "^8.4.39",
     "postcss-selector-parser": "^6.1.1"
-  },
-  "devDependencies": {
-    "@types/babel__traverse": "^7.20.6"
   }
 }

packages/core/package.json

@@ -12,9 +12,6 @@ get tailwindcss context at runtime ! extract all classes into file!
   - [Nodejs API](#nodejs-api)
   - [Config](#config)
     - [Init Config File](#init-config-file)
-  - [Migration form v1 to v2](#migration-form-v1-to-v2)
-    - [0. cli command change](#0-cli-command-change)
-    - [1. default remove `*` in json array result](#1-default-remove--in-json-array-result)
   - [What's next?](#whats-next)
 
 > Nodejs version should >= `16.6.0`
@@ -112,27 +109,6 @@ export default defineConfig({
 })
 ```
 
-## Migration form v1 to v2
-
-### 0. cli command change
-
-```diff
-{
-- "tw-patch"
-+ "tw-patch install"
-}
-```
-
-### 1. default remove `*` in json array result
-
-```diff
-[
-- "*",
-  "text-[99px]",
-  "text-[100px]"
-]
-```
-
 ## What's next?
 
 At the moment I just extracted all the tool classes to actually get the context of `tailwindcss` to analyze. You can add more functionality to this project by giving me `issue` or `pr`.

packages/tailwindcss-patch/README.md

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "3.0.2",
+  "version": "4.0.0",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "SonOfMagic <[email protected]>",
   "license": "MIT",
@@ -62,18 +62,5 @@
     "postcss": "^8.4.39",
     "resolve": "^1.22.8",
     "semver": "^7.6.3"
-  },
-  "devDependencies": {
-    "@types/babel__generator": "^7.6.8",
-    "@types/babel__traverse": "^7.20.6",
-    "@types/resolve": "^1.20.6",
-    "@types/semver": "^7.5.8",
-    "pkg-types": "^1.1.3",
-    "postcss7": "npm:postcss@7",
-    "tailwindcss": "^3.4.6",
-    "tailwindcss2": "npm:@tailwindcss/postcss7-compat@^2.2.17"
-  },
-  "directories": {
-    "test": "test"
   }
 }

packages/tailwindcss-patch/package.json

@@ -35,16 +35,6 @@ export class CacheManager {
     this.options = this.getOptions(options)
   }
 
-  mkdir(cacheDirectory: string) {
-    const exists = fs.existsSync(cacheDirectory)
-    if (!exists) {
-      fs.mkdirSync(cacheDirectory, {
-        recursive: true,
-      })
-    }
-    return cacheDirectory
-  }
-
   getOptions(options: CacheOptions = {}): Required<CacheOptions> & { filename: string } {
     const cwd = options.cwd ?? process.cwd()
     const dir = options.dir ?? path.resolve(cwd, 'node_modules/.cache', pkgName)
@@ -62,8 +52,8 @@ export class CacheManager {
   write(data: Set<string>) {
     try {
       const { dir, filename } = this.options
-      this.mkdir(dir)
-      fs.writeFileSync(filename, JSON.stringify([...data], undefined, 2), 'utf8')
+      fs.ensureDirSync(dir)
+      fs.outputFileSync(filename, JSON.stringify([...data], undefined, 2), 'utf8')
       return filename
     }
     catch {

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

@@ -1,4 +1,4 @@
-export * from './tw-patcher'
+export * from './patcher'
 export * from './patches'
-export * from './runtime-patcher'
+export * from './runtime'
 export * from './cache'

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

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import fs from 'fs-extra'
 import { CacheManager, getCacheOptions } from './cache'
-import { internalPatch } from './runtime-patcher'
+import { internalPatch } from './runtime'
 import { processTailwindcss } from './postcss'
 import type { UserConfig } from '@/config'
 import { getPatchOptions } from '@/defaults'

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

@@ -1,16 +1,17 @@
 import path from 'node:path'
 import fs from 'fs-extra'
-import { inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext } from './postcss'
-import { inspectPostcssPlugin as inspectPostcssPluginCompat, inspectProcessTailwindFeaturesReturnContext as inspectProcessTailwindFeaturesReturnContextCompat } from './postcss-compat'
+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,32 +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
-  }
 
-  opt.custom && typeof opt.custom === 'function' && opt.custom(twDir, result)
-  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) {
@@ -53,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) {
@@ -66,9 +81,8 @@ export function monkeyPatchForExposingContextV2(twDir: string, opt: InternalPatc
       })
       logger.success('patch tailwindcss for expose runtime content successfully!')
     }
-    result.plugin = code
+    result[k1] = code
   }
 
-  opt.custom && typeof opt.custom === 'function' && opt.custom(twDir, result)
   return result
 }