Use fetch instead of ember-ajax

app/adapters/application.js

@@ -1,5 +1,6 @@
 import DS from 'ember-data';
+import AdapterFetch from 'ember-fetch/mixins/adapter-fetch';
 
-export default DS.RESTAdapter.extend({
+export default DS.RESTAdapter.extend(AdapterFetch, {
     namespace: 'api/v1',
 });

app/components/email-input.js

@@ -2,9 +2,9 @@ import Component from '@ember/component';
 import { empty } from '@ember/object/computed';
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
 
 export default Component.extend({
-    ajax: service(),
     flashMessages: service(),
 
     type: '',
@@ -96,7 +96,7 @@ export default Component.extend({
             let user = this.get('user');
 
             try {
-                await this.get('ajax').raw(`/api/v1/users/${user.id}/resend`, { method: 'PUT' });
+                await ajax(`/api/v1/users/${user.id}/resend`, { method: 'PUT' });
                 this.set('disableResend', true);
             } catch(error) {
                 if (error.payload) {

app/controllers/dashboard.js

@@ -1,14 +1,11 @@
 import Controller from '@ember/controller';
 import { A } from '@ember/array';
 import { computed } from '@ember/object';
-import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
 
 const TO_SHOW = 5;
 
 export default Controller.extend({
-
-    ajax: service(),
-
     init() {
         this._super(...arguments);
 
@@ -47,8 +44,7 @@ export default Controller.extend({
             let page = (this.get('myFeed').length / 10) + 1;
 
             try {
-                let data = await this.get('ajax').request(`/api/v1/me/updates?page=${page}`);
-
+                let data = await ajax(`/api/v1/me/updates?page=${page}`);
                 let versions = data.versions.map(version => this.store.push(this.store.normalize('version', version)));
 
                 this.get('myFeed').pushObjects(versions);

app/controllers/index.js

@@ -1,21 +1,18 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { readOnly } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
-
+import ajax from 'ember-fetch/ajax';
 import { task } from 'ember-concurrency';
 
 export default Controller.extend({
-    ajax: service(),
-
     model: readOnly('dataTask.lastSuccessful.value'),
 
     hasData: computed('dataTask.lastSuccessful', 'dataTask.isRunning', function() {
         return this.get('dataTask.lastSuccessful') || !this.get('dataTask.isRunning');
     }),
 
     dataTask: task(function* () {
-        let data = yield this.get('ajax').request('/api/v1/summary');
+        let data = yield ajax('/api/v1/summary');
 
         addCrates(this.store, data.new_crates);
         addCrates(this.store, data.most_downloaded);

app/controllers/me/index.js

@@ -7,8 +7,6 @@ export default Controller.extend({
 
     sortedTokens: sort('model.api_tokens', 'tokenSort'),
 
-    ajax: service(),
-
     flashMessages: service(),
 
     isResetting: false,

app/routes/confirm.js

@@ -1,13 +1,13 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
 
 export default Route.extend({
     flashMessages: service(),
-    ajax: service(),
 
     async model(params) {
         try {
-            await this.get('ajax').raw(`/api/v1/confirm/${params.email_token}`, { method: 'PUT', data: {} });
+            await ajax(`/api/v1/confirm/${params.email_token}`, { method: 'PUT', body: '{}' });
 
             /*  We need this block to reload the user model from the database,
                 without which if we haven't submitted another GET /me after
@@ -20,9 +20,8 @@ export default Route.extend({
                 Suggestions of a more ideomatic way to fix/test this are welcome!
             */
             if (this.session.get('isLoggedIn')) {
-                this.get('ajax').request('/api/v1/me').then((response) => {
-                    this.session.set('currentUser', this.store.push(this.store.normalize('user', response.user)));
-                });
+                let data = await ajax('/api/v1/me');
+                this.session.set('currentUser', this.store.push(this.store.normalize('user', data.user)));
             }
 
         } catch(error) {

app/routes/crate/version.js

@@ -1,11 +1,9 @@
 import { observer } from '@ember/object';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
 
 export default Route.extend({
-
-    ajax: service(),
-
     flashMessages: service(),
 
     refreshAfterLogin: observer('session.isLoggedIn', function() {
@@ -45,7 +43,7 @@ export default Route.extend({
                 crate.get('documentation').substr(0, 16) === 'https://docs.rs/') {
                 let crateName = crate.get('name');
                 let crateVersion = params.version_num;
-                this.get('ajax').request(`https://docs.rs/crate/${crateName}/${crateVersion}/builds.json`)
+                ajax(`https://docs.rs/crate/${crateName}/${crateVersion}/builds.json`, { mode: 'cors' })
                     .then((r) => {
                         if (r.length > 0 && r[0].build_status === true) {
                             crate.set('documentation', `https://docs.rs/${crateName}/${crateVersion}/`);

app/routes/github-authorize.js

@@ -1,5 +1,6 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
+import { serializeQueryParams } from 'ember-fetch/mixins/adapter-fetch';
 
 /**
  * This route will be called from the GitHub OAuth flow once the user has
@@ -15,23 +16,21 @@ import { inject as service } from '@ember/service';
  * @see `/login` route
  */
 export default Route.extend({
-
-    ajax: service(),
-
     async beforeModel(transition) {
         try {
-            let d = await this.get('ajax').request(`/authorize`, { data: transition.queryParams });
-            let item = JSON.stringify({ ok: true, data: d });
+            let queryParams = serializeQueryParams(transition.queryParams);
+            let data = await ajax(`/authorize?${queryParams}`);
+            let item = JSON.stringify({ ok: true, data });
             if (window.opener) {
                 window.opener.github_response = item;
             }
         } catch(d) {
-            let item = JSON.stringify({ ok: false, data: d });
+            let item = JSON.stringify({ ok: false, data });
             if (window.opener) {
                 window.opener.github_response = item;
             }
         } finally {
             window.close();
         }
-    },
+    }
 });

app/routes/github-login.js

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
 
 /**
  * Calling this route will query the `/authorize_url` API endpoint
@@ -15,11 +15,8 @@ import { inject as service } from '@ember/service';
  * @see `/github_authorize` route
  */
 export default Route.extend({
-
-    ajax: service(),
-
     async beforeModel() {
-        let url = await this.get('ajax').request(`/authorize_url`);
+        let url = await ajax(`/authorize_url`);
         window.location = url.url;
     },
 });

app/routes/logout.js

@@ -1,13 +1,10 @@
 import { run } from '@ember/runloop';
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
 
 export default Route.extend({
-
-    ajax: service(),
-
     async activate() {
-        await this.get('ajax').delete(`/logout`);
+        await ajax(`/logout`, { method: 'DELETE' });
         run(() => {
             this.session.logoutUser();
             this.transitionTo('index');

package.json

@@ -27,7 +27,6 @@
   "devDependencies": {
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "broccoli-asset-rev": "2.5.0",
-    "ember-ajax": "^3.0.0",
     "ember-cli": "~2.17.0",
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-babel": "^6.8.2",