Skip to content

Commit bda0a44

Browse files
committed
Merge branch 'master' of github.com:cssinjs/jss
2 parents 88df193 + ddec3e5 commit bda0a44

File tree

9 files changed

+54
-47
lines changed

9 files changed

+54
-47
lines changed

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ Since you are interested in what happens next, in case, you work for a for-profi
44

55
---
66

7+
### Bug fixes
8+
9+
- [jss-plugin-vendor-prefixer] Correct prefixing of writing-mode property
10+
711
## 10.1.1 (2020-3-15)
812

913
### Bug fixes

packages/css-jss/.size-snapshot.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dist/css-jss.js": {
3-
"bundled": 58673,
4-
"minified": 20770,
5-
"gzipped": 7025
3+
"bundled": 59344,
4+
"minified": 21187,
5+
"gzipped": 7207
66
},
77
"dist/css-jss.min.js": {
8-
"bundled": 57622,
9-
"minified": 20176,
10-
"gzipped": 6756
8+
"bundled": 58293,
9+
"minified": 20592,
10+
"gzipped": 6939
1111
},
1212
"dist/css-jss.cjs.js": {
1313
"bundled": 2919,

packages/jss-plugin-vendor-prefixer/.size-snapshot.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dist/jss-plugin-vendor-prefixer.js": {
3-
"bundled": 18446,
4-
"minified": 6012,
5-
"gzipped": 2340
3+
"bundled": 19117,
4+
"minified": 6424,
5+
"gzipped": 2523
66
},
77
"dist/jss-plugin-vendor-prefixer.min.js": {
8-
"bundled": 18446,
9-
"minified": 6012,
10-
"gzipped": 2340
8+
"bundled": 19117,
9+
"minified": 6424,
10+
"gzipped": 2523
1111
},
1212
"dist/jss-plugin-vendor-prefixer.cjs.js": {
1313
"bundled": 1574,

packages/jss-plugin-vendor-prefixer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"dependencies": {
3636
"@babel/runtime": "^7.3.1",
37-
"css-vendor": "^2.0.7",
37+
"css-vendor": "^2.0.8",
3838
"jss": "10.1.1"
3939
},
4040
"devDependencies": {

packages/jss-preset-default/.size-snapshot.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dist/jss-preset-default.js": {
3-
"bundled": 55917,
4-
"minified": 20004,
5-
"gzipped": 6675
3+
"bundled": 56588,
4+
"minified": 20421,
5+
"gzipped": 6861
66
},
77
"dist/jss-preset-default.min.js": {
8-
"bundled": 54866,
9-
"minified": 19410,
10-
"gzipped": 6405
8+
"bundled": 55537,
9+
"minified": 19826,
10+
"gzipped": 6591
1111
},
1212
"dist/jss-preset-default.cjs.js": {
1313
"bundled": 1329,

packages/jss-starter-kit/.size-snapshot.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dist/jss-starter-kit.js": {
3-
"bundled": 71459,
4-
"minified": 30046,
5-
"gzipped": 9300
3+
"bundled": 72130,
4+
"minified": 30463,
5+
"gzipped": 9472
66
},
77
"dist/jss-starter-kit.min.js": {
8-
"bundled": 70408,
9-
"minified": 29450,
10-
"gzipped": 9033
8+
"bundled": 71079,
9+
"minified": 29867,
10+
"gzipped": 9212
1111
},
1212
"dist/jss-starter-kit.cjs.js": {
1313
"bundled": 2592,

packages/jss/src/index.d.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ import * as css from 'csstype'
44
type FnValue<R> = R | ((data: any) => R)
55

66
type NormalCssProperties = css.Properties<string | number>
7-
type CssProperties = {[K in keyof NormalCssProperties]: FnValue<NormalCssProperties[K]>}
7+
type CssProperties = {[K in keyof NormalCssProperties]: FnValue<NormalCssProperties[K] | JssValue>}
88

99
// Jss Style definitions
10-
type JssStyleP<S> = CssProperties & {
11-
[key: string]: FnValue<JssValue | S>
10+
type JssStyleP = {
11+
[key: string]: FnValue<JssValue | JssStyleP>
1212
}
1313

14-
export type JssStyle = JssStyleP<
15-
JssStyleP<JssStyleP<JssStyleP<JssStyleP<JssStyleP<JssStyleP<void>>>>>>
16-
>
14+
export type JssStyle = CssProperties & JssStyleP;
1715

1816
export type Styles<Name extends string | number | symbol = string> = Record<Name, JssStyle | string>
1917
export type Classes<Name extends string | number | symbol = string> = Record<Name, string>

packages/react-jss/.size-snapshot.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dist/react-jss.js": {
3-
"bundled": 168964,
4-
"minified": 58338,
5-
"gzipped": 19097
3+
"bundled": 169635,
4+
"minified": 58755,
5+
"gzipped": 19280
66
},
77
"dist/react-jss.min.js": {
8-
"bundled": 111999,
9-
"minified": 41597,
10-
"gzipped": 14133
8+
"bundled": 112670,
9+
"minified": 42014,
10+
"gzipped": 14308
1111
},
1212
"dist/react-jss.cjs.js": {
1313
"bundled": 25873,

yarn.lock

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -731,12 +731,12 @@
731731
dependencies:
732732
regenerator-runtime "^0.13.2"
733733

734-
"@babel/runtime@^7.6.2":
735-
version "7.6.2"
736-
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz#c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"
737-
integrity sha512-EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg==
734+
"@babel/runtime@^7.8.3":
735+
version "7.9.2"
736+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
737+
integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
738738
dependencies:
739-
regenerator-runtime "^0.13.2"
739+
regenerator-runtime "^0.13.4"
740740

741741
"@babel/template@^7.0.0":
742742
version "7.0.0"
@@ -3149,12 +3149,12 @@ css-initials@^0.3.1:
31493149
resolved "https://registry.yarnpkg.com/css-initials/-/css-initials-0.3.1.tgz#0406d78e586fd12b9984a3f7d8a87fcbb2073208"
31503150
integrity sha512-fkshKv9vV8AmcxkAWVQ9DmEAKiqe09GHdnFaXecp0NIfsGnXIHVJAHfsxdRy9KXV0/KiWdjBqrCYto2fYIO4xQ==
31513151

3152-
css-vendor@^2.0.7:
3153-
version "2.0.7"
3154-
resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz#4e6d53d953c187981576d6a542acc9fb57174bda"
3155-
integrity sha512-VS9Rjt79+p7M0WkPqcAza4Yq1ZHrsHrwf7hPL/bjQB+c1lwmAI+1FXxYTYt818D/50fFVflw0XKleiBN5RITkg==
3152+
css-vendor@^2.0.8:
3153+
version "2.0.8"
3154+
resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
3155+
integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==
31563156
dependencies:
3157-
"@babel/runtime" "^7.6.2"
3157+
"@babel/runtime" "^7.8.3"
31583158
is-in-browser "^1.0.2"
31593159

31603160
css.escape@^1.5.1:
@@ -7941,6 +7941,11 @@ regenerator-runtime@^0.13.2:
79417941
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
79427942
integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
79437943

7944+
regenerator-runtime@^0.13.4:
7945+
version "0.13.5"
7946+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
7947+
integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
7948+
79447949
regenerator-transform@^0.13.3:
79457950
version "0.13.3"
79467951
resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"

0 commit comments

Comments
 (0)