Skip to content

Commit 560b166

Browse files
author
Henri Beck
committed
Merge branch 'master' into udpate-ts-typings
* master: (50 commits) v10.0.0-alpha.22 add react-dom dev dependenncy Fix SSR for Hooks based implementation (#1148) React-JSS id prop docs and improvements (#1147) v10.0.0-alpha.21 fix changelog add support hint to the changelog (#1145) Sheets management for css() (#1137) Update css-vendor to 2.0.5 (#1142) more articles Small readability improvements (#1138) create sponsors.md (#1139) update karma settings Update css-vendor to 2.0.4 (#1136) v10.0.0-alpha.20 fixing release v10.0.0-alpha.19 fix lerna force-publish flag many more tests and some improvements to styped interface (#1133) v10.0.0-alpha.18 ... # Conflicts: # packages/react-jss/src/index.d.ts
2 parents a9881d9 + 9427ea5 commit 560b166

91 files changed

Lines changed: 2544 additions & 835 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.flowconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@
66

77
[options]
88
include_warnings=true
9-
esproposal.export_star_as=enable
9+
esproposal.export_star_as=enable
10+
suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
11+
suppress_comment= \\(.\\|\n\\)*\\$FlowIgnore

changelog.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
1+
## Next
2+
3+
Since you are interested in what happens next, in case, you work for a for-profit company that benefits from using the project, please consider supporting it on https://opencollective.com/jss.
4+
5+
---
6+
7+
## 10.0.0-alpha.22 (2019-7-2)
8+
9+
### Breaking Changes
10+
11+
- [jss] SheetsRegistry.toString(options) will now return all sheets by default, no matter detached or attached. You can specify which one you want by using the option `registry.toString({attached: true})` ([1140](https://github.com/cssinjs/jss/pull/1140))
12+
13+
### Bug fixes
14+
15+
- [react-jss] SSR for the hooks based API will now work with the registry as expected ([1140](https://github.com/cssinjs/jss/pull/1140))
16+
- [react-jss] When id options passed to JssProvider, we need to create a new `generateId` function ([#1147](https://github.com/cssinjs/jss/pull/1147))
17+
18+
### Improvements
19+
20+
- [react-jss] Document `id` prop for JssProvider, add "Class name generator options" to the docs. ([#1147](https://github.com/cssinjs/jss/pull/1147))
21+
- [react-jss] Use component name or displayName as a class name prefix also in production by default ([#1147](https://github.com/cssinjs/jss/pull/1147))
22+
23+
## 10.0.0-alpha.21 (2019-6-22)
24+
25+
### Bug fixes
26+
27+
- [jss-plugin-vendor-prefixer] Upgrade css-vendor package to v2.0.5 ([#1142](https://github.com/cssinjs/jss/pull/1142))
28+
- [css-jss] Slows down in benchmark after 10k rules ([#1137](https://github.com/cssinjs/jss/pull/1137))
29+
30+
## 10.0.0-alpha.20 (2019-6-17)
31+
32+
### Bug Fixes
33+
34+
- [react-jss] Experimental styled API got some fixes and many more tests ([#1118](https://github.com/cssinjs/jss/pull/1118))
35+
36+
## 10.0.0-alpha.18 (2019-6-14)
37+
38+
### Features
39+
40+
- [react-jss] New experimental styled API (undocumented intentionally)([#1094](https://github.com/cssinjs/jss/pull/1094))
41+
- [react-jss] JSX pragma for css prop (undocumented intentionally)([#1130](https://github.com/cssinjs/jss/pull/1130))
42+
- [css-jss] New experimental css() API (undocumented intentionally)([#1129](https://github.com/cssinjs/jss/pull/1129))
43+
44+
### Bug fixes
45+
46+
- [jss] After attempting to insert an invalid rule, JSS is now able to insert a valid one ([#1123](https://github.com/cssinjs/jss/pull/1123))
47+
- [react-jss] Fix TS type optional `theming` property ([#1121](https://github.com/cssinjs/jss/pull/1121))
48+
- [react-jss] Export useTheme in TypeScript declaration ([#1124](https://github.com/cssinjs/jss/pull/1124))
49+
150
## 10.0.0-alpha.17 (2019-6-7)
251

352
### Features

docs/articles.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# A hand-picked selection of articles
22

3+
## By maintainers
4+
5+
https://medium.com/dailyjs/what-is-actually-css-in-js-f2f529a2757
6+
7+
https://medium.com/free-code-camp/the-tradeoffs-of-css-in-js-bee5cf926fdb
8+
9+
https://medium.com/@oleg008/template-strings-vs-objects-in-cssinjs-4028ecc420b2
10+
11+
https://medium.com/@oleg008/inline-styles-vs-css-f8c1c926bb63
12+
13+
## By community
14+
315
https://medium.com/seek-blog/a-unified-styling-language-d0c208de2660
416

517
https://byjoeybaker.com/react-inline-styles

docs/jss-api.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,19 @@ You need to have the [jss-plugin-global](https://github.com/cssinjs/jss/tree/mas
119119
`SheetsRegistry`
120120

121121
When rendering on the server, you will need to get all rendered styles as a CSS string.
122-
The `SheetsRegistry` class allows you to **manually** aggregate and stringify them. Read [more about SSR](ssr.md).
122+
The `SheetsRegistry` class allows you to aggregate and stringify them. Read [more about SSR](ssr.md).
123+
124+
In case you are using the `SheetsRegistry` in the browser and you want to get Style Sheets which are `attached` or `detached` only, you can use the option `attached`.
123125

124126
```javascript
125127
import jss, {SheetsRegistry} from 'jss'
126128

127129
const sheets = new SheetsRegistry()
128130
const sheet = jss.createStyleSheet()
129131
sheets.add(sheet)
130-
sheets.toString() // Returns CSS of all attached Style Sheets together.
132+
sheets.toString() // Returns all Style Sheets as a CSS string.
133+
sheets.toString({attached: true}) // Returns all attached Style Sheets as a CSS string.
134+
sheets.toString({attached: false}) // Returns all detached Style Sheets as a CSS string.
131135
```
132136

133137
## Style Sheets Manager

0 commit comments

Comments
 (0)