chore: remove more runloop usage | completely remove rsvp

package.json

@@ -43,7 +43,6 @@
     "@glimmer/component": "^1.1.2",
     "@types/jquery": "^3.5.18",
     "@types/qunit": "^2.19.6",
-    "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^6.6.0",
     "@typescript-eslint/parser": "^6.6.0",
     "chalk": "^4.1.2",

tests/embroider-basic-compat/package.json

@@ -49,7 +49,6 @@
     "@glimmer/tracking": "^1.1.2",
     "@types/ember": "^4.0.4",
     "@types/ember__owner": "^4.0.5",
-    "@types/rsvp": "^4.0.4",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~5.2.1",
     "ember-cli-babel": "^8.0.0",

tests/fastboot/package.json

@@ -46,7 +46,6 @@
     "@glimmer/tracking": "^1.1.2",
     "@types/ember": "^4.0.4",
     "@types/ember__owner": "^4.0.5",
-    "@types/rsvp": "^4.0.4",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~5.2.1",
     "ember-cli-babel": "^8.0.0",

tests/main/package.json

@@ -76,7 +76,6 @@
     "@types/ember__owner": "^4.0.5",
     "@types/ember__utils": "^4.0.3",
     "@types/qunit": "^2.19.6",
-    "@types/rsvp": "^4.0.4",
     "broccoli-concat": "^4.2.5",
     "broccoli-merge-trees": "^4.2.0",
     "broccoli-stew": "^3.0.0",

tests/main/tests/integration/adapter/find-all-test.js

@@ -1,11 +1,11 @@
 import { settled } from '@ember/test-helpers';
 
 import { module, test } from 'qunit';
-import { defer } from 'rsvp';
 
 import { setupTest } from 'ember-qunit';
 
 import Model, { attr } from '@ember-data/model';
+import { createDeferred } from '@ember-data/request';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 import testInDebug from '@ember-data/unpublished-test-infra/test-support/test-in-debug';
 
@@ -157,7 +157,7 @@ module('integration/adapter/find-all - Finding All Records of a Type', function
   });
 
   test('isUpdating is true while records are fetched', async function (assert) {
-    let findAllDeferred = defer();
+    let findAllDeferred = createDeferred();
     let adapter = store.adapterFor('person');
     adapter.findAll = () => findAllDeferred.promise;
     adapter.shouldReloadAll = () => true;
@@ -186,7 +186,7 @@ module('integration/adapter/find-all - Finding All Records of a Type', function
   });
 
   test('isUpdating is true while records are fetched in the background', async function (assert) {
-    let findAllDeferred = defer();
+    let findAllDeferred = createDeferred();
     let adapter = store.adapterFor('person');
     adapter.findAll = () => {
       return findAllDeferred.promise;
@@ -223,7 +223,7 @@ module('integration/adapter/find-all - Finding All Records of a Type', function
   });
 
   test('isUpdating is false if records are not fetched in the background', async function (assert) {
-    let findAllDeferred = defer();
+    let findAllDeferred = createDeferred();
     let adapter = store.adapterFor('person');
     adapter.findAll = () => {
       return findAllDeferred.promise;

tests/main/tests/integration/adapter/record-persistence-test.js

@@ -1,5 +1,4 @@
 import { module, test } from 'qunit';
-import { hash } from 'rsvp';
 
 import { setupTest } from 'ember-qunit';
 
@@ -233,10 +232,7 @@ module('integration/adapter/record_persistence - Persisting Records', function (
       ],
     });
 
-    let { tom, yehuda } = await hash({
-      tom: store.findRecord('person', '1'),
-      yehuda: store.findRecord('person', '2'),
-    });
+    let [tom, yehuda] = await Promise.all([store.findRecord('person', '1'), store.findRecord('person', '2')]);
 
     tom.set('name', 'Draaaaaahm Dale');
     yehuda.set('name', 'Goy Katz');
@@ -309,10 +305,7 @@ module('integration/adapter/record_persistence - Persisting Records', function (
       ],
     });
 
-    let { tom, yehuda } = await hash({
-      tom: store.findRecord('person', '1'),
-      yehuda: store.findRecord('person', '2'),
-    });
+    let [tom, yehuda] = await Promise.all([store.findRecord('person', '1'), store.findRecord('person', '2')]);
 
     assert.false(tom.isDeleted, 'Tom is not deleted');
     assert.false(yehuda.isDeleted, 'Yehuda is not deleted');

tests/main/tests/integration/adapter/store-adapter-test.js

@@ -1,7 +1,6 @@
 import { get, set } from '@ember/object';
 
 import { module, test } from 'qunit';
-import { hash } from 'rsvp';
 
 import { setupTest } from 'ember-qunit';
 
@@ -117,14 +116,7 @@ module('integration/adapter/store-adapter - DS.Store and DS.Adapter integration
     let tom = store.createRecord('person', { name: 'Tom Dale' });
     let yehuda = store.createRecord('person', { name: 'Yehuda Katz' });
 
-    let promise = hash({
-      tom: tom.save(),
-      yehuda: yehuda.save(),
-    });
-
-    let records = await promise;
-    tom = records.tom;
-    yehuda = records.yehuda;
+    [tom, yehuda] = await Promise.all([tom.save(), yehuda.save()]);
 
     assert.strictEqual(
       tom,
@@ -184,25 +176,12 @@ module('integration/adapter/store-adapter - DS.Store and DS.Adapter integration
       ],
     });
 
-    let promise = hash({
-      tom: store.findRecord('person', '1'),
-      yehuda: store.findRecord('person', '2'),
-    });
-
-    let records1 = await promise;
-    let tom = records1.tom;
-    let yehuda = records1.yehuda;
+    let [tom, yehuda] = await Promise.all([store.findRecord('person', '1'), store.findRecord('person', '2')]);
 
     set(tom, 'name', 'Tom Dale');
     set(yehuda, 'name', 'Yehuda Katz');
 
-    let records2 = await hash({
-      tom: tom.save(),
-      yehuda: yehuda.save(),
-    });
-
-    let tom2 = records2.tom;
-    let yehuda2 = records2.yehuda;
+    let [tom2, yehuda2] = await Promise.all([tom.save(), yehuda.save()]);
 
     assert.false(tom2.isSaving, 'record is no longer saving');
     assert.true(tom2.isLoaded, 'record is loaded');
@@ -319,19 +298,12 @@ module('integration/adapter/store-adapter - DS.Store and DS.Adapter integration
       ],
     });
 
-    let promise = hash({
-      tom: store.findRecord('person', '1'),
-      yehuda: store.findRecord('person', '2'),
-    });
-
-    let records = await promise;
-    let tom = records.tom;
-    let yehuda = records.yehuda;
+    let [tom, yehuda] = await Promise.all([store.findRecord('person', '1'), store.findRecord('person', '2')]);
 
     tom.deleteRecord();
     yehuda.deleteRecord();
 
-    return Promise.all([tom.save(), yehuda.save()]);
+    await Promise.all([tom.save(), yehuda.save()]);
   });
 
   test('by default, destroyRecord calls deleteRecord once per record without requiring .save', async function (assert) {
@@ -379,16 +351,9 @@ module('integration/adapter/store-adapter - DS.Store and DS.Adapter integration
       ],
     });
 
-    let promise = hash({
-      tom: store.findRecord('person', '1'),
-      yehuda: store.findRecord('person', '2'),
-    });
-
-    let records = await promise;
-    let tom = records.tom;
-    let yehuda = records.yehuda;
+    let [tom, yehuda] = await Promise.all([store.findRecord('person', '1'), store.findRecord('person', '2')]);
 
-    return Promise.all([tom.destroyRecord(), yehuda.destroyRecord()]);
+    await Promise.all([tom.destroyRecord(), yehuda.destroyRecord()]);
   });
 
   test('if an existing model is edited then deleted, deleteRecord is called on the adapter', async function (assert) {

tests/main/tests/integration/identifiers/lid-reflection-test.ts

@@ -1,13 +1,13 @@
 import EmberObject from '@ember/object';
 
 import { module, test } from 'qunit';
-import { defer } from 'rsvp';
 
 import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
 import type { Snapshot } from '@ember-data/legacy-compat/-private';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+import { createDeferred } from '@ember-data/request';
 import type Store from '@ember-data/store';
 import { recordIdentifierFor } from '@ember-data/store';
 
@@ -79,16 +79,16 @@ module('Integration | Identifiers - lid reflection', function (hooks: NestedHook
   });
 
   test(`A newly created record can receive a payload by lid (after save, before Adapter.createRecord resolves)`, async function (assert: Assert) {
-    const adapterPromise = defer();
-    const beganSavePromise = defer();
+    const adapterPromise = createDeferred();
+    const beganSavePromise = createDeferred();
     class TestSerializer extends EmberObject {
       normalizeResponse(_, __, payload: Record<string, unknown>) {
         return payload;
       }
     }
     class TestAdapter extends Adapter {
       createRecord(store, ModelClass, snapshot: Snapshot) {
-        beganSavePromise.resolve();
+        beganSavePromise.resolve(void 0);
         return adapterPromise.promise.then(() => {
           return {
             data: {
@@ -138,7 +138,7 @@ module('Integration | Identifiers - lid reflection', function (hooks: NestedHook
 
     assert.strictEqual(record.name, 'Chris', 'We use the in-flight name, rollback has no effect');
 
-    adapterPromise.resolve();
+    adapterPromise.resolve(void 0);
     await savePromise;
 
     assert.strictEqual(record.name, '@runspired', 'After we finish we use the most recent clean name');

tests/main/tests/integration/records/save-test.js

@@ -1,13 +1,13 @@
 import { settled } from '@ember/test-helpers';
 
 import { module, test } from 'qunit';
-import { defer } from 'rsvp';
 
 import { setupTest } from 'ember-qunit';
 
 import Adapter from '@ember-data/adapter';
 import { InvalidError } from '@ember-data/adapter/error';
 import Model, { attr } from '@ember-data/model';
+import { createDeferred } from '@ember-data/request';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 import testInDebug from '@ember-data/unpublished-test-infra/test-support/test-in-debug';
 
@@ -29,7 +29,7 @@ module('integration/records/save - Save Record', function (hooks) {
     let adapter = store.adapterFor('application');
     let post = store.createRecord('post', { title: 'toto' });
 
-    const deferred = defer();
+    const deferred = createDeferred();
     adapter.createRecord = function (store, type, snapshot) {
       return deferred.promise;
     };