Add abortController to export prop, rename option

ember-cli · May 17, 2018 · 07fee4e · 07fee4e
1 parent ae7be04
commit 07fee4e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/assets/browser-fetch.js.t b/assets/browser-fetch.js.t
@@ -14,10 +14,11 @@
       'fetch',
       'Headers',
       'Request',
-      'Response'
+      'Response',
+      'AbortController'
     ];
     var combinedProps = supportProps;
-    if (!forcePolyfill) {
+    if (preferNative) {
       combinedProps = supportProps.concat(polyfillProps);
     }
     combinedProps.forEach(function(prop) {
@@ -44,7 +45,7 @@
       self['default'] = function() {
         pending++;
 
-        return self.fetch.apply(forcePolyfill ? self : global, arguments).then(function(response){
+        return self.fetch.apply(preferNative ? global : self, arguments).then(function(response){
           response.clone().blob().then(decrement, decrement);
           return response;
         }, function(reason) {

diff --git a/index.js b/index.js
@@ -75,15 +75,16 @@ module.exports = {
       } while (current.parent.parent && (current = current.parent));
     }
 
-    this.buildConfig = target.options['ember-fetch'] || {forcePolyfill: true};
+    this.buildConfig = target.options['ember-fetch'] || { preferNative: false };
 
     target.import('vendor/ember-fetch.js', {
       exports: {
         default: [
           'default',
           'Headers',
           'Request',
-          'Response'
+          'Response',
+          'AbortController'
         ]
       }
     });
@@ -100,9 +101,11 @@ module.exports = {
    */
   treeForVendor: function() {
     var browserTree = treeForBrowserFetch();
-    var forcePolyfill = this.buildConfig.forcePolyfill;
-    browserTree = map(browserTree, (content) => `var forcePolyfill = ${forcePolyfill}; ${content}`);
-    browserTree = map(browserTree, (content) => `if (typeof FastBoot === 'undefined') { ${content} }`);
+    var preferNative = this.buildConfig.preferNative;
+    browserTree = map(browserTree, (content) => `if (typeof FastBoot === 'undefined') {
+      var preferNative = ${preferNative};
+      ${content}
+    }`);
     return browserTree;
   },