Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert component tokens to typescript #691

Merged
merged 3 commits into from
Oct 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/figma-broker/actions/createComponentTokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { fetchFigmaFile, processFigmaFile } from '../functions/figma'
import { makeDesktopComponents } from '../files/desktop-ui'
import { PATHS, FILE_IDS } from '../constants'

export async function createComponentTokens(ctx) {
export async function createComponentTokens() {
const data = await fetchFigmaFile(FILE_IDS.DESKTOP_UI)

const figmaFile = processFigmaFile(data)
const components = makeDesktopComponents(figmaFile)

writeResults(components, PATHS.COMPONENTS_TOKENS)
writeResults(components, PATHS.COMPONENTS_TOKENS, 'ts')

return components
}
8 changes: 4 additions & 4 deletions apps/figma-broker/files/desktop-ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@ export const makeDesktopComponents = (figmaFile) => {
switch (fixedPageName) {
case 'buttons primary color':
components.push({
name: 'buttons-primary',
name: 'primary',
value: makeButtonsComponent(data, getStyle),
path: 'button',
})
break
case 'buttons secondary color':
components.push({
name: 'buttons-secondary',
name: 'secondary',
value: makeButtonsComponent(data, getStyle),
path: 'button',
})
break
case 'buttons danger color':
components.push({
name: 'buttons-danger',
name: 'danger',
value: makeButtonsComponent(data, getStyle),
path: 'button',
})
break
case 'buttons disabled':
components.push({
name: 'buttons-disabled',
name: 'disabled',
value: makeButtonsComponent(data, getStyle),
path: 'button',
})
Expand Down
3 changes: 2 additions & 1 deletion apps/figma-broker/functions/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const writeFile = (path, name, ext, file) => {
createFolder(path)
let value = file

if (ext === 'js') {
if (ext === 'js' || ext === 'ts') {
const options = prettier.resolveConfig.sync(prettierConfig)
value = prettier.format(file, options)
}
Expand Down Expand Up @@ -82,6 +82,7 @@ export const writeResults = (results, savePath, extension = 'json') =>
)

switch (extension) {
case 'ts':
case 'js':
writeFileToDisk(
`export const ${name} = ${JSON.stringify(value, null, 2)}\n`,
Expand Down
1 change: 0 additions & 1 deletion libraries/core-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"@babel/preset-typescript": "^7.10.4",
"@rollup/plugin-babel": "^5.0.3",
"@rollup/plugin-commonjs": "^13.0.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^8.0.1",
"@testing-library/jest-dom": "^5.9.0",
"@testing-library/react": "^10.2.1",
Expand Down
11 changes: 0 additions & 11 deletions libraries/core-react/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions libraries/core-react/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-disable import/no-default-export */
import resolve from '@rollup/plugin-node-resolve'
import commonjs from '@rollup/plugin-commonjs'
import json from '@rollup/plugin-json'
import babel from '@rollup/plugin-babel'
import polyfill from 'rollup-plugin-polyfill'
import typescript from 'rollup-plugin-typescript2'
Expand Down Expand Up @@ -30,7 +29,6 @@ export default [
include: ['./src/**', './../tokens/**'],
},
plugins: [
json(),
resolve({ extensions }),
typescript({ useTsconfigDeclarationDir: true }),
babel({
Expand Down
11 changes: 7 additions & 4 deletions libraries/core-react/src/Button/Button.tokens.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import primary from '@equinor/eds-tokens/components/button/buttons-primary.json'
import secondary from '@equinor/eds-tokens/components/button/buttons-secondary.json'
import danger from '@equinor/eds-tokens/components/button/buttons-danger.json'
import disabled from '@equinor/eds-tokens/components/button/buttons-disabled.json'
import { tokens } from '@equinor/eds-tokens'
import type {
Border,
Focus,
Expand All @@ -10,6 +7,12 @@ import type {
Typography,
} from '@equinor/eds-tokens'

const {
components: {
button: { primary, secondary, danger, disabled },
},
} = tokens

const colors = {
primary: {
...primary,
Expand Down
9 changes: 7 additions & 2 deletions libraries/core-react/src/Table/Table.tokens.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import tableTokens from '@equinor/eds-tokens/components/table/table.json'
import { tokens } from '@equinor/eds-tokens'

import type {
Border,
Clickbound,
Spacing,
Typography,
} from '@equinor/eds-tokens'

const { header, cell } = tableTokens
const {
components: {
table: { header, cell },
},
} = tokens

type Field = {
height: string
Expand Down
Loading