wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Rename to applyConfigToTheme

Browse source
This commit is contained in:
Philipp Spiess 2024-08-26 16:46:16 +02:00
parent 8c43650798
commit 9939d344e4
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/tailwindcss/src/compat/merge-into-theme.test.ts → packages/tailwindcss/src/compat/apply-config-to-theme.test.ts
View file

@ -1,13 +1,13 @@
import { test } from 'vitest'
import { buildDesignSystem } from '../design-system'
import { Theme } from '../theme'
import { mergeIntoTheme } from './merge-into-theme'
import { applyConfigToTheme } from './apply-config-to-theme'
test('Config values can be merged into the theme', ({ expect }) => {
let theme = new Theme()
let design = buildDesignSystem(theme)
mergeIntoTheme(design, [
applyConfigToTheme(design, [
{
config: {
theme: {

2
packages/tailwindcss/src/compat/merge-into-theme.ts → packages/tailwindcss/src/compat/apply-config-to-theme.ts
View file

@ -2,7 +2,7 @@ import type { DesignSystem } from '../design-system'
import { resolveConfig, type ConfigFile } from './config/resolve-config'
import type { ResolvedConfig } from './config/types'
export function mergeIntoTheme(designSystem: DesignSystem, configs: ConfigFile[]) {
export function applyConfigToTheme(designSystem: DesignSystem, configs: ConfigFile[]) {
let theme = resolveConfig(designSystem, configs).theme
for (let [path, value] of themeableValues(theme)) {

4
packages/tailwindcss/src/plugin-api.ts
View file

@ -1,11 +1,11 @@
import { substituteAtApply } from './apply'
import { decl, rule, type AstNode } from './ast'
import type { Candidate, NamedUtilityValue } from './candidate'
import { applyConfigToTheme } from './compat/apply-config-to-theme'
import { createCompatConfig } from './compat/config/create-compat-config'
import { resolveConfig, type ConfigFile } from './compat/config/resolve-config'
import type { ResolvedConfig, UserConfig } from './compat/config/types'
import { darkModePlugin } from './compat/dark-mode'
import { mergeIntoTheme } from './compat/merge-into-theme'
import type { DesignSystem } from './design-system'
import { createThemeFn } from './theme-fn'
import { withAlpha, withNegative } from './utilities'
@ -369,7 +369,7 @@ export function registerPlugins(
// Merge the user-configured theme keys into the design system. The compat
// config would otherwise expand into namespaces like `background-color` which
// core utilities already read from.
mergeIntoTheme(designSystem, userConfig)
applyConfigToTheme(designSystem, userConfig)
return {
pluginApi,