Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Ensure transporters are using isomorphic-fetch instead of browser only whatwg-fetch" #1058

Merged
merged 2 commits into from
Dec 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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