From 4e219dc97d1b459df9d3c68661992bda6139185f Mon Sep 17 00:00:00 2001
From: Philipp Spiess <hello@philippspiess.com>
Date: Mon, 14 Oct 2024 15:46:12 +0200
Subject: [PATCH] Revert "Warn on use of plugin parameters as function"
 (#14662)

Reverts tailwindlabs/tailwindcss#14661
---
 .../src/compat/config/resolve-config.test.ts  | 12 ++---------
 .../src/compat/config/resolve-config.ts       | 21 ++++---------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/packages/tailwindcss/src/compat/config/resolve-config.test.ts b/packages/tailwindcss/src/compat/config/resolve-config.test.ts
index 5078679e1..4ae06997e 100644
--- a/packages/tailwindcss/src/compat/config/resolve-config.test.ts
+++ b/packages/tailwindcss/src/compat/config/resolve-config.test.ts
@@ -1,4 +1,4 @@
-import { expect, test, vi } from 'vitest'
+import { expect, test } from 'vitest'
 import { buildDesignSystem } from '../../design-system'
 import { Theme } from '../../theme'
 import { resolveConfig } from './resolve-config'
@@ -172,12 +172,7 @@ test('theme keys can reference other theme keys using the theme function regardl
   })
 })
 
-test('theme keys can read from the CSS theme', ({ onTestFinished }) => {
-  let warn = vi.spyOn(console, 'warn').mockImplementation(() => undefined)
-  onTestFinished(() => {
-    warn.mockReset()
-  })
-
+test('theme keys can read from the CSS theme', () => {
   let theme = new Theme()
   theme.add('--color-green', 'green')
 
@@ -252,7 +247,4 @@ test('theme keys can read from the CSS theme', ({ onTestFinished }) => {
       },
     },
   })
-  expect(warn).toHaveBeenCalledWith(
-    'Using the plugin object parameter as the theme function is deprecated. Please use the `theme` property instead.',
-  )
 })
diff --git a/packages/tailwindcss/src/compat/config/resolve-config.ts b/packages/tailwindcss/src/compat/config/resolve-config.ts
index aad25ba7b..be1579c98 100644
--- a/packages/tailwindcss/src/compat/config/resolve-config.ts
+++ b/packages/tailwindcss/src/compat/config/resolve-config.ts
@@ -175,25 +175,12 @@ function extractConfigs(ctx: ResolutionContext, { config, base, path }: ConfigFi
   ctx.configs.push(config)
 }
 
-let didWarnAboutUsingObjectArgumentAsThemeFn = false
-
 function mergeTheme(ctx: ResolutionContext) {
   let themeFn = createThemeFn(ctx.design, () => ctx.theme, resolveValue)
-  let theme = Object.assign(
-    (path: string, defaultValue?: any) => {
-      if (!didWarnAboutUsingObjectArgumentAsThemeFn) {
-        didWarnAboutUsingObjectArgumentAsThemeFn = true
-        console.warn(
-          'Using the plugin object parameter as the theme function is deprecated. Please use the `theme` property instead.',
-        )
-      }
-      return themeFn(path, defaultValue)
-    },
-    {
-      theme: themeFn,
-      colors,
-    },
-  )
+  let theme = Object.assign(themeFn, {
+    theme: themeFn,
+    colors,
+  })
 
   function resolveValue(value: ThemeValue | null | undefined): ResolvedThemeValue {
     if (typeof value === 'function') {