Skip to content

Commit da1a9b2

Browse files
committed
remove ember-fetch
1 parent 09a6093 commit da1a9b2

File tree

3 files changed

+21
-209
lines changed

3 files changed

+21
-209
lines changed

addon/services/apollo.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { get, set, setProperties, defineProperty } from '@ember/object';
22
import { sendEvent } from '@ember/object/events';
33
import RSVP from 'rsvp';
44
import Service from '@ember/service';
5-
import fetch from 'fetch';
65
import { A } from '@ember/array';
76
import {
87
ApolloClient,
@@ -14,10 +13,14 @@ import { isArray } from '@ember/array';
1413
import { isNone, isPresent } from '@ember/utils';
1514
import { run, next } from '@ember/runloop';
1615
import { QueryManager } from '../index';
17-
import { waitForPromise } from '@ember/test-waiters';
16+
import { waitForPromise, waitForFetch } from '@ember/test-waiters';
1817
import { tracked } from '@glimmer/tracking';
1918
import { macroCondition, isTesting } from '@embroider/macros';
2019

20+
export function wrappedFetch(...args) {
21+
return waitForFetch(fetch(...args));
22+
}
23+
2124
const apolloObservableWeakMap = new WeakMap();
2225
const apolloUnsubscribeWeakMap = new WeakMap();
2326

@@ -151,7 +154,7 @@ export default class ApolloService extends Service {
151154

152155
link() {
153156
const { apiURL, requestCredentials } = this.options;
154-
const linkOptions = { uri: apiURL, fetch };
157+
const linkOptions = { uri: apiURL, fetch: wrappedFetch };
155158

156159
if (isPresent(requestCredentials)) {
157160
linkOptions.credentials = requestCredentials;

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
"ember-cli-terser": "^4.0.2",
6262
"ember-compatibility-helpers": "^1.2.6",
6363
"ember-disable-prototype-extensions": "^1.1.3",
64-
"ember-fetch": "^8.1.1",
6564
"ember-load-initializers": "^2.1.2",
6665
"ember-page-title": "^7.0.0",
6766
"ember-qunit": "^8.1.1",

0 commit comments

Comments
 (0)