Skip to content

Commit 4931458

Browse files
authored
templates: fix tailwind typography config so that it works better with shadcn CLI (#16209)
Typography config as a function can cause issues with automatic merging from the shadcn CLI so this just changes it to a static object since we didn't use the function arguments themselves.
1 parent b67882c commit 4931458

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

templates/ecommerce/tailwind.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export default {
8585
error: 'hsl(var(--error))',
8686
warning: 'hsl(var(--warning))',
8787
},
88-
typography: ({ theme }) => ({
88+
typography: {
8989
DEFAULT: {
9090
css: {
9191
'--tw-prose-body': 'var(--text)',
@@ -100,7 +100,7 @@ export default {
100100
},
101101
},
102102
},
103-
}),
103+
},
104104
fontFamily: {
105105
mono: ['var(--font-geist-mono)'],
106106
sans: ['var(--font-geist-sans)'],

templates/website/tailwind.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const config = {
33
theme: {
44
extend: {
5-
typography: () => ({
5+
typography: {
66
DEFAULT: {
77
css: [
88
{
@@ -40,7 +40,7 @@ const config = {
4040
},
4141
],
4242
},
43-
}),
43+
},
4444
},
4545
},
4646
}

templates/with-vercel-website/tailwind.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const config = {
33
theme: {
44
extend: {
5-
typography: () => ({
5+
typography: {
66
DEFAULT: {
77
css: [
88
{
@@ -40,7 +40,7 @@ const config = {
4040
},
4141
],
4242
},
43-
}),
43+
},
4444
},
4545
},
4646
}

0 commit comments

Comments
 (0)