Skip to content

Commit

Permalink
refactor: rename defaultTheme to defaultTokens
Browse files Browse the repository at this point in the history
BREAKING CHANGE: `defaultTheme` imports shall be rewritten to `defaultTokens`
  • Loading branch information
kripod committed Apr 6, 2020
1 parent 1e6e9b4 commit 6684dc5
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { createTheme, defaultTheme } from 'glaze';
import { createTheme, defaultTokens } from 'glaze';

export const tokens =
{
...defaultTheme,
...defaultTokens,
scales: {
...defaultTheme.scales,
...defaultTokens.scales,
color: {
red: '#f8485e',
},
Expand Down
6 changes: 3 additions & 3 deletions packages/example-nextjs/src/theme.treat.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { createTheme, defaultTheme } from 'glaze';
import { createTheme, defaultTokens } from 'glaze';

export default createTheme({
...defaultTheme,
...defaultTokens,
scales: {
...defaultTheme.scales,
...defaultTokens.scales,
color: {
red: '#f8485e',
},
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-plugin-glaze/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Applies glaze theming on Gatsby sites.
```js
/* src/gatsby-plugin-glaze/theme.treat.js */

import { createTheme, defaultTheme } from 'glaze';
import { createTheme, defaultTokens } from 'glaze';

export default createTheme({
...defaultTheme,
...defaultTokens,
// Customization...
});
```
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-plugin-glaze/src/theme.treat.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { createTheme, defaultTheme } from 'glaze';
import { createTheme, defaultTokens } from 'glaze';

export default createTheme(defaultTheme);
export default createTheme(defaultTokens);
6 changes: 3 additions & 3 deletions packages/glaze/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ Baking the benefits outlined above into a single package, glaze was born.
```js
/* theme.treat.js */

import { createTheme, defaultTheme } from 'glaze';
import { createTheme, defaultTokens } from 'glaze';

export default createTheme({
...defaultTheme,
...defaultTokens,

// Customization
scales: {
...defaultTheme.scales,
...defaultTokens.scales,
color: {
red: '#f8485e',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/glaze/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ export { modularScale } from './scales';
export { VirtualStyleInjector } from './StyleInjector';
export { StyleInjectorProvider } from './StyleInjectorContext';
export type { RuntimeTheme, ScaleTokens, StaticTheme } from './theme';
export { createTheme, defaultTheme } from './theme';
export { createTheme, defaultTokens } from './theme';
export { ThemeProvider, useTheme } from './ThemeContext';
export { useStyling } from './useStyling';
2 changes: 1 addition & 1 deletion packages/glaze/src/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const spacing = {
64: '16rem',
};

export const defaultTheme =
export const defaultTokens =
{
breakpoints: [640, 768, 1024, 1280],

Expand Down
6 changes: 3 additions & 3 deletions packages/glaze/src/treat.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defaultTheme } from './theme';
import { defaultTokens } from './theme';

declare module 'treat/theme' {
type DefaultTheme = typeof defaultTheme;
type Tokens = typeof defaultTokens;
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface Theme extends DefaultTheme {}
export interface Theme extends Tokens {}
}

0 comments on commit 6684dc5

Please sign in to comment.