feat(tailwindcss-patch): split v2 and v3 option types

Author: sonofmagic

.changeset/friendly-trainers-share.md

@@ -3,4 +3,4 @@
 "@tailwindcss-mangle/config": minor
 ---
 
-Remove legacy public option type aliases from the v9 alpha line and keep only the modern option names such as `TailwindCssPatchOptions`, `TailwindCssOptions`, `TailwindV2V3Options`, and `TailwindV4Options`.
+Remove legacy public option type aliases from the v9 alpha line and keep only the modern option names such as `TailwindCssPatchOptions`, `TailwindCssOptions`, `TailwindV2Options`, `TailwindV3Options`, and `TailwindV4Options`.

packages/config/src/types.ts

@@ -46,11 +46,15 @@ export interface TransformerOptions {
   preserve?: TransformerPreserveOptions
 }
 
-export interface TailwindV2V3Options {
+interface TailwindRuntimeOptionsBase {
   cwd?: string
   config?: string
 }
 
+export interface TailwindV2Options extends TailwindRuntimeOptionsBase {}
+
+export interface TailwindV3Options extends TailwindRuntimeOptionsBase {}
+
 export interface TailwindV4Options {
   sources?: SourceEntry[]
   base?: string
@@ -98,8 +102,8 @@ export interface TailwindCssOptions {
   version?: 2 | 3 | 4
   packageName?: string
   resolve?: PackageResolvingOptions
-  v2?: TailwindV2V3Options
-  v3?: TailwindV2V3Options
+  v2?: TailwindV2Options
+  v3?: TailwindV3Options
   v4?: TailwindV4Options
   cwd?: string
   config?: string

packages/tailwindcss-patch/MIGRATION.md

@@ -77,7 +77,8 @@ Use these names in user code:
 
 - `TailwindCssPatchOptions`
 - `TailwindCssOptions`
-- `TailwindV2V3Options`
+- `TailwindV2Options`
+- `TailwindV3Options`
 - `TailwindV4Options`
 - `ApplyOptions`
 - `ExtractOptions`

packages/tailwindcss-patch/README-cn.md

@@ -71,7 +71,8 @@ import type {
   ExtractOptions,
   TailwindCssOptions,
   TailwindCssPatchOptions,
-  TailwindV2V3Options,
+  TailwindV2Options,
+  TailwindV3Options,
   TailwindV4Options,
   NormalizedTailwindCssPatchOptions,
 } from 'tailwindcss-patch'

packages/tailwindcss-patch/README.md

@@ -128,7 +128,8 @@ import type {
   ExtractOptions,
   TailwindCssOptions,
   TailwindCssPatchOptions,
-  TailwindV2V3Options,
+  TailwindV2Options,
+  TailwindV3Options,
   TailwindV4Options,
   NormalizedTailwindCssPatchOptions,
 } from 'tailwindcss-patch'

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

@@ -12,7 +12,8 @@ export type {
   NormalizedExtendLengthUnitsOptions,
   TailwindCssOptions,
   TailwindCssPatchOptions,
-  TailwindV2V3Options,
+  TailwindV2Options,
+  TailwindV3Options,
   TailwindV4Options,
 } from '../options/types'
 export {

packages/tailwindcss-patch/src/options/types.ts

@@ -70,10 +70,7 @@ export interface ApplyOptions {
   extendLengthUnits?: false | ExtendLengthUnitsOptions
 }
 
-/**
- * Shared configuration used for Tailwind v2/v3 patching flows.
- */
-export interface TailwindV2V3Options {
+interface TailwindRuntimeOptionsBase {
   /** Path to a Tailwind config file when auto-detection is insufficient. */
   config?: string
   /** Custom working directory used when resolving config-relative paths. */
@@ -82,6 +79,16 @@ export interface TailwindV2V3Options {
   postcssPlugin?: string
 }
 
+/**
+ * Configuration specific to Tailwind CSS v2 patching flows.
+ */
+export interface TailwindV2Options extends TailwindRuntimeOptionsBase {}
+
+/**
+ * Configuration specific to Tailwind CSS v3 patching flows.
+ */
+export interface TailwindV3Options extends TailwindRuntimeOptionsBase {}
+
 /**
  * Additional configuration specific to Tailwind CSS v4 extraction.
  */
@@ -99,17 +106,17 @@ export interface TailwindV4Options {
 /**
  * High-level Tailwind patch configuration shared across versions.
  */
-export interface TailwindCssOptions extends TailwindV2V3Options {
+export interface TailwindCssOptions extends TailwindRuntimeOptionsBase {
   /** Explicit Tailwind CSS major version used by the current project. When omitted, the installed package version is inferred. */
   version?: 2 | 3 | 4
   /** Tailwind package name if the project uses a fork. */
   packageName?: string
   /** Package resolution options forwarded to `local-pkg`. */
   resolve?: PackageResolvingOptions
   /** Overrides applied when patching Tailwind CSS v2. */
-  v2?: TailwindV2V3Options
+  v2?: TailwindV2Options
   /** Overrides applied when patching Tailwind CSS v3. */
-  v3?: TailwindV2V3Options
+  v3?: TailwindV3Options
   /** Options specific to Tailwind CSS v4 patching. */
   v4?: TailwindV4Options
 }
@@ -183,12 +190,12 @@ export interface NormalizedTailwindV4Options {
 /**
  * Tailwind configuration ready for consumption by the runtime after normalization.
  */
-export interface NormalizedTailwindConfigOptions extends TailwindV2V3Options {
+export interface NormalizedTailwindConfigOptions extends TailwindRuntimeOptionsBase {
   packageName: string
   versionHint?: 2 | 3 | 4
   resolve?: PackageResolvingOptions
-  v2?: TailwindV2V3Options
-  v3?: TailwindV2V3Options
+  v2?: TailwindV2Options
+  v3?: TailwindV3Options
   v4?: NormalizedTailwindV4Options
 }
 

packages/tailwindcss-patch/src/types.ts

@@ -11,7 +11,8 @@ import type {
   NormalizedTailwindCssPatchOptions,
   TailwindCssOptions,
   TailwindCssPatchOptions,
-  TailwindV2V3Options,
+  TailwindV2Options,
+  TailwindV3Options,
   TailwindV4Options,
 } from './options/types'
 
@@ -115,7 +116,8 @@ export type {
   NormalizedTailwindCssPatchOptions,
   TailwindCssOptions,
   TailwindCssPatchOptions,
-  TailwindV2V3Options,
+  TailwindV2Options,
+  TailwindV3Options,
   TailwindV4Options,
 }
 

packages/tailwindcss-patch/test-d/public-options.test-d.ts

@@ -13,7 +13,8 @@ import {
   type NormalizedTailwindCssPatchOptions,
   type TailwindCssOptions,
   type TailwindCssPatchOptions,
-  type TailwindV2V3Options,
+  type TailwindV2Options,
+  type TailwindV3Options,
   type TailwindV4Options,
 } from '..'
 
@@ -50,7 +51,12 @@ const cacheOptions: CacheOptions = {
   driver: 'memory',
 }
 
-const v3Options: TailwindV2V3Options = {
+const v2Options: TailwindV2Options = {
+  cwd: 'apps/legacy',
+  config: 'tailwind.config.js',
+}
+
+const v3Options: TailwindV3Options = {
   cwd: 'apps/web',
   config: 'tailwind.config.ts',
   postcssPlugin: '@tailwindcss/postcss',
@@ -90,9 +96,7 @@ expectAssignable<TailwindCssOptions>({
   version: 3,
   cwd: 'apps/docs',
   config: 'tailwind.config.ts',
-  v2: {
-    cwd: 'apps/legacy',
-  },
+  v2: v2Options,
   v3: {
     config: 'tailwind.config.cjs',
     postcssPlugin: '@tailwindcss/postcss',