Skip to content

Commit 081599c

Browse files
authored
chore: Convert tailwind config to typescript file (#2599)
* convert tailwind config to typescript file * try design-system canary that fixes everything * upgrade to non-canary design-system, fix import
1 parent fd47bee commit 081599c

File tree

3 files changed

+16
-28
lines changed

3 files changed

+16
-28
lines changed

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"dependencies": {
3535
"@floating-ui/react": "^0.26.23",
3636
"@headlessui/react": "^2.1.8",
37-
"@oxide/design-system": "^1.7.2",
37+
"@oxide/design-system": "^1.7.3",
3838
"@radix-ui/react-accordion": "^1.2.0",
3939
"@radix-ui/react-dialog": "^1.0.5",
4040
"@radix-ui/react-focus-guards": "1.0.1",

tailwind.config.js renamed to tailwind.config.ts

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,17 @@
66
* Copyright Oxide Computer Company
77
*/
88

9-
// @ts-check
9+
import { type Config } from 'tailwindcss'
10+
import plugin from 'tailwindcss/plugin'
1011

11-
/** @type {import('tailwindcss/lib/util/createPlugin').default} */
12-
// @ts-expect-error
13-
const plugin = require('tailwindcss/plugin')
14-
const {
15-
textUtilities,
16-
colorUtilities,
12+
import {
1713
borderRadiusTokens,
14+
colorUtilities,
1815
elevationUtilities,
19-
} = require('@oxide/design-system/styles/dist/tailwind-tokens.js')
16+
textUtilities,
17+
} from '@oxide/design-system/styles/dist/tailwind-tokens.ts'
2018

21-
/** @type {import('tailwindcss/tailwind-config').TailwindConfig} */
22-
module.exports = {
19+
export default {
2320
corePlugins: {
2421
fontFamily: false,
2522
fontSize: false,
@@ -57,7 +54,7 @@ module.exports = {
5754
},
5855
},
5956
borderRadius: {
60-
none: 0,
57+
none: '0',
6158
...borderRadiusTokens,
6259
},
6360
colors: {
@@ -66,23 +63,13 @@ module.exports = {
6663
},
6764
},
6865
plugins: [
69-
plugin(({ addVariant, addUtilities, variants }) => {
66+
plugin(({ addVariant, addUtilities }) => {
7067
addVariant('children', '& > *')
7168
addVariant('selected', '.is-selected &')
7269
addVariant('disabled', ['&.visually-disabled', '&:disabled'])
73-
addUtilities(
74-
Array.from({ length: 12 }, (_, i) => i)
75-
.map((i) => ({
76-
[`.grid-col-${i}`]: {
77-
'grid-column': `${i}`,
78-
},
79-
}))
80-
.reduce((p, c) => ({ ...p, ...c }), {}),
81-
variants
82-
)
8370
addUtilities(textUtilities)
8471
addUtilities(colorUtilities)
8572
addUtilities(elevationUtilities)
8673
}),
8774
],
88-
}
75+
} satisfies Config

0 commit comments

Comments
 (0)