make UserConfig nullable

RobinMalfait · RobinMalfait · commit cb555e123dc3 · 2025-04-18T17:07:55.000+02:00
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.ts
@@ -9,7 +9,7 @@ export function migrateAtApply({
   userConfig,
 }: {
   designSystem: DesignSystem
-  userConfig: Config
+  userConfig: Config | null
 }): Plugin {
   function migrate(atRule: AtRule) {
     let utilities = atRule.params.split(/(\s+)/)
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts
@@ -10,7 +10,7 @@ export function migrateMediaScreen({
   userConfig,
 }: {
   designSystem?: DesignSystem
-  userConfig?: Config
+  userConfig?: Config | null
 } = {}): Plugin {
   function migrate(root: Root) {
     if (!designSystem || !userConfig) return
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts
@@ -35,7 +35,7 @@ export function migratePreflight({
   userConfig,
 }: {
   designSystem: DesignSystem
-  userConfig?: Config
+  userConfig?: Config | null
 }): Plugin {
   // @ts-expect-error
   let defaultBorderColor = userConfig?.theme?.borderColor?.DEFAULT
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate.ts
@@ -17,7 +17,7 @@ import { migrateVariantsDirective } from './migrate-variants-directive'
 export interface MigrateOptions {
   newPrefix: string | null
   designSystem: DesignSystem
-  userConfig: Config
+  userConfig: Config | null
   configFilePath: string
   jsConfigMigration: JSConfigMigration | null
 }
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.ts
@@ -7,7 +7,7 @@ import { printCandidate } from './candidates'
 
 export function migrateArbitraryValueToBareValue(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let candidate of parseCandidate(rawCandidate, designSystem)) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts
@@ -6,7 +6,7 @@ import { printCandidate } from './candidates'
 
 export function migrateAutomaticVarInjection(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.ts
@@ -6,7 +6,7 @@ const DIRECTIONS = ['t', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl']
 
 export function migrateBgGradient(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let candidate of designSystem.parseCandidate(rawCandidate)) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.ts
@@ -3,7 +3,7 @@ import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
 
 export function migrateEmptyArbitraryValues(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   // We can parse the candidate, nothing to do
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-important.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-important.ts
@@ -18,7 +18,7 @@ import { isSafeMigration } from './is-safe-migration'
 //   flex! md:block!
 export function migrateImportant(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
   location?: {
     contents: string
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts
@@ -6,7 +6,7 @@ import { printCandidate } from './candidates'
 
 export function migrateLegacyArbitraryValues(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let candidate of parseCandidate(rawCandidate, designSystem)) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts
@@ -68,7 +68,7 @@ const DESIGN_SYSTEMS = new DefaultMap((base) => {
 
 export async function migrateLegacyClasses(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
   location?: {
     contents: string
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.ts
@@ -4,7 +4,7 @@ import { printCandidate } from './candidates'
 
 export function migrateMaxWidthScreen(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let candidate of designSystem.parseCandidate(rawCandidate)) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts
@@ -15,7 +15,7 @@ function memcpy<T extends object, U extends object | null>(target: T, source: U)
 
 export function migrateModernizeArbitraryValues(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let candidate of parseCandidate(rawCandidate, designSystem)) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.ts
@@ -2,16 +2,19 @@ import { parseCandidate, type Candidate } from '../../../../tailwindcss/src/cand
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
 import { segment } from '../../../../tailwindcss/src/utils/segment'
+import * as version from '../../utils/version'
 import { printCandidate } from './candidates'
 
 let seenDesignSystems = new WeakSet<DesignSystem>()
 
 export function migratePrefix(
   designSystem: DesignSystem,
-  userConfig: Config,
+  userConfig: Config | null,
   rawCandidate: string,
 ): string {
   if (!designSystem.theme.prefix) return rawCandidate
+  if (!userConfig) return rawCandidate
+  if (!version.isMajor(3)) return rawCandidate
 
   if (!seenDesignSystems.has(designSystem)) {
     designSystem.utilities.functional('group', () => null)
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.ts
@@ -30,7 +30,7 @@ let seenDesignSystems = new WeakSet<DesignSystem>()
 
 export function migrateSimpleLegacyClasses(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   // Prepare design system with the unknown legacy classes
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts
@@ -21,7 +21,7 @@ export const enum Convert {
 
 export function migrateThemeToVar(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   let convert = createConverter(designSystem)
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts
@@ -7,7 +7,7 @@ import { printCandidate } from './candidates'
 
 export function migrateVariantOrder(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   // This migration is only needed for Tailwind CSS v3
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts
@@ -20,7 +20,7 @@ import { migrateVariantOrder } from './migrate-variant-order'
 
 export type Migration = (
   designSystem: DesignSystem,
-  userConfig: Config,
+  userConfig: Config | null,
   rawCandidate: string,
   location?: {
     contents: string
@@ -47,7 +47,7 @@ export const DEFAULT_MIGRATIONS: Migration[] = [
 
 export async function migrateCandidate(
   designSystem: DesignSystem,
-  userConfig: Config,
+  userConfig: Config | null,
   rawCandidate: string,
   // Location is only set when migrating a candidate from a source file
   location?: {
@@ -64,7 +64,7 @@ export async function migrateCandidate(
 
 export default async function migrateContents(
   designSystem: DesignSystem,
-  userConfig: Config,
+  userConfig: Config | null,
   contents: string,
   extension: string,
 ): Promise<string> {
@@ -93,7 +93,7 @@ export default async function migrateContents(
   return spliceChangesIntoString(contents, changes)
 }
 
-export async function migrate(designSystem: DesignSystem, userConfig: Config, file: string) {
+export async function migrate(designSystem: DesignSystem, userConfig: Config | null, file: string) {
   let fullPath = path.isAbsolute(file) ? file : path.resolve(process.cwd(), file)
   let contents = await fs.readFile(fullPath, 'utf-8')
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import { migrateVariantsDirective } from './migrate-variants-directive'`
`17`	`17`	`export interface MigrateOptions {`
`18`	`18`	`newPrefix: string \| null`
`19`	`19`	`designSystem: DesignSystem`
`20`		`- userConfig: Config`
	`20`	`+ userConfig: Config \| null`
`21`	`21`	`configFilePath: string`
`22`	`22`	`jsConfigMigration: JSConfigMigration \| null`
`23`	`23`	`}`