Skip to content

Commit 78130ee

Browse files
committed
rollback jsdom for localstorage compat
1 parent 8f92867 commit 78130ee

File tree

2 files changed

+40
-28
lines changed

2 files changed

+40
-28
lines changed

scripts/jest/config.base.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,11 @@ module.exports = {
2121
collectCoverageFrom: ['packages/**/*.js'],
2222
timers: 'fake',
2323
snapshotSerializers: [require.resolve('jest-snapshot-serializer-raw')],
24+
// Jest changed from `about:blank` to `http://localhost` default in 24.5 (https://github.com/facebook/jest/pull/6792)
25+
// in order to address https://github.com/facebook/jest/issues/6766. If one uses `about:blank` in [email protected] or
26+
// newer, it fails with `SecurityError: localStorage is not available for opaque origins`. However, some of React's
27+
// tests depend on `about:blank` being the domain (for e.g. `url` in `img` tags). So we set `about:blank` here to
28+
// keep the current behavior and make sure to keep the version of JSDOM to version lower than 11.12. This will have
29+
// to be addressed properly when Jest 25 is released, as it will come with a newer version of JSDOM.
30+
testURL: 'about:blank',
2431
};

yarn.lock

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,11 @@
531531
lodash.unescape "4.0.1"
532532
semver "5.5.0"
533533

534+
abab@^1.0.4:
535+
version "1.0.4"
536+
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
537+
integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=
538+
534539
abab@^2.0.0:
535540
version "2.0.0"
536541
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
@@ -559,7 +564,7 @@ acorn-walk@^6.0.1:
559564
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
560565
integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
561566

562-
acorn@^5.2.1, acorn@^5.5.3:
567+
acorn@^5.2.1, acorn@^5.3.0:
563568
version "5.7.3"
564569
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
565570
integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
@@ -1690,10 +1695,10 @@ [email protected], "cssom@>= 0.3.2 < 0.4.0":
16901695
resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
16911696
integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
16921697

1693-
cssstyle@^1.0.0:
1694-
version "1.4.0"
1695-
resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
1696-
integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
1698+
"cssstyle@>= 0.3.1 < 0.4.0":
1699+
version "0.3.1"
1700+
resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.3.1.tgz#6da9b4cff1bc5d716e6e5fe8e04fcb1b50a49adf"
1701+
integrity sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==
16971702
dependencies:
16981703
cssom "0.3.x"
16991704

@@ -1875,7 +1880,7 @@ doctrine@^3.0.0:
18751880
dependencies:
18761881
esutils "^2.0.2"
18771882

1878-
domexception@^1.0.1:
1883+
domexception@^1.0.0:
18791884
version "1.0.1"
18801885
resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
18811886
integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
@@ -1976,7 +1981,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
19761981
version "1.0.5"
19771982
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
19781983

1979-
escodegen@^1.9.1:
1984+
escodegen@^1.9.0:
19801985
version "1.11.1"
19811986
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
19821987
integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
@@ -3676,35 +3681,34 @@ jsbn@~0.1.0:
36763681
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
36773682

36783683
jsdom@^11.5.1:
3679-
version "11.12.0"
3680-
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
3681-
integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
3684+
version "11.11.0"
3685+
resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e"
36823686
dependencies:
3683-
abab "^2.0.0"
3684-
acorn "^5.5.3"
3687+
abab "^1.0.4"
3688+
acorn "^5.3.0"
36853689
acorn-globals "^4.1.0"
36863690
array-equal "^1.0.0"
36873691
cssom ">= 0.3.2 < 0.4.0"
3688-
cssstyle "^1.0.0"
3692+
cssstyle ">= 0.3.1 < 0.4.0"
36893693
data-urls "^1.0.0"
3690-
domexception "^1.0.1"
3691-
escodegen "^1.9.1"
3694+
domexception "^1.0.0"
3695+
escodegen "^1.9.0"
36923696
html-encoding-sniffer "^1.0.2"
3693-
left-pad "^1.3.0"
3694-
nwsapi "^2.0.7"
3697+
left-pad "^1.2.0"
3698+
nwsapi "^2.0.0"
36953699
parse5 "4.0.0"
36963700
pn "^1.1.0"
3697-
request "^2.87.0"
3701+
request "^2.83.0"
36983702
request-promise-native "^1.0.5"
36993703
sax "^1.2.4"
37003704
symbol-tree "^3.2.2"
3701-
tough-cookie "^2.3.4"
3705+
tough-cookie "^2.3.3"
37023706
w3c-hr-time "^1.0.1"
37033707
webidl-conversions "^4.0.2"
37043708
whatwg-encoding "^1.0.3"
37053709
whatwg-mimetype "^2.1.0"
37063710
whatwg-url "^6.4.1"
3707-
ws "^5.2.0"
3711+
ws "^4.0.0"
37083712
xml-name-validator "^3.0.0"
37093713

37103714
jsesc@^1.3.0:
@@ -3821,7 +3825,7 @@ [email protected]:
38213825
version "0.0.10"
38223826
resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
38233827

3824-
left-pad@^1.3.0:
3828+
left-pad@^1.2.0:
38253829
version "1.3.0"
38263830
resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
38273831
integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
@@ -4231,7 +4235,7 @@ number-is-nan@^1.0.0:
42314235
version "1.0.1"
42324236
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
42334237

4234-
nwsapi@^2.0.7:
4238+
nwsapi@^2.0.0:
42354239
version "2.1.4"
42364240
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
42374241
integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
@@ -4830,7 +4834,7 @@ [email protected]:
48304834
tunnel-agent "~0.4.1"
48314835
uuid "^3.0.0"
48324836

4833-
request@^2.87.0:
4837+
request@^2.83.0:
48344838
version "2.88.0"
48354839
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
48364840
integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -5565,7 +5569,7 @@ to-regex@^3.0.1, to-regex@^3.0.2:
55655569
regex-not "^1.0.2"
55665570
safe-regex "^1.1.0"
55675571

5568-
tough-cookie@^2.3.3, tough-cookie@^2.3.4:
5572+
tough-cookie@^2.3.3:
55695573
version "2.5.0"
55705574
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
55715575
integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -5884,12 +5888,13 @@ [email protected]:
58845888
dependencies:
58855889
mkdirp "^0.5.1"
58865890

5887-
ws@^5.2.0:
5888-
version "5.2.2"
5889-
resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
5890-
integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
5891+
ws@^4.0.0:
5892+
version "4.1.0"
5893+
resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
5894+
integrity sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==
58915895
dependencies:
58925896
async-limiter "~1.0.0"
5897+
safe-buffer "~5.1.0"
58935898

58945899
xml-name-validator@^3.0.0:
58955900
version "3.0.0"

0 commit comments

Comments
 (0)