From 33632894f85421fa7ebe0307fe27719fac6b306d Mon Sep 17 00:00:00 2001 From: Matthew Andrews Date: Tue, 27 Jan 2015 19:57:03 +0000 Subject: [PATCH 1/3] Switch to node-fetch, thanks @bitinn --- .jshintrc | 2 +- package.json | 4 ++-- server.js | 11 ++--------- test/api.test.js | 1 + 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.jshintrc b/.jshintrc index 9059707..3686db7 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,5 +1,5 @@ { "node": true, "browser": true, - "predef": ["describe", "it", "before", "fetch"] + "predef": ["describe", "it", "before"] } diff --git a/package.json b/package.json index 4bdef1e..bd62e20 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/matthew-andrews/node-fetch", "dependencies": { - "whatwg-fetch": "matthew-andrews/fetch#ie9", - "xmlhttprequest": "matthew-andrews/node-XMLHttpRequest" + "node-fetch": "^1.0.1", + "whatwg-fetch": "matthew-andrews/fetch#ie9" }, "devDependencies": { "chai": "^1.10.0", diff --git a/server.js b/server.js index 0581573..4517242 100644 --- a/server.js +++ b/server.js @@ -1,17 +1,10 @@ "use strict"; -global.XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; -var noConflictSelf = global.self; -global.self = {}; -require('whatwg-fetch'); -global.Headers = global.self.Headers; -global.Request = global.self.Request; -global.Response = global.self.Response; -var realFetch = global.self.fetch; +var fetch = require('node-fetch'); +var realFetch = fetch; global.fetch = function(url, options) { if (/^\/\//.test(url)) { url = 'https:' + url; } return realFetch.call(this, url, options); }; -global.self = noConflictSelf; diff --git a/test/api.test.js b/test/api.test.js index b87fb03..4d59d34 100644 --- a/test/api.test.js +++ b/test/api.test.js @@ -1,3 +1,4 @@ +/*global fetch*/ "use strict"; require('es6-promise').polyfill(); From 1a858fa822882418049810ebbd8f34b2ccf269fe Mon Sep 17 00:00:00 2001 From: Matthew Andrews Date: Tue, 10 Feb 2015 21:07:37 +0000 Subject: [PATCH 2/3] ar --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 93e2e23..0c68c74 100644 --- a/server.js +++ b/server.js @@ -1,6 +1,6 @@ "use strict"; -ar fetch = require('node-fetch'); +var fetch = require('node-fetch'); var realFetch = fetch; module.exports = global.fetch = function(url, options) { if (/^\/\//.test(url)) { From 87e8ea4285e111ee7b38bb8d6e2de57ca2a82a47 Mon Sep 17 00:00:00 2001 From: Matthew Andrews Date: Tue, 10 Feb 2015 21:10:02 +0000 Subject: [PATCH 3/3] Simpler --- server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server.js b/server.js index 0c68c74..a5896be 100644 --- a/server.js +++ b/server.js @@ -1,7 +1,6 @@ "use strict"; -var fetch = require('node-fetch'); -var realFetch = fetch; +var realFetch = require('node-fetch'); module.exports = global.fetch = function(url, options) { if (/^\/\//.test(url)) { url = 'https:' + url;