Switching from isomporphic-fetch to cross-fetch polyfill.

Martin Krulis · Martin Kruliš · commit 4a90134cb13a · 2021-06-18T21:01:45.000+02:00
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
     "classnames": "^2.2.5",
     "codemirror": "^5.58.2",
     "cookie-parser": "^1.4.1",
+    "cross-fetch": "^3.1.4",
     "css-loader": "^5.2.6",
     "deep-equal": "^2.0.1",
     "ejs": "^2.6.1",
@@ -58,7 +59,6 @@
     "global": "^4.3.1",
     "highlight.js": "^10.4.1",
     "immutable": "^3.8.2",
-    "isomorphic-fetch": "^3.0.0",
     "jwt-decode": "^2.2.0",
     "markdown-it": "^8.4.1",
     "moment": "^2.24.0",
@@ -132,7 +132,6 @@
     "file-loader": "^6.2.0",
     "git-revision-webpack-plugin": "^5.0.0",
     "image-webpack-loader": "^7.0.1",
-    "isomorphic-fetch": "^3.0.0",
     "isomorphic-style-loader": "^5.1.0",
     "jsdom": "^16.6.0",
     "json-loader": "^0.5.4",
diff --git a/src/client.js b/src/client.js
@@ -1,4 +1,4 @@
-import 'isomorphic-fetch';
+import 'cross-fetch/polyfill';
 
 import React from 'react';
 import { render } from 'react-dom';
diff --git a/src/server.js b/src/server.js
@@ -1,5 +1,5 @@
 // necessary polyfill for both browser and server
-import 'isomorphic-fetch';
+import 'cross-fetch/polyfill';
 
 // server setup
 import React from 'react';
diff --git a/test/setup.js b/test/setup.js
@@ -1,6 +1,6 @@
 import { JSDOM } from 'jsdom';
 import 'mock-local-storage';
-import 'isomorphic-fetch';
+import 'cross-fetch/polyfill';
 
 global.document = new JSDOM('<!doctype html><html><body></body></html>');
 global.window = global.document.window;
diff --git a/yarn.lock b/yarn.lock
@@ -3862,6 +3862,13 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cross-fetch@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
+  integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
+  dependencies:
+    node-fetch "2.6.1"
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -7263,14 +7270,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-fetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4"
-  integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==
-  dependencies:
-    node-fetch "^2.6.1"
-    whatwg-fetch "^3.4.1"
-
 isomorphic-style-loader@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/isomorphic-style-loader/-/isomorphic-style-loader-5.1.0.tgz#4845f90bb9828f3dfecc82d0574c9ed01bbaba2d"
@@ -8423,7 +8422,7 @@ node-environment-flags@^1.0.5:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
-node-fetch@^2.6.1:
+node-fetch@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -12045,11 +12044,6 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@^3.4.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
-  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
-
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'isomorphic-fetch';`
	`1`	`+import 'cross-fetch/polyfill';`
`2`	`2`
`3`	`3`	`import React from 'react';`
`4`	`4`	`import { render } from 'react-dom';`