Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/garronej/tss-react into main
Browse files Browse the repository at this point in the history
  • Loading branch information
garronej committed Aug 18, 2021
2 parents 9b0f9fc + 3689101 commit e53696c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
## **0.6.0** (2021-08-11)

- Merge pull request #10 from howlettt/readme-typos

Small readme typo fixes
- Small typo fixes
- Add SSR support for mui v4
- Improve muiv5 integration testing
- Improve cache support
- Switching to a sollution that works today
- Custom cache integration with mui and SSR
- Ability to provide cache explicitely
- Fix workflow
- Publish beta version with emotion as peer dep

### **0.5.2** (2021-08-08)


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This module is a tinny extension for [`@emotion/react`](https://emotion.sh/docs/
with mui's `makeStyles`)
- ✅ As lightweight as [`@emotion/react`](https://emotion.sh/docs/@emotion/react).
- ✅ Server side rendering support (e.g: Next.js).
- ✅ Seamless integration with [material-ui](https://material-ui.com) v5.
- ✅ Seamless integration with [material-ui](https://material-ui.com) v5 and v4.
Perfect for those who don't like [the switch from the Hook API to the Styled API](https://github.com/mui-org/material-ui/issues/24513#issuecomment-763921350) in v5.
- ✅ Complete `@emotion` custom cache integration.

Expand Down

0 comments on commit e53696c

Please sign in to comment.