Merge pull request #10956 from mansona/ember-fetch

Remove `ember-fetch` dependency

Author: Turbo87

app/models/version.js

@@ -4,7 +4,6 @@ import { cached } from '@glimmer/tracking';
 
 import { apiAction } from '@mainmatter/ember-api-actions';
 import { keepLatestTask, task } from 'ember-concurrency';
-import fetch from 'fetch';
 import { alias } from 'macro-decorators';
 import semverParse from 'semver/functions/parse';
 
@@ -135,7 +134,7 @@ export default class Version extends Model {
 
   loadReadmeTask = keepLatestTask(async () => {
     if (this.readme_path) {
-      let response = await fetch(this.readme_path);
+      let response = await waitForPromise(fetch(this.readme_path));
       if (response.status === 404 || response.status === 403) {
         return;
       }
@@ -144,7 +143,7 @@ export default class Version extends Model {
         throw new Error(`README request for ${this.crateName} v${this.num} failed`);
       }
 
-      return await response.text();
+      return await waitForPromise(response.text());
     }
   });
 

app/utils/ajax.js

@@ -1,15 +1,14 @@
 import { runInDebug } from '@ember/debug';
-
-import fetch from 'fetch';
+import { waitForPromise } from '@ember/test-waiters';
 
 export default async function ajax(input, init) {
   let method = init?.method ?? 'GET';
 
   let cause;
   try {
-    let response = await fetch(input, init);
+    let response = await waitForPromise(fetch(input, init));
     if (response.ok) {
-      return await response.json();
+      return await waitForPromise(response.json());
     }
     cause = new HttpError({ url: input, method, response });
   } catch (error) {
@@ -68,7 +67,7 @@ export class AjaxError extends Error {
 
   async json() {
     try {
-      return await this.cause.response.json();
+      return await waitForPromise(this.cause.response.json());
     } catch {
       // ignore errors and implicitly return `undefined`
     }

package.json

@@ -102,7 +102,6 @@
     "ember-error-route": "0.2.0",
     "ember-event-helpers": "0.1.1",
     "ember-exam": "9.1.0",
-    "ember-fetch": "8.1.2",
     "ember-inflector": "6.0.0",
     "ember-keyboard": "9.0.1",
     "ember-link": "3.3.0",