Skip to content

Commit 50c74f1

Browse files
kofkof
authored
Fix the CI (#1194)
* bump safari ios to v10 * don't rerender rules in IE after detach if they are still in a valid CSSStyleSheet * bigger bundle requires more time to bootstrap the app * fix the keys in package.json * fix ios safari version * Update changelog.md
1 parent 2b2c1a0 commit 50c74f1

10 files changed

Lines changed: 66 additions & 61 deletions

File tree

‎browsers.json‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"BS_Safari": {
2+
"BS_Safari Yosemite": {
33
"base": "BrowserStack",
44
"os": "OS X",
55
"os_version": "Yosemite",
66
"browser": "safari",
77
"browser_version": "8.0"
88
},
9-
"BS_Safari": {
9+
"BS_Safari Mavericks": {
1010
"base": "BrowserStack",
1111
"os": "OS X",
1212
"os_version": "Mavericks",
1313
"browser": "safari",
1414
"browser_version": "7.0"
1515
},
16-
"BS_Chrome": {
16+
"BS_Chrome MacOS": {
1717
"base": "BrowserStack",
1818
"os": "OS X",
1919
"os_version": "Yosemite",
@@ -30,18 +30,11 @@
3030
"BS_MobileSafari": {
3131
"base": "BrowserStack",
3232
"os": "ios",
33-
"os_version": "8.0",
33+
"os_version": "10.3",
3434
"browser": "iphone",
3535
"real_mobile": false
3636
},
37-
"BS_MobileSafari": {
38-
"base": "BrowserStack",
39-
"os": "ios",
40-
"os_version": "9.0",
41-
"browser": "iphone",
42-
"real_mobile": false
43-
},
44-
"BS_Chrome": {
37+
"BS_Chrome Windows": {
4538
"base": "BrowserStack",
4639
"os": "Windows",
4740
"os_version": "8.1",

‎changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ 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] Fix dynamic rule updating after sheet re-attach in IE ([1194](https://github.com/cssinjs/jss/pull/1194))
10+
- [ci] Fix browsers.json, bump suported ios Safari to 10.3.
11+
712
## 10.0.0-alpha.25 (2019-9-16)
813

914
### Bug fixes

‎karma.conf.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ module.exports = config => {
5757
browserDisconnectTolerance: 3,
5858
// My current OS plan allows max 10 parallel connections.
5959
concurrency: 10,
60-
retryLimit: 5
60+
retryLimit: 5,
61+
browserNoActivityTimeout: 100000
6162
})
6263

6364
config.browserStack = {

‎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": 57609,
4-
"minified": 20272,
5-
"gzipped": 6826
3+
"bundled": 57635,
4+
"minified": 20287,
5+
"gzipped": 6833
66
},
77
"dist/css-jss.min.js": {
8-
"bundled": 56847,
9-
"minified": 19810,
10-
"gzipped": 6612
8+
"bundled": 56873,
9+
"minified": 19825,
10+
"gzipped": 6619
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": 17752,
4-
"minified": 5687,
5-
"gzipped": 2218
3+
"bundled": 17778,
4+
"minified": 5702,
5+
"gzipped": 2224
66
},
77
"dist/jss-plugin-vendor-prefixer.min.js": {
8-
"bundled": 17752,
9-
"minified": 5687,
10-
"gzipped": 2218
8+
"bundled": 17778,
9+
"minified": 5702,
10+
"gzipped": 2224
1111
},
1212
"dist/jss-plugin-vendor-prefixer.cjs.js": {
1313
"bundled": 1375,

‎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": 54853,
4-
"minified": 19506,
5-
"gzipped": 6479
3+
"bundled": 54879,
4+
"minified": 19521,
5+
"gzipped": 6486
66
},
77
"dist/jss-preset-default.min.js": {
8-
"bundled": 54091,
9-
"minified": 19044,
10-
"gzipped": 6264
8+
"bundled": 54117,
9+
"minified": 19059,
10+
"gzipped": 6271
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": 70395,
4-
"minified": 29546,
5-
"gzipped": 9102
3+
"bundled": 70421,
4+
"minified": 29561,
5+
"gzipped": 9109
66
},
77
"dist/jss-starter-kit.min.js": {
8-
"bundled": 69633,
9-
"minified": 29084,
10-
"gzipped": 8889
8+
"bundled": 69659,
9+
"minified": 29099,
10+
"gzipped": 8896
1111
},
1212
"dist/jss-starter-kit.cjs.js": {
1313
"bundled": 2592,

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
22
"dist/jss.js": {
3-
"bundled": 60687,
4-
"minified": 22508,
5-
"gzipped": 6791
3+
"bundled": 60970,
4+
"minified": 22613,
5+
"gzipped": 6824
66
},
77
"dist/jss.min.js": {
8-
"bundled": 59310,
9-
"minified": 21739,
10-
"gzipped": 6432
8+
"bundled": 59593,
9+
"minified": 21844,
10+
"gzipped": 6463
1111
},
1212
"dist/jss.cjs.js": {
13-
"bundled": 55476,
14-
"minified": 24408,
15-
"gzipped": 6785
13+
"bundled": 55751,
14+
"minified": 24513,
15+
"gzipped": 6812
1616
},
1717
"dist/jss.esm.js": {
18-
"bundled": 54944,
19-
"minified": 23973,
20-
"gzipped": 6695,
18+
"bundled": 55219,
19+
"minified": 24078,
20+
"gzipped": 6723,
2121
"treeshaked": {
2222
"rollup": {
23-
"code": 19736,
23+
"code": 19841,
2424
"import_statements": 352
2525
},
2626
"webpack": {
27-
"code": 21203
27+
"code": 21308
2828
}
2929
}
3030
}

‎packages/jss/src/DomRenderer.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,9 @@ export default class DomRenderer {
335335
insertStyle(this.element, this.sheet.options)
336336

337337
// When rules are inserted using `insertRule` API, after `sheet.detach().attach()`
338-
// browsers remove those rules.
339-
// TODO figure out if its a bug and if it is known.
340-
// Workaround is to redeploy the sheet.
341-
if (this.hasInsertedRules && !(this.sheet && !this.sheet.deployed)) {
338+
// most browsers create a new CSSStyleSheet, except of all IEs.
339+
const deployed = Boolean(this.sheet && this.sheet.deployed)
340+
if (this.hasInsertedRules && deployed) {
342341
this.hasInsertedRules = false
343342
this.deploy()
344343
}
@@ -397,6 +396,13 @@ export default class DomRenderer {
397396
return latestNativeParent
398397
}
399398

399+
// IE keeps the CSSStyleSheet after style node has been reattached,
400+
// so we need to check if the `renderable` reference the right style sheet and not
401+
// rerender those rules.
402+
if (rule.renderable && rule.renderable.parentStyleSheet === this.element.sheet) {
403+
return rule.renderable
404+
}
405+
400406
const ruleStr = rule.toString()
401407

402408
if (!ruleStr) return false

‎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": 169130,
4-
"minified": 58285,
5-
"gzipped": 19051
3+
"bundled": 169156,
4+
"minified": 58300,
5+
"gzipped": 19059
66
},
77
"dist/react-jss.min.js": {
8-
"bundled": 112454,
9-
"minified": 41676,
10-
"gzipped": 14130
8+
"bundled": 112480,
9+
"minified": 41691,
10+
"gzipped": 14139
1111
},
1212
"dist/react-jss.cjs.js": {
1313
"bundled": 27019,

0 commit comments

Comments
 (0)
⚡