Merge pull request #1058 from primer/cb/ts-theme

Migrate theme to TypeScript
primer · Feb 19, 2021 · 72d64f9 · 72d64f9 · vercel · Feb 19, 2021
2 parents edca2de + 508f0bd
commit 72d64f9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/.changeset/modern-lizards-play.md b/.changeset/modern-lizards-play.md
@@ -0,0 +1,5 @@
+---
+"@primer/components": patch
+---
+
+Migrate theme to TypeScript
diff --git a/src/__tests__/themeGet.js → src/__tests__/themeGet.ts b/src/__tests__/themeGet.js → src/__tests__/themeGet.ts
diff --git a/src/theme-preval.js → src/theme-preval.ts b/src/theme-preval.js → src/theme-preval.ts
@@ -1,12 +1,10 @@
-// @preval
-
-const {colors: colorPrimitives, typography} = require('@primer/primitives')
-const {lighten, rgba, desaturate} = require('polished')
+import {colors as colorPrimitives, typography} from '@primer/primitives'
+import {lighten, rgba, desaturate} from 'polished'
 
 const {lineHeights} = typography
 const {black, white, pink, gray, blue, green, orange, purple, red, yellow} = colorPrimitives
 // General
-const colors = {
+export const colors = {
   bodytext: gray[9],
   black,
   white,
@@ -350,7 +348,7 @@ const stateLabels = {
   }
 }
 
-const theme = {
+export const theme = {
   // General
   borderWidths,
   breakpoints,
@@ -373,11 +371,6 @@ const theme = {
   stateLabels
 }
 
-module.exports = {
-  theme,
-  colors
-}
-
-function fontStack(fonts) {
+function fontStack(fonts: string[]) {
   return fonts.map(font => (font.includes(' ') ? `"${font}"` : font)).join(', ')
 }
diff --git a/src/theme.js b/src/theme.js
diff --git a/src/theme.ts b/src/theme.ts
@@ -0,0 +1,4 @@
+import {theme, colors} from /* preval */ './theme-preval'
+
+export default theme
+export {colors}