Remove isomorphic-fetch in favor of node-fetch + whatwg-fetch (#1339)

Author: koistya

package.json

@@ -30,7 +30,7 @@
     "history": "^4.6.3",
     "isomorphic-style-loader": "^2.0.0",
     "jsonwebtoken": "^7.4.1",
-    "node-fetch": "^1.6.3",
+    "node-fetch": "^1.7.1",
     "normalize.css": "^7.0.0",
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",

src/client.js

@@ -7,6 +7,7 @@
  * LICENSE.txt file in the root directory of this source tree.
  */
 
+import 'whatwg-fetch';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router } from 'react-router';
@@ -33,7 +34,7 @@ const context = {
     return () => { removeCss.forEach(f => f()); };
   },
   // Universal HTTP client
-  fetch: createFetch({
+  fetch: createFetch(self.fetch, {
     baseUrl: window.App.apiUrl,
   }),
   // Initialize a new Redux store

src/createFetch.js

@@ -9,7 +9,7 @@
 
 /* @flow */
 
-import fetch from 'isomorphic-fetch';
+type Fetch = (url: string, options: ?any) => Promise<any>;
 
 type Options = {
   baseUrl: string,
@@ -22,7 +22,7 @@ type Options = {
  * of boilerplate code in the application.
  * https://developer.mozilla.org/docs/Web/API/Fetch_API/Using_Fetch
  */
-function createFetch({ baseUrl, cookie }: Options) {
+function createFetch(fetch: Fetch, { baseUrl, cookie }: Options) {
   // NOTE: Tweak the default options to suite your application needs
   const defaults = {
     method: 'POST', // handy with GraphQL backends
@@ -35,7 +35,7 @@ function createFetch({ baseUrl, cookie }: Options) {
     },
   };
 
-  return (url, options) => ((url.startsWith('/graphql') || url.startsWith('/api')) ?
+  return (url: string, options: any) => ((url.startsWith('/graphql') || url.startsWith('/api')) ?
     fetch(`${baseUrl}${url}`, {
       ...defaults,
       ...options,

src/server.js

@@ -14,6 +14,7 @@ import bodyParser from 'body-parser';
 import expressJwt, { UnauthorizedError as Jwt401Error } from 'express-jwt';
 import expressGraphQL from 'express-graphql';
 import jwt from 'jsonwebtoken';
+import fetch from 'node-fetch';
 import React from 'react';
 import { StaticRouter } from 'react-router';
 import ReactDOM from 'react-dom/server';
@@ -116,7 +117,7 @@ app.get('*', async (req, res, next) => {
   try {
     const css = new Set();
 
-    const fetch = createFetch({
+    const fetch = createFetch(fetch, {
       baseUrl: config.api.serverUrl,
       cookie: req.headers.cookie,
     });

yarn.lock

@@ -2283,8 +2283,8 @@ ejs@^2.5.6:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
-  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
+  version "1.3.15"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz#08397934891cbcfaebbd18b82a95b5a481138369"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -3817,7 +3817,7 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
   dependencies:
@@ -3902,8 +3902,8 @@ js-base64@^2.1.9:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
 js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
 js-yaml@^3.4.3, js-yaml@^3.4.6, js-yaml@^3.5.1:
   version "3.8.4"
@@ -4721,7 +4721,7 @@ [email protected]:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
-node-fetch@^1.0.1:
+node-fetch@^1.0.1, node-fetch@^1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.1.tgz#899cb3d0a3c92f952c47f1b876f4c8aeabd400d5"
   dependencies:
@@ -7531,7 +7531,7 @@ weinre@^2.0.0-pre-I0Z7U9OV:
     nopt "3.0.x"
     underscore "1.7.x"
 
-whatwg-fetch@>=0.10.0:
+whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"