feat: refactor code

sonofmagic · sonofmagic · commit 845c89e81fe9 · 2024-07-19T22:52:38.000+08:00
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "tailwindcss2": "npm:@tailwindcss/postcss7-compat@^2.2.17",
     "ts-node": "^10.9.2",
     "tslib": "^2.6.3",
-    "tsup": "^8.1.2",
+    "tsup": "^8.2.0",
     "tsx": "^4.16.2",
     "turbo": "^2.0.7",
     "typescript": "^5.5.3",
diff --git a/packages/tailwindcss-patch/package.json b/packages/tailwindcss-patch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "3.1.0-alpha.1",
+  "version": "4.0.0-alpha.0",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
@@ -62,8 +62,5 @@
     "postcss": "^8.4.39",
     "resolve": "^1.22.8",
     "semver": "^7.6.3"
-  },
-  "directories": {
-    "test": "test"
   }
 }
diff --git a/packages/tailwindcss-patch/src/core/cache.ts b/packages/tailwindcss-patch/src/core/cache.ts
@@ -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 {
diff --git a/packages/tailwindcss-patch/src/core/index.ts b/packages/tailwindcss-patch/src/core/index.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'
diff --git a/packages/tailwindcss-patch/src/core/patcher.ts b/packages/tailwindcss-patch/src/core/patcher.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'
diff --git a/packages/tailwindcss-patch/src/core/patches/exportContext/index.ts b/packages/tailwindcss-patch/src/core/patches/exportContext/index.ts
@@ -1,7 +1,7 @@
 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'
diff --git a/packages/tailwindcss-patch/src/core/patches/exportContext/postcss-v2.ts b/packages/tailwindcss-patch/src/core/patches/exportContext/postcss-v2.ts
diff --git a/packages/tailwindcss-patch/src/core/patches/exportContext/postcss-v3.ts b/packages/tailwindcss-patch/src/core/patches/exportContext/postcss-v3.ts
diff --git a/packages/tailwindcss-patch/src/core/patches/supportCustomUnits/index.ts b/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 'defu'
+import { defu } from '@/utils'
 import type { ILengthUnitsPatchOptions } from '@/types'
 import { generate, parse, traverse } from '@/babel'
 import logger from '@/logger'
diff --git a/packages/tailwindcss-patch/src/core/runtime.ts b/packages/tailwindcss-patch/src/core/runtime.ts
diff --git a/packages/tailwindcss-patch/src/index.ts b/packages/tailwindcss-patch/src/index.ts
@@ -1,5 +1,4 @@
 export * from './core'
-export * from './utils'
 export * from './types'
 export { defineConfig } from './config'
 export { default as logger } from './logger'
diff --git a/packages/tailwindcss-patch/src/utils.ts b/packages/tailwindcss-patch/src/utils.ts
@@ -4,6 +4,7 @@ import type { SyncOpts } from 'resolve'
 import pkg from 'resolve'
 import type { PackageJson } from 'pkg-types'
 
+export { defu } from 'defu'
 const { sync } = pkg
 
 export function ensureFileContent(filepaths: string | string[]) {
diff --git a/packages/tailwindcss-patch/test/cache.test.ts b/packages/tailwindcss-patch/test/cache.test.ts
@@ -23,7 +23,7 @@ describe('cache', () => {
 
   it('mkCacheDirectory', () => {
     const dir = path.resolve(__dirname, './fixtures', pkgName)
-    expect(cm.mkdir(dir)).toBe(dir)
+    fs.ensureDirSync(dir)
     expect(fs.existsSync(dir)).toBe(true)
 
     fs.rmdirSync(dir)
@@ -53,8 +53,8 @@ describe('cache', () => {
 
     const dir = path.resolve(__dirname, './fixtures', `${pkgName}-broken`)
     const filepath = path.resolve(dir, 'index.json')
-    cm.mkdir(dir)
-    fs.writeFileSync(
+
+    fs.outputFileSync(
       filepath,
       `{
       [ '2',"fuck you",{s:'12}
diff --git a/packages/tailwindcss-patch/test/inspector.test.ts b/packages/tailwindcss-patch/test/inspector.test.ts
@@ -1,6 +1,6 @@
 import path from 'node:path'
 import fs from 'fs-extra'
-import { inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext } from '@/core/patches/exportContext/postcss'
+import { inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext } from '@/core/patches/exportContext/postcss-v3'
 
 const tailwindcssCasePath = path.resolve(__dirname, 'fixtures')
 const twltsLibPath = path.resolve(tailwindcssCasePath, 'versions/3.3.1/lib')
diff --git a/packages/tailwindcss-patch/test/postcss.test.ts b/packages/tailwindcss-patch/test/postcss.test.ts
@@ -45,6 +45,7 @@ describe('postcss', () => {
       },
     }
     const { css } = await postcss([
+      // eslint-disable-next-line ts/no-var-requires, ts/no-require-imports
       require('tailwindcss')({
         config,
       }),
diff --git a/packages/tailwindcss-patch/test/postcss7-compat.test.ts b/packages/tailwindcss-patch/test/postcss7-compat.test.ts
@@ -1,5 +1,5 @@
 import { getTestCase } from './utils'
-import { inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext } from '@/core/patches/exportContext/postcss-compat'
+import { inspectPostcssPlugin, inspectProcessTailwindFeaturesReturnContext } from '@/core/patches/exportContext/postcss-v2'
 
 describe('postcss7-compat', () => {
   it('processTailwindFeatures patch', async () => {
diff --git a/packages/unplugin-tailwindcss-mangle/README.md b/packages/unplugin-tailwindcss-mangle/README.md
@@ -25,7 +25,9 @@ It is recommended to read the documentation of [tailwindcss-patch](https://githu
 
 ```html
 <!-- before -->
-<div class="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex"></div>
+<div
+  class="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex"
+></div>
 <!-- after -->
 <div class="tw-g tw-h tw-i tw-d tw-e tw-j tw-k tw-l"></div>
 ```
@@ -62,7 +64,7 @@ npx tw-patch extract
 
 > See more options in [tailwindcss-patch](https://github.com/sonofmagic/tailwindcss-mangle/tree/main/packages/tailwindcss-patch)
 
-Then there will generate a json file:  `.tw-patch/tw-class-list.json`
+Then there will generate a json file: `.tw-patch/tw-class-list.json`
 
 ### 5. Register this plugin
 
@@ -117,7 +119,7 @@ module.exports = defineConfig({
 ```ts
 import nuxtPlugin from 'unplugin-tailwindcss-mangle/nuxt'
 export default defineNuxtConfig({
-  //...
+  // ...
   // https://github.com/nuxt/nuxt/issues/20428
   // you must set this option to false to enable vite extract css
   experimental: {
@@ -132,7 +134,6 @@ export default defineNuxtConfig({
     ]
   ]
 })
-
 ```
 
 ## Options
@@ -150,7 +151,7 @@ because plugin will **traverse** all `html class attr` and `js StringLiteral` to
 it's dangerous to mangle some `js StringLiteral` like:
 
 ```js
-const innerHTML = "i'm flex and relative and grid"
+const innerHTML = 'i\'m flex and relative and grid'
 document.body.innerHTML = innerHTML
 ```
 
diff --git a/packages/unplugin-tailwindcss-mangle/test/__snapshots__/vite.test.ts.snap b/packages/unplugin-tailwindcss-mangle/test/__snapshots__/vite.test.ts.snap
@@ -591,7 +591,6 @@ exports[`vite build > common build  3`] = `
   </head>
   <body>
     <div id="app"></div>
-
   </body>
 </html>
 "
diff --git a/packages/unplugin-tailwindcss-mangle/test/vite.test.ts b/packages/unplugin-tailwindcss-mangle/test/vite.test.ts
@@ -37,7 +37,7 @@ describe('vite build', () => {
     }
     expect(output[2].type).toBe('asset')
     if (output[2].type === 'asset') {
-      expect(output[2].source).toMatchSnapshot()
+      expect(output[2].source.toString().replace(/(\r?\n)+/g, '\n')).toMatchSnapshot()
     }
   })
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tailwindcss-patch",`
`3`		`- "version": "3.1.0-alpha.1",`
	`3`	`+ "version": "4.0.0-alpha.0",`
`4`	`4`	`"description": "patch tailwindcss for exposing context and extract classes",`
`5`	`5`	`"author": "SonOfMagic <[email protected]>",`
`6`	`6`	`"license": "MIT",`
`@@ -62,8 +62,5 @@`
`62`	`62`	`"postcss": "^8.4.39",`
`63`	`63`	`"resolve": "^1.22.8",`
`64`	`64`	`"semver": "^7.6.3"`
`65`		`- },`
`66`		`- "directories": {`
`67`		`- "test": "test"`
`68`	`65`	`}`
`69`	`66`	`}`