Skip to content

Commit 21ebc6a

Browse files
eps1lonEsoterikStare
authored andcommitted
[docs] Switch to cross-fetch (mui#19644)
1 parent bbca056 commit 21ebc6a

File tree

8 files changed

+38
-67
lines changed

8 files changed

+38
-67
lines changed

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"clsx": "^1.0.2",
6464
"core-js": "^2.6.11",
6565
"cross-env": "^7.0.0",
66+
"cross-fetch": "^3.0.4",
6667
"css-loader": "^3.1.0",
6768
"css-mediaquery": "^0.1.2",
6869
"date-fns": "2.9.0",
@@ -73,7 +74,6 @@
7374
"final-form": "^4.18.5",
7475
"flexsearch": "^0.6.30",
7576
"fs-extra": "^8.1.0",
76-
"isomorphic-fetch": "^2.2.1",
7777
"json2mq": "^0.2.0",
7878
"jss": "^10.0.3",
7979
"jss-plugin-template": "^10.0.3",
@@ -103,7 +103,7 @@
103103
"react-router": "^5.0.0",
104104
"react-router-dom": "^5.0.1",
105105
"react-spring": "^8.0.27",
106-
"react-swipeable-views": "^0.13.3",
106+
"react-swipeable-views": "^0.13.9",
107107
"react-text-mask": "^5.0.2",
108108
"react-virtualized": "^9.21.1",
109109
"react-window": "^1.8.5",

docs/pages/versions.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import orderBy from 'lodash/orderBy';
33
import sortedUniqBy from 'lodash/sortedUniqBy';
44
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
5+
import fetch from 'cross-fetch';
56

67
const req = require.context('docs/src/pages/versions', false, /\.(md|js|tsx)$/);
78
const reqSource = require.context('!raw-loader!../src/pages/versions', false, /\.(js|tsx)$/);
@@ -12,12 +13,13 @@ export default function Page() {
1213
}
1314

1415
async function getBranches() {
16+
const githubAuthorizationToken = process.env.GITHUB_AUTH || '';
17+
1518
const result = await fetch('https://api.github.com/repos/mui-org/material-ui-docs/branches', {
1619
headers: {
17-
Authorization: `Basic ${Buffer.from(process.env.GITHUB_AUTH).toString('base64')}`,
20+
Authorization: `Basic ${Buffer.from(githubAuthorizationToken).toString('base64')}`,
1821
},
1922
});
20-
// console.log('headers', result.headers);
2123
const branches = await result.json();
2224
return branches;
2325
}

docs/scripts/updateIconSynonyms.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-console */
2-
import 'isomorphic-fetch';
2+
import fetch from 'cross-fetch';
33
import fse from 'fs-extra';
44
import path from 'path';
55
import synonyms from 'docs/src/pages/components/material-icons/synonyms';

docs/src/modules/components/Notifications.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable react/no-danger, react-hooks/exhaustive-deps */
2-
import 'isomorphic-fetch';
2+
import fetch from 'cross-fetch';
33
import React from 'react';
44
import { useSelector } from 'react-redux';
55
import Button from '@material-ui/core/Button';

docs/src/pages/components/autocomplete/Asynchronous.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// *https://www.registers.service.gov.uk/registers/country/use-the-api*
2-
import 'isomorphic-fetch';
2+
import fetch from 'cross-fetch';
33
import React from 'react';
44
import TextField from '@material-ui/core/TextField';
55
import Autocomplete from '@material-ui/lab/Autocomplete';

docs/src/pages/components/autocomplete/Asynchronous.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// *https://www.registers.service.gov.uk/registers/country/use-the-api*
2-
import 'isomorphic-fetch';
2+
import fetch from 'cross-fetch';
33
import React from 'react';
44
import TextField from '@material-ui/core/TextField';
55
import Autocomplete from '@material-ui/lab/Autocomplete';

packages/material-ui-icons/scripts/download.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable no-console */
2-
import 'isomorphic-fetch';
2+
import fetch from 'cross-fetch';
33
import fse from 'fs-extra';
44
import path from 'path';
55
import yargs from 'yargs';

yarn.lock

Lines changed: 27 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4921,11 +4921,6 @@ [email protected]:
49214921
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
49224922
integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==
49234923

4924-
core-js@^1.0.0:
4925-
version "1.2.7"
4926-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
4927-
integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
4928-
49294924
core-js@^2.4.0, core-js@^2.6.10, core-js@^2.6.11, core-js@^2.6.5:
49304925
version "2.6.11"
49314926
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
@@ -5040,6 +5035,14 @@ cross-env@^7.0.0:
50405035
dependencies:
50415036
cross-spawn "^7.0.1"
50425037

5038+
cross-fetch@^3.0.4:
5039+
version "3.0.4"
5040+
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.4.tgz#7bef7020207e684a7638ef5f2f698e24d9eb283c"
5041+
integrity sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==
5042+
dependencies:
5043+
node-fetch "2.6.0"
5044+
whatwg-fetch "3.0.0"
5045+
50435046
cross-spawn-async@^1.0.1:
50445047
version "1.0.1"
50455048
resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-1.0.1.tgz#bb525c1e420d9942552e04791a3eb2d9887a105f"
@@ -6827,19 +6830,6 @@ fast-levenshtein@~2.0.4:
68276830
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
68286831
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
68296832

6830-
fbjs@^0.8.4:
6831-
version "0.8.17"
6832-
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
6833-
integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
6834-
dependencies:
6835-
core-js "^1.0.0"
6836-
isomorphic-fetch "^2.1.1"
6837-
loose-envify "^1.0.0"
6838-
object-assign "^4.1.0"
6839-
promise "^7.1.1"
6840-
setimmediate "^1.0.5"
6841-
ua-parser-js "^0.7.18"
6842-
68436833
fd-slicer@~1.0.1:
68446834
version "1.0.1"
68456835
resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
@@ -8575,7 +8565,7 @@ is-ssh@^1.3.0:
85758565
dependencies:
85768566
protocols "^1.1.0"
85778567

8578-
is-stream@^1.0.1, is-stream@^1.1.0:
8568+
is-stream@^1.1.0:
85798569
version "1.1.0"
85808570
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
85818571
integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -8690,14 +8680,6 @@ isobject@^4.0.0:
86908680
resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
86918681
integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
86928682

8693-
isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
8694-
version "2.2.1"
8695-
resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
8696-
integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
8697-
dependencies:
8698-
node-fetch "^1.0.1"
8699-
whatwg-fetch ">=0.10.0"
8700-
87018683
isstream@~0.1.2:
87028684
version "0.1.2"
87038685
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -10568,19 +10550,11 @@ [email protected]:
1056810550
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
1056910551
integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==
1057010552

10571-
"node-fetch@^ 2.6.0", node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0:
10553+
[email protected], "node-fetch@^ 2.6.0", node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0:
1057210554
version "2.6.0"
1057310555
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
1057410556
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
1057510557

10576-
node-fetch@^1.0.1:
10577-
version "1.7.3"
10578-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
10579-
integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
10580-
dependencies:
10581-
encoding "^0.1.11"
10582-
is-stream "^1.0.1"
10583-
1058410558
node-gyp@^5.0.2:
1058510559
version "5.0.3"
1058610560
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.3.tgz#80d64c23790244991b6d44532f0a351bedd3dd45"
@@ -12058,7 +12032,7 @@ [email protected]:
1205812032
dependencies:
1205912033
asap "~2.0.3"
1206012034

12061-
promise@^7.0.1, promise@^7.1.1:
12035+
promise@^7.0.1:
1206212036
version "7.3.1"
1206312037
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
1206412038
integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
@@ -12550,27 +12524,27 @@ react-swipeable-views-core@^0.13.7:
1255012524
"@babel/runtime" "7.0.0"
1255112525
warning "^4.0.1"
1255212526

12553-
react-swipeable-views-utils@^0.13.7:
12554-
version "0.13.7"
12555-
resolved "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.13.7.tgz#c939eca03bfcfb4cc6aea4088859407146ef82cd"
12556-
integrity sha512-XdHWE2Ea9uBJeI3U7KHZ8pVG/OpcE0lAg6n6mBCXgYFFMCbizU0OXOhPHwf9zsjnt78ClK1Oof2jeluHwhTI3g==
12527+
react-swipeable-views-utils@^0.13.9:
12528+
version "0.13.9"
12529+
resolved "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.13.9.tgz#a66e98f2f4502d8b00182901f80d13b2f903e10f"
12530+
integrity sha512-QLGxRKrbJCbWz94vkWLzb1Daaa2Y/TZKmsNKQ6WSNrS+chrlfZ3z9tqZ7YUJlW6pRWp3QZdLSY3UE3cN0TXXmw==
1255712531
dependencies:
1255812532
"@babel/runtime" "7.0.0"
12559-
fbjs "^0.8.4"
1256012533
keycode "^2.1.7"
1256112534
prop-types "^15.6.0"
1256212535
react-event-listener "^0.6.0"
1256312536
react-swipeable-views-core "^0.13.7"
12537+
shallow-equal "^1.2.1"
1256412538

12565-
react-swipeable-views@^0.13.3:
12566-
version "0.13.8"
12567-
resolved "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.13.8.tgz#342ca09d88a1875b4e729e59988f6f5bc4cce97b"
12568-
integrity sha512-9XsHYNoSyNwmhnjgkS8/JSH2nVmQYzSRBUK8jx7lD0Cs5dEWDxbSHXbMOc1PpqbNkiGsjoR72dn4wVWDgJ0itw==
12539+
react-swipeable-views@^0.13.9:
12540+
version "0.13.9"
12541+
resolved "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.13.9.tgz#d6a6c508bf5288ad55509f9c65916db5df0f2cec"
12542+
integrity sha512-WXC2FKYvZ9QdJ31v9LjEJEl1bA7E4AcaloTkbW0uU0dYf5uvv4aOpiyxubvOkVl1a5L2UAHmKSif4TmJ9usrSg==
1256912543
dependencies:
1257012544
"@babel/runtime" "7.0.0"
1257112545
prop-types "^15.5.4"
1257212546
react-swipeable-views-core "^0.13.7"
12573-
react-swipeable-views-utils "^0.13.7"
12547+
react-swipeable-views-utils "^0.13.9"
1257412548
warning "^4.0.1"
1257512549

1257612550
react-test-renderer@^16.0.0-0, react-test-renderer@^16.12.0:
@@ -13552,7 +13526,7 @@ set-value@^2.0.0, set-value@^2.0.1:
1355213526
is-plain-object "^2.0.3"
1355313527
split-string "^3.0.1"
1355413528

13555-
setimmediate@^1.0.4, setimmediate@^1.0.5, setimmediate@~1.0.4:
13529+
setimmediate@^1.0.4, setimmediate@~1.0.4:
1355613530
version "1.0.5"
1355713531
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
1355813532
integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -13582,10 +13556,10 @@ shallow-clone@^3.0.0:
1358213556
dependencies:
1358313557
kind-of "^6.0.2"
1358413558

13585-
shallow-equal@^1.2.0:
13586-
version "1.2.0"
13587-
resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.0.tgz#fd828d2029ff4e19569db7e19e535e94e2d1f5cc"
13588-
integrity sha512-Z21pVxR4cXsfwpMKMhCEIO1PCi5sp7KEp+CmOpBQ+E8GpHwKOw2sEzk7sgblM3d/j4z4gakoWEoPcjK0VJQogA==
13559+
shallow-equal@^1.2.0, shallow-equal@^1.2.1:
13560+
version "1.2.1"
13561+
resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
13562+
integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==
1358913563

1359013564
shallowequal@^1.1.0:
1359113565
version "1.1.0"
@@ -14870,11 +14844,6 @@ typescript@next:
1487014844
resolved "https://registry.npmjs.org/typescript/-/typescript-3.3.0-dev.20190112.tgz#7d0485527d10db1acbfbc6f87bcd8541ec71c32f"
1487114845
integrity sha512-aEfjOBzSPfd/sxQwEz6y+xl8+bYmGb2zl+sGIoJUNaKV+xk/Cf4bWtTlHcP/sTBRDQoE4iCT2gZZBmxfe3hWyg==
1487214846

14873-
ua-parser-js@^0.7.18:
14874-
version "0.7.19"
14875-
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
14876-
integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
14877-
1487814847
uglify-js@^3.1.4:
1487914848
version "3.7.2"
1488014849
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9"
@@ -15458,7 +15427,7 @@ whatwg-encoding@^1.0.5:
1545815427
dependencies:
1545915428
iconv-lite "0.4.24"
1546015429

15461-
whatwg-fetch@>=0.10.0:
15430+
whatwg-fetch@3.0.0:
1546215431
version "3.0.0"
1546315432
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
1546415433
integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==

0 commit comments

Comments
 (0)