Skip to content

Commit

Permalink
Merge branch 'master' into fix-jsx-types
Browse files Browse the repository at this point in the history
  • Loading branch information
hasparus authored Nov 30, 2020
2 parents 3950d6a + 35b700b commit f2168cd
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 30 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@
- `SxStyleProp`, an alias for `ThemeUIStyleObject` removed. Use `ThemeUIStyleObject` instead.
- Fix: Add `sx` props types to all props accepting `className`.
- Fix WithPoorAsProp to work with ComponentProps utility type.

## v0.5.0-alpha.2 2020-11-30

- Add Paragraph component. PR #1298

## v0.5.0-alpha.1 2020-11-26

- Bump React peerDependency to `"^16.14.0 || ^17.0.0"`.
- Support automatic JSX runtime. Issue #1160, PR #1237
- Bump React peerDependency to `"^16.14.0 || ^17.0.0"`.
- Apply variant styles _before_ responsive styles. Issues #1030, and #720, PR #1273
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/components",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "index.d.ts",
Expand Down
16 changes: 8 additions & 8 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "docs",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"main": "index.js",
"author": "Brent Jackson <jxnblk@gmail.com>",
"license": "MIT",
Expand All @@ -21,14 +21,14 @@
"@mdx-js/mdx": "^1.0.0-rc.0",
"@mdx-js/react": "^1.0.0-rc.0",
"@theme-ui/color": "0.5.0-alpha.1",
"@theme-ui/components": "0.5.0-alpha.1",
"@theme-ui/components": "0.5.0-alpha.2",
"@theme-ui/css": "0.5.0-alpha.1",
"@theme-ui/editor": "0.5.0-alpha.1",
"@theme-ui/editor": "0.5.0-alpha.2",
"@theme-ui/match-media": "0.5.0-alpha.1",
"@theme-ui/presets": "0.5.0-alpha.1",
"@theme-ui/prism": "0.5.0-alpha.1",
"@theme-ui/sidenav": "0.5.0-alpha.1",
"@theme-ui/style-guide": "0.5.0-alpha.1",
"@theme-ui/prism": "0.5.0-alpha.2",
"@theme-ui/sidenav": "0.5.0-alpha.2",
"@theme-ui/style-guide": "0.5.0-alpha.2",
"@theme-ui/typography": "0.5.0-alpha.1",
"copy-to-clipboard": "^3.2.0",
"gatsby": "^2.26.1",
Expand All @@ -38,7 +38,7 @@
"gatsby-plugin-react-helmet": "^3.4.0",
"gatsby-plugin-theme-ui": "0.5.0-alpha.1",
"gatsby-theme-code-recipes": "0.5.0-alpha.1",
"gatsby-theme-style-guide": "0.5.0-alpha.1",
"gatsby-theme-style-guide": "0.5.0-alpha.2",
"lodash.merge": "^4.6.1",
"lodash.omit": "^4.5.0",
"prismjs": "^1.16.0",
Expand All @@ -48,7 +48,7 @@
"react-live": "^2.1.2",
"remark-slug": "^6.0.0",
"stringify-object": "^3.3.0",
"theme-ui": "0.5.0-alpha.1",
"theme-ui": "0.5.0-alpha.2",
"typography-theme-alton": "^0.16.19",
"typography-theme-anonymous": "^0.15.10",
"typography-theme-bootstrap": "^0.16.19",
Expand Down
8 changes: 4 additions & 4 deletions packages/editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/editor",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand All @@ -12,9 +12,9 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@theme-ui/components": "0.5.0-alpha.1",
"@theme-ui/components": "0.5.0-alpha.2",
"@theme-ui/css": "0.5.0-alpha.1",
"@theme-ui/style-guide": "0.5.0-alpha.1",
"@theme-ui/style-guide": "0.5.0-alpha.2",
"@types/react-color": "^2.17.3",
"color": "^3.1.2",
"react-color": "^2.18.0",
Expand All @@ -29,7 +29,7 @@
},
"devDependencies": {
"react": "^16.14.0",
"theme-ui": "0.5.0-alpha.1"
"theme-ui": "0.5.0-alpha.2"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/gatsby-theme-style-guide/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-theme-style-guide",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"main": "index.js",
"license": "MIT",
"peerDependencies": {
Expand All @@ -14,8 +14,8 @@
"react-dom": "^16.14.0"
},
"dependencies": {
"@theme-ui/style-guide": "0.5.0-alpha.1",
"theme-ui": "0.5.0-alpha.1"
"@theme-ui/style-guide": "0.5.0-alpha.2",
"theme-ui": "0.5.0-alpha.2"
},
"gitHead": "87e9ebb0cc66d8a5e1fcde7bb60f2077266aa437"
}
4 changes: 2 additions & 2 deletions packages/prism/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/prism",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"main": "dist/prism.js",
"module": "dist/prism.esm.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -37,6 +37,6 @@
"lodash.kebabcase": "^4.1.1",
"postcss": "^7.0.17",
"postcss-js": "^2.0.2",
"theme-ui": "0.5.0-alpha.1"
"theme-ui": "0.5.0-alpha.2"
}
}
4 changes: 2 additions & 2 deletions packages/sidenav/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/sidenav",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand All @@ -25,7 +25,7 @@
"@mdx-js/react": "^1.0.21",
"@types/mdx-js__react": "^1.5.1",
"deepmerge": "^4.0.0",
"theme-ui": "0.5.0-alpha.1"
"theme-ui": "0.5.0-alpha.2"
},
"keywords": [
"theme-ui",
Expand Down
4 changes: 2 additions & 2 deletions packages/style-guide/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@theme-ui/style-guide",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"main": "dist/index.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
Expand All @@ -24,7 +24,7 @@
},
"devDependencies": {
"react": "^16.14.0",
"theme-ui": "0.5.0-alpha.1"
"theme-ui": "0.5.0-alpha.2"
},
"publishConfig": {
"access": "public"
Expand Down
9 changes: 4 additions & 5 deletions packages/theme-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,20 @@
<strong>The Design Graph Framework</strong>
</p>


&nbsp;

<p align="center">
<a href="https://github.com/system-ui/theme-ui">
<img src="https://badgen.net/badge/-/github?icon=github&label" alt="GitHub" />
</a>
<a href="https://github.com/system-ui/theme-ui/stargazers">
<img src="https://badgen.net/github/stars/system-ui/theme-ui" alt="GitHub Stars">
<img src="https://badgen.net/github/stars/system-ui/theme-ui" alt="GitHub Stars"/>
</a>
<a>
<img alt="npm (latest)" src="https://img.shields.io/npm/v/theme-ui/latest">
<img alt="npm (latest)" src="https://img.shields.io/npm/v/theme-ui/latest"/>
</a>
<a>
<img alt="npm (next)" src="https://img.shields.io/npm/v/theme-ui/next?color=%23e044aa">
<img alt="npm (next)" src="https://img.shields.io/npm/v/theme-ui/next?color=%23e044aa"/>
</a>
<br />
<a href="https://github.com/system-ui/theme-ui/actions?query=workflow%3ACI">
Expand Down Expand Up @@ -58,7 +57,7 @@
/>
</a>
<a href="https://discord.gg/stp6BY7MXA">
<img src="https://img.shields.io/discord/778553042466635786?color=%237289da&logo=discord" alt="Join our Discord community">
<img src="https://img.shields.io/discord/778553042466635786?color=%237289da&logo=discord" alt="Join our Discord community"/>
</a>
</p>

Expand Down
4 changes: 2 additions & 2 deletions packages/theme-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theme-ui",
"version": "0.5.0-alpha.1",
"version": "0.5.0-alpha.2",
"description": "The Design Graph Framework",
"source": "src/index.ts",
"main": "dist/index.js",
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"@theme-ui/color-modes": "0.5.0-alpha.1",
"@theme-ui/components": "0.5.0-alpha.1",
"@theme-ui/components": "0.5.0-alpha.2",
"@theme-ui/core": "0.5.0-alpha.1",
"@theme-ui/css": "0.5.0-alpha.1",
"@theme-ui/mdx": "0.5.0-alpha.1",
Expand Down

0 comments on commit f2168cd

Please sign in to comment.