Skip to content

Commit

Permalink
Merge pull request #1058 from apollostack/revert-1018-isomorphic-fetch
Browse files Browse the repository at this point in the history
Revert "Ensure transporters are using isomorphic-fetch instead of browser only whatwg-fetch"
  • Loading branch information
helfer authored Dec 18, 2016
2 parents 962b32a + e148ad5 commit ed078f4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
1 change: 0 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ David Alan Hjelle <dahjelle+github.com@thehjellejar.com>
David Glasser <glasser@meteor.com>
Dhaivat Pandya <dhaivat@meteor.com>
Dhaivat Pandya <dhaivatpandya@gmail.com>
Guilherme Blanco <guilhermeblanco@hotmail.com>
Google Inc.
Ian Grayson <ian133@gmail.com>
Ian MacLeod <ian@nevir.net>
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"lodash": "^4.17.2",
"redux": "^3.3.1",
"symbol-observable": "^1.0.2",
"isomorphic-fetch": "^2.2.1"
"whatwg-fetch": "^2.0.0"
},
"devDependencies": {
"@types/chai-as-promised": "0.0.28",
Expand All @@ -58,6 +58,7 @@
"grunt": "1.0.1",
"grunt-tslint": "4.0.0",
"gzip-size": "^3.0.0",
"isomorphic-fetch": "^2.2.1",
"istanbul": "^0.4.5",
"lodash": "^4.17.1",
"minimist": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/transport/batchedNetworkInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
GraphQLResult,
} from 'graphql';

import 'isomorphic-fetch';
import 'whatwg-fetch';

import assign = require('lodash/assign');
import isNumber = require('lodash/isNumber');
Expand Down
2 changes: 1 addition & 1 deletion src/transport/networkInterface.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import isString = require('lodash/isString');
import assign = require('lodash/assign');
import mapValues = require('lodash/mapValues');
import 'isomorphic-fetch';
import 'whatwg-fetch';

import {
GraphQLResult,
Expand Down
2 changes: 1 addition & 1 deletion test/batchedNetworkInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { AfterwareInterface } from '../src/transport/afterware';

import { GraphQLResult } from 'graphql';

import 'isomorphic-fetch';
import 'whatwg-fetch';

import gql from 'graphql-tag';

Expand Down
6 changes: 3 additions & 3 deletions test/mocks/mockFetch.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'isomorphic-fetch';
import 'whatwg-fetch';

// This is an implementation of a mocked window.fetch/global.fetch implementation
// similar in structure to the MockedNetworkInterface.
// This is an implementation of a mocked window.fetch implementation similar in
// structure to the MockedNetworkInterface.

export interface MockedIResponse {
json(): Promise<JSON>;
Expand Down

0 comments on commit ed078f4

Please sign in to comment.