Support Prember, update node-fetch

- Prember is not sending protocol, need to check "undefined:"
- node-fetch 2.3 has AbortController support
- Fix issue when fetch(request) instead of fetch(url, options)

Author: xg-wang

fastboot/instance-initializers/setup-fetch.js

@@ -7,8 +7,10 @@ import setupFetch from 'fetch/setup';
 function patchFetchForRelativeURLs(instance) {
   const fastboot = instance.lookup('service:fastboot');
   const request = fastboot.get('request');
+  // Prember is not sending protocol
+  const protocol = request.protocol === 'undefined:' ? 'http:' : request.protocol;
   // host is cp
-  setupFetch(request.protocol, request.get('host'))();
+  setupFetch(protocol, request.get('host'))();
 }
 
 export default {

package.json

@@ -29,7 +29,7 @@
     "broccoli-stew": "^2.0.0",
     "broccoli-templater": "^2.0.1",
     "ember-cli-babel": "^6.8.2",
-    "node-fetch": "^2.0.0-alpha.9",
+    "node-fetch": "^2.3.0",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {

public/fastboot-fetch.js

@@ -7,22 +7,11 @@ define('fetch/setup', ['exports'], function(self) {
     'abortcontroller-polyfill/dist/cjs-ponyfill'
   );
   var nodeFetch = FastBoot.require('node-fetch');
-  var abortableFetch = AbortControllerPolyfill.abortableFetch({
-    fetch: nodeFetch,
-    Request: nodeFetch.Request
-  });
 
   self['default'] = function(protocol, host) {
     return function() {
       define('fetch', ['exports'], function(exports) {
-        /**
-         * Setup the exported fetch for a given origin so it can handle:
-         * - protocol-relative URL (//can-be-http-or-https.com/)
-         * - path-relative URL (/file/under/root)
-         * @param {String} url
-         * @param {Object} [options]
-         */
-        exports['default'] = function fetch(url, options) {
+        function buildAbsoluteUrl(url, protocol, host) {
           if (protocolRelativeRegex.test(url)) {
             url = host + url;
           } else if (!httpRegex.test(url)) {
@@ -33,9 +22,24 @@ define('fetch/setup', ['exports'], function(self) {
             }
             url = protocol + '//' + host + url;
           }
-          return abortableFetch.fetch(url, options);
+          return url;
+        }
+        /**
+         * Setup the exported fetch for a given origin so it can handle:
+         * - protocol-relative URL (//can-be-http-or-https.com/)
+         * - path-relative URL (/file/under/root)
+         * @param {String|Object} input
+         * @param {Object} [options]
+         */
+        exports['default'] = function fetch(input, options) {
+          if (typeof input === 'object') {
+            input.url = buildAbsoluteUrl(input.url, protocol, host);
+          } else {
+            input = buildAbsoluteUrl(input, protocol, host);
+          }
+          return nodeFetch(input, options);
         };
-        exports['Request'] = abortableFetch.Request;
+        exports['Request'] = nodeFetch.Request;
         exports['Headers'] = nodeFetch.Headers;
         exports['Response'] = nodeFetch.Response;
         exports['AbortController'] = AbortControllerPolyfill.AbortController;

yarn.lock

@@ -6967,7 +6967,7 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
-node-fetch@^2.0.0-alpha.9:
+node-fetch@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
   integrity sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==