Revert "Warn on use of plugin parameters as function" (#14662)

Reverts tailwindlabs/tailwindcss#14661
This commit is contained in:
Philipp Spiess 2024-10-14 15:46:12 +02:00 • committed by GitHub
parent f2ebb8eb82
commit 4e219dc97d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 27 deletions

View file

@ -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.',
)
})

View file

@ -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') {