chore(deps): upgrade

Author: sonofmagic

package.json

@@ -94,7 +94,7 @@
     "postcss7": "npm:postcss@7",
     "prettier": "^3.5.1",
     "rimraf": "^6.0.1",
-    "rollup": "^4.34.7",
+    "rollup": "^4.34.8",
     "set-value": "^4.1.0",
     "tailwindcss": "^3.4.17",
     "tailwindcss-patch": "workspace:*",

packages/config/src/config.ts

@@ -2,12 +2,12 @@ import type { UserConfig } from './types'
 import { createDefineConfig, loadConfig } from 'c12'
 import fs from 'fs-extra'
 import path from 'pathe'
-import { configName } from './constants'
+import { CONFIG_NAME } from './constants'
 import { getDefaultUserConfig } from './defaults'
 
 export function getConfig(cwd?: string) {
   return loadConfig<UserConfig>({
-    name: configName,
+    name: CONFIG_NAME,
     defaults: {
       ...getDefaultUserConfig(),
     },
@@ -19,7 +19,7 @@ export const defineConfig = createDefineConfig<UserConfig>()
 
 export function initConfig(cwd: string) {
   return fs.outputFile(
-    path.resolve(cwd, `${configName}.config.ts`),
+    path.resolve(cwd, `${CONFIG_NAME}.config.ts`),
     `import { defineConfig } from 'tailwindcss-patch'
 
 export default defineConfig({})

packages/config/src/constants.ts

@@ -1 +1 @@
-export const configName = 'tailwindcss-mangle'
+export const CONFIG_NAME = 'tailwindcss-mangle'

packages/config/src/types.ts

@@ -24,6 +24,28 @@ export interface MangleUserConfig {
   preserveFunction?: string[]
 }
 
+export interface TailwindcssV2PatchConfig {
+  cwd?: string
+  config?: string
+}
+export interface TailwindcssV3PatchConfig {
+  cwd?: string
+  config?: string
+}
+
+export interface GlobEntry {
+  /** Base path of the glob */
+  base?: string
+  /** Glob pattern */
+  pattern: string
+}
+export interface TailwindcssV4PatchConfig {
+  sources?: GlobEntry[]
+  base?: string
+  css?: string
+  cssEntries?: string[]
+}
+
 export interface PatchUserConfig {
   output?: {
     filename?: string
@@ -35,8 +57,10 @@ export interface PatchUserConfig {
     removeUniversalSelector?: boolean
   }
   tailwindcss?: {
-    cwd?: string
-    config?: string
+    // only support jit mode
+    v2?: TailwindcssV2PatchConfig
+    v3?: TailwindcssV3PatchConfig
+    v4?: TailwindcssV4PatchConfig
   }
 }
 

packages/config/test/index.test.ts

@@ -1,15 +1,15 @@
-import { resolve } from 'pathe'
-import { configName } from '@/constants'
+import { CONFIG_NAME } from '@/constants'
 import { getDefaultMangleUserConfig, getDefaultUserConfig } from '@/defaults'
 import { getConfig, initConfig } from '@/index'
 import { deleteAsync } from 'del'
 import { existsSync } from 'fs-extra'
+import { resolve } from 'pathe'
 import { fixturesRoot } from './utils'
 
 describe('config', () => {
   it('0.default', async () => {
     const cwd = resolve(fixturesRoot, './config/0.default')
-    const configPath = resolve(cwd, `${configName}.config.ts`)
+    const configPath = resolve(cwd, `${CONFIG_NAME}.config.ts`)
     if (existsSync(configPath)) {
       await deleteAsync(configPath)
     }

packages/tailwindcss-patch/package.json

@@ -79,6 +79,7 @@
     "cac": "^6.7.14",
     "consola": "^3.4.0",
     "fs-extra": "^11.3.0",
+    "local-pkg": "^1.0.0",
     "pathe": "^2.0.3",
     "postcss": "^8.5.2",
     "semver": "^7.7.1",

packages/tailwindcss-patch/src/cli.ts

@@ -1,6 +1,6 @@
 import process from 'node:process'
+import { CONFIG_NAME, getConfig, initConfig } from '@tailwindcss-mangle/config'
 import cac from 'cac'
-import { configName, getConfig, initConfig } from './config'
 import { TailwindcssPatcher } from './core'
 import { getPatchOptions } from './defaults'
 import logger from './logger'
@@ -21,7 +21,7 @@ cli.command('install', 'patch install').action(() => {
 
 cli.command('init').action(async () => {
   await init()
-  logger.success(`✨ ${configName}.config.ts initialized!`)
+  logger.success(`✨ ${CONFIG_NAME}.config.ts initialized!`)
 })
 
 cli.command('extract').action(async () => {

packages/tailwindcss-patch/src/config.ts

@@ -1,7 +1,8 @@
-import type { UserConfig } from '../config'
+import type { UserConfig } from '@tailwindcss-mangle/config'
 import type { CacheStrategy, InternalCacheOptions, InternalPatchOptions, PackageInfo, TailwindcssClassCache, TailwindcssPatcherOptions, TailwindcssRuntimeContext } from '../types'
 import type { ExtractValidCandidatesOption } from './candidates'
 import { createRequire } from 'node:module'
+import process from 'node:process'
 import fs from 'fs-extra'
 import { getPackageInfoSync } from 'local-pkg'
 import path from 'pathe'
@@ -89,16 +90,55 @@ export class TailwindcssPatcher {
     return contexts.filter(x => isObject(x)).map(x => x.classCache)
   }
 
-  async getClassCacheSet(options?: { removeUniversalSelector?: boolean } & Partial<ExtractValidCandidatesOption>): Promise<Set<string>> {
+  async getClassCacheSet(options?: UserConfig['patch']): Promise<Set<string>> {
     const classSet = new Set<string>()
+    const { output, tailwindcss } = options ?? {}
     if (this.majorVersion === 4) {
-      const candidates = await extractValidCandidates({
-        base: options?.base,
-        css: options?.css,
-        sources: options?.sources,
-      })
-      for (const candidate of candidates) {
-        classSet.add(candidate)
+      const { v4 } = tailwindcss ?? {}
+      if (Array.isArray(v4?.cssEntries)) {
+        const results = (
+          await Promise.all(
+            v4
+              .cssEntries
+              .map(async (x) => {
+                if (await fs.exists(x)) {
+                  const css = await fs.readFile(x, 'utf8')
+                  return css
+                }
+                return false
+              }),
+          )
+        ).filter(x => x) as string[]
+        for (const css of results) {
+          const candidates = await extractValidCandidates({
+            base: v4?.base,
+            css,
+            sources: v4?.sources?.map((x) => {
+              return {
+                base: x.base ?? v4?.base ?? process.cwd(),
+                pattern: x.pattern,
+              }
+            }),
+          })
+          for (const candidate of candidates) {
+            classSet.add(candidate)
+          }
+        }
+      }
+      else {
+        const candidates = await extractValidCandidates({
+          base: v4?.base,
+          css: v4?.css,
+          sources: v4?.sources?.map((x) => {
+            return {
+              base: x.base ?? v4?.base ?? process.cwd(),
+              pattern: x.pattern,
+            }
+          }),
+        })
+        for (const candidate of candidates) {
+          classSet.add(candidate)
+        }
       }
     }
     else {
@@ -108,7 +148,7 @@ export class TailwindcssPatcher {
         const keys = classCacheMap.keys()
         for (const key of keys) {
           const v = key.toString()
-          if (options?.removeUniversalSelector && v === '*') {
+          if (output?.removeUniversalSelector && v === '*') {
             continue
           }
           classSet.add(v)
@@ -122,10 +162,12 @@ export class TailwindcssPatcher {
   /**
    * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
    */
-  async getClassSet(options?: { cacheStrategy?: CacheStrategy, removeUniversalSelector?: boolean }) {
-    const { cacheStrategy = this.cacheOptions.strategy ?? 'merge', removeUniversalSelector = true } = options ?? {}
+  async getClassSet(options?: UserConfig['patch']) {
+    const { output, tailwindcss } = options ?? {}
+    const cacheStrategy = this.cacheOptions.strategy ?? 'merge'
     const set = await this.getClassCacheSet({
-      removeUniversalSelector,
+      output,
+      tailwindcss,
     })
     if (cacheStrategy === 'overwrite') {
       set.size > 0 && this.setCache(set)
@@ -146,7 +188,7 @@ export class TailwindcssPatcher {
   async extract(options?: UserConfig['patch']) {
     const { output, tailwindcss } = options ?? {}
     if (output && tailwindcss) {
-      const { removeUniversalSelector, filename, loose } = output
+      const { filename, loose } = output
 
       if (this.majorVersion === 3) {
         await processTailwindcss({
@@ -156,7 +198,8 @@ export class TailwindcssPatcher {
       }
 
       const set = await this.getClassSet({
-        removeUniversalSelector,
+        output,
+        tailwindcss,
       })
       if (filename) {
         const classList = [...set]

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

@@ -1,4 +1,4 @@
-export { defineConfig } from './config'
 export * from './core'
 export { default as logger } from './logger'
 export * from './types'
+export { defineConfig } from '@tailwindcss-mangle/config'