chore: bump version

Author: sonofmagic

.changeset/legal-crabs-pick.md

@@ -0,0 +1,10 @@
+---
+"tailwindcss-patch": major
+"@tailwindcss-mangle/config": major
+---
+
+feat!: add tailwindcss v4 support and change getClassSet return type
+
+need to install `@tailwindcss/node` and `@tailwindcss/oxide`
+
+This is a breaking change because it changes the return type of `getClassSet`.

package.json

@@ -32,8 +32,8 @@
     "script:mirror": "monorepo mirror"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.12",
+    "@changesets/changelog-github": "^0.5.1",
+    "@changesets/cli": "^2.28.0",
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-conventional": "^19.7.1",
     "@commitlint/prompt-cli": "^19.7.1",

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

@@ -1,6 +1,5 @@
-import type { UserConfig } from '@tailwindcss-mangle/config'
-import type { CacheStrategy, InternalCacheOptions, InternalPatchOptions, PackageInfo, TailwindcssClassCache, TailwindcssPatcherOptions, TailwindcssRuntimeContext } from '../types'
-import type { ExtractValidCandidatesOption } from './candidates'
+import type { PatchUserConfig } from '@tailwindcss-mangle/config'
+import type { InternalCacheOptions, InternalPatchOptions, PackageInfo, TailwindcssClassCache, TailwindcssPatcherOptions, TailwindcssRuntimeContext } from '../types'
 import { createRequire } from 'node:module'
 import process from 'node:process'
 import fs from 'fs-extra'
@@ -90,7 +89,7 @@ export class TailwindcssPatcher {
     return contexts.filter(x => isObject(x)).map(x => x.classCache)
   }
 
-  async getClassCacheSet(options?: UserConfig['patch']): Promise<Set<string>> {
+  async getClassCacheSet(options?: PatchUserConfig): Promise<Set<string>> {
     const classSet = new Set<string>()
     const { output, tailwindcss } = options ?? {}
     if (this.majorVersion === 4) {
@@ -162,7 +161,7 @@ export class TailwindcssPatcher {
   /**
    * @description 在多个 tailwindcss 上下文时，这个方法将被执行多次，所以策略上应该使用 append
    */
-  async getClassSet(options?: UserConfig['patch']) {
+  async getClassSet(options?: PatchUserConfig) {
     const { output, tailwindcss } = options ?? {}
     const cacheStrategy = this.cacheOptions.strategy ?? 'merge'
     const set = await this.getClassCacheSet({
@@ -185,7 +184,7 @@ export class TailwindcssPatcher {
     return set
   }
 
-  async extract(options?: UserConfig['patch']) {
+  async extract(options?: PatchUserConfig) {
     const { output, tailwindcss } = options ?? {}
     if (output && tailwindcss) {
       const { filename, loose } = output

packages/tailwindcss-patch/test/__snapshots__/v4.test.ts.snap

@@ -25,7 +25,16 @@ exports[`v4 > extractRawCandidates case 0 1`] = `
 ]
 `;
 
-exports[`v4 > tailwindcssPatcher casae 1 1`] = `
+exports[`v4 > tailwindcssPatcher case 0 1`] = `
+[
+  "bg-[#123456]",
+  "content",
+  "text-(--x)",
+  "text-xs",
+]
+`;
+
+exports[`v4 > tailwindcssPatcher case 1 1`] = `
 [
   "bg-[#123456]",
   "bg-gradient-to-b",
@@ -39,11 +48,16 @@ exports[`v4 > tailwindcssPatcher casae 1 1`] = `
 ]
 `;
 
-exports[`v4 > tailwindcssPatcher case 0 1`] = `
-[
+exports[`v4 > tailwindcssPatcher getClassSet case 2 1`] = `
+Set {
   "bg-[#123456]",
+  "bg-gradient-to-b",
   "content",
+  "from-[#2f73f1]",
+  "h-[30px]",
   "text-(--x)",
   "text-xs",
-]
+  "to-[#4bcefd]",
+  "w-[323px]",
+}
 `;

packages/tailwindcss-patch/test/config.test.ts

@@ -1,7 +1,7 @@
-import { resolve } from 'pathe'
-import { getConfig, getDefaultMangleUserConfig, getDefaultUserConfig, initConfig } from '@/config'
+import { getConfig, getDefaultMangleUserConfig, getDefaultUserConfig, initConfig } from '@tailwindcss-mangle/config'
 import { deleteAsync } from 'del'
 import { existsSync } from 'fs-extra'
+import { resolve } from 'pathe'
 import { fixturesRoot } from './utils'
 
 describe('config', () => {

packages/tailwindcss-patch/test/v4.test.ts

@@ -21,7 +21,7 @@ describe('v4', () => {
     expect(candidates).toMatchSnapshot()
   })
 
-  it('tailwindcssPatcher casae 1', async () => {
+  it('tailwindcssPatcher case 1', async () => {
     const patcher = new TailwindcssPatcher()
 
     const candidates = await patcher.extractValidCandidates({
@@ -37,6 +37,27 @@ describe('v4', () => {
     expect(candidates).toMatchSnapshot()
   })
 
+  it('tailwindcssPatcher getClassSet case 2', async () => {
+    const patcher = new TailwindcssPatcher()
+    patcher.majorVersion = 4
+    const candidates = await patcher.getClassSet({
+      tailwindcss: {
+        v4: {
+          base: import.meta.dirname,
+          css: await fs.readFile(path.resolve(import.meta.dirname, './fixtures/v4/index.css'), 'utf8'),
+          sources: [
+            {
+              base: import.meta.dirname,
+              pattern: path.resolve(import.meta.dirname, './fixtures/v4/**/*.html'),
+            },
+          ],
+        },
+      },
+
+    })
+    expect(candidates).toMatchSnapshot()
+  })
+
   it('extractRawCandidates case 0', async () => {
     const candidates = await extractRawCandidates(
       [