chore: burn down runloop and RSVP usage

.eslintrc.js

@@ -50,9 +50,8 @@ module.exports = {
     'no-restricted-imports': [
       'error',
       {
-        paths: ['@glimmer/env', '@ember/utils'],
+        paths: ['@glimmer/env', '@ember/utils', '@ember/runloop'],
       },
-      // '@ember/runloop',
       // '@ember/string',
       // '@ember/object',
       // '@ember/service',
@@ -97,10 +96,10 @@ module.exports = {
         'no-restricted-imports': [
           'error',
           {
-            paths: ['@glimmer/env', '@ember/utils'],
+            paths: ['@glimmer/env', '@ember/utils', '@ember/runloop'],
             // patterns: ['@ember/*'],
           },
-          // '@ember/runloop',@glimmer/env
+
           // '@ember/string',
           // '@ember/object',
           // '@ember/service',
@@ -207,8 +206,6 @@ module.exports = {
         '@types/ember/index.d.ts',
         '@types/@glimmer/tracking.d.ts',
         '@types/@ember/utils/index.d.ts',
-        '@types/@ember/runloop/index.d.ts',
-        '@types/@ember/runloop/-private/backburner.d.ts',
         '@types/@ember/object/compat.d.ts',
         '@types/@ember/debug/index.d.ts',
         'ember-data-types/q/schema-definition-service.ts',
@@ -222,7 +219,6 @@ module.exports = {
         'ember-data-types/q/identifier.ts',
         'ember-data-types/q/fetch-manager.ts',
         'ember-data-types/q/ember-data-json-api.ts',
-        '@types/@ember/runloop/index.d.ts',
         '@types/@ember/polyfills/index.d.ts',
         'tests/graph/tests/integration/graph/polymorphism/implicit-keys-test.ts',
         'tests/graph/tests/integration/graph/graph-test.ts',

package.json

@@ -41,7 +41,6 @@
     "@ember/string": "3.1.1",
     "@ember/test-helpers": "^3.2.0",
     "@glimmer/component": "^1.1.2",
-    "@glimmer/env": "^0.1.7",
     "@types/jquery": "^3.5.18",
     "@types/qunit": "^2.19.6",
     "@types/rsvp": "^4.0.4",
@@ -107,6 +106,13 @@
     }
   },
   "pnpm": {
+    "packageExtensions": {
+      "@glimmer/syntax": {
+        "dependencies": {
+          "@glimmer/env": "^0.1.7"
+        }
+      }
+    },
     "overrides": {
       "ember-auto-import": "^2.6.3",
       "@embroider/macros": "^1.12.2",

packages/-ember-data/package.json

@@ -34,7 +34,6 @@
     "@ember-data/tracking": "workspace:5.4.0-alpha.12",
     "@ember/edition-utils": "^1.2.0",
     "@embroider/macros": "^1.13.1",
-    "@glimmer/env": "^0.1.7",
     "broccoli-merge-trees": "^4.2.0",
     "ember-auto-import": "^2.6.3",
     "ember-cli-babel": "^8.0.0",

packages/adapter/rollup.config.mjs

@@ -23,8 +23,6 @@ export default {
     '@ember/object',
     '@ember/object/mixin',
     '@ember/application',
-    '@glimmer/env',
-    '@ember/runloop',
     '@ember/polyfills',
   ],
 

packages/adapter/src/rest.ts

@@ -4,7 +4,6 @@
 import { getOwner } from '@ember/application';
 import { assert, warn } from '@ember/debug';
 import { computed } from '@ember/object';
-import { join } from '@ember/runloop';
 
 import { DEBUG } from '@ember-data/env';
 import type { Snapshot, SnapshotRecordArray } from '@ember-data/legacy-compat/-private';
@@ -1542,12 +1541,12 @@ function execjQAjax(
   return new Promise((resolve, reject) => {
     hash.success = function (payload, textStatus, jqXHR) {
       let response = ajaxSuccessHandler(adapter, payload, jqXHR, requestData);
-      join(null, resolve, response);
+      resolve(response);
     };
 
     hash.error = function (jqXHR, textStatus, errorThrown) {
       let error = ajaxErrorHandler(adapter, jqXHR, errorThrown, requestData);
-      join(null, reject, error);
+      reject(error);
     };
 
     adapter._ajax(hash);

packages/graph/rollup.config.mjs

@@ -22,7 +22,6 @@ export default {
     '@ember/object',
     '@ember/object/mixin',
     '@ember/application',
-    '@glimmer/env',
     '@ember/polyfills',
   ],
 

packages/json-api/rollup.config.mjs

@@ -22,11 +22,9 @@ export default {
     '@ember/object',
     '@ember/object/mixin',
     '@ember/polyfills',
-    '@ember/runloop',
     '@ember/service',
     '@ember/string',
     '@embroider/macros',
-    '@glimmer/env',
     'ember-inflector',
   ],
 

packages/json-api/src/-private/cache.ts

@@ -2,7 +2,6 @@
  * @module @ember-data/json-api
  */
 import { assert } from '@ember/debug';
-import { schedule } from '@ember/runloop';
 
 import { LOG_MUTATIONS, LOG_OPERATIONS, LOG_REQUESTS } from '@ember-data/debugging';
 import { DEPRECATE_RELATIONSHIP_REMOTE_UPDATE_CLEARING_LOCAL_STATE } from '@ember-data/deprecations';
@@ -996,11 +995,10 @@ export default class JSONAPICache implements Cache {
      * of a test won't cause issues.
      */
     if (this.__destroyedCache.size === 1) {
-      schedule('destroy', () => {
-        setTimeout(() => {
-          this.__destroyedCache.clear();
-        }, 100);
-      });
+      // TODO do we still need this?
+      setTimeout(() => {
+        this.__destroyedCache.clear();
+      }, 100);
     }
 
     if (!removed && removeFromRecordArray) {

packages/model/rollup.config.mjs

@@ -32,9 +32,7 @@ export default {
     '@ember/object',
     '@ember/object/mixin',
     '@ember/application',
-    '@glimmer/env',
     '@glimmer/tracking',
-    '@ember/runloop',
     '@ember/polyfills',
   ],
 

packages/model/src/-private/model.js

@@ -5,7 +5,6 @@
 import { assert, warn } from '@ember/debug';
 import EmberObject from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
-import { run } from '@ember/runloop';
 import { tracked } from '@glimmer/tracking';
 import Ember from 'ember';
 
@@ -734,9 +733,7 @@ class Model extends EmberObject {
       return Promise.resolve(this);
     }
     return this.save(options).then((_) => {
-      run(() => {
-        this.unloadRecord();
-      });
+      this.unloadRecord();
       return this;
     });
   }

packages/store/src/-private/managers/notification-manager.ts

@@ -2,6 +2,7 @@
  * @module @ember-data/store
  */
 import { assert } from '@ember/debug';
+// eslint-disable-next-line no-restricted-imports
 import { _backburner } from '@ember/runloop';
 
 import { LOG_NOTIFICATIONS } from '@ember-data/debugging';

packages/store/src/-private/store-service.ts

@@ -5,7 +5,6 @@
 import { getOwner } from '@ember/application';
 import { assert } from '@ember/debug';
 import EmberObject from '@ember/object';
-import { _backburner as emberBackburner } from '@ember/runloop';
 
 import type { Object as JSONObject } from 'json-typescript';
 
@@ -664,47 +663,45 @@ class Store extends EmberObject {
     //
     //   to remove this, we would need to move to a new `async` API.
     let record!: RecordInstance;
-    emberBackburner.join(() => {
-      this._join(() => {
-        let normalizedModelName = normalizeModelName(modelName);
-        let properties = { ...inputProperties };
+    this._join(() => {
+      let normalizedModelName = normalizeModelName(modelName);
+      let properties = { ...inputProperties };
 
-        // If the passed properties do not include a primary key,
-        // give the adapter an opportunity to generate one. Typically,
-        // client-side ID generators will use something like uuid.js
-        // to avoid conflicts.
+      // If the passed properties do not include a primary key,
+      // give the adapter an opportunity to generate one. Typically,
+      // client-side ID generators will use something like uuid.js
+      // to avoid conflicts.
 
-        if (properties.id === null || properties.id === undefined) {
-          let adapter = this.adapterFor(modelName, true);
+      if (properties.id === null || properties.id === undefined) {
+        let adapter = this.adapterFor(modelName, true);
 
-          if (adapter && adapter.generateIdForRecord) {
-            properties.id = adapter.generateIdForRecord(this, modelName, properties);
-          } else {
-            properties.id = null;
-          }
+        if (adapter && adapter.generateIdForRecord) {
+          properties.id = adapter.generateIdForRecord(this, modelName, properties);
+        } else {
+          properties.id = null;
         }
+      }
 
-        // Coerce ID to a string
-        properties.id = coerceId(properties.id);
-        const resource = { type: normalizedModelName, id: properties.id };
+      // Coerce ID to a string
+      properties.id = coerceId(properties.id);
+      const resource = { type: normalizedModelName, id: properties.id };
 
-        if (resource.id) {
-          const identifier = this.identifierCache.peekRecordIdentifier(resource as ResourceIdentifierObject);
+      if (resource.id) {
+        const identifier = this.identifierCache.peekRecordIdentifier(resource as ResourceIdentifierObject);
 
-          assert(
-            `The id ${String(properties.id)} has already been used with another '${normalizedModelName}' record.`,
-            !identifier
-          );
-        }
+        assert(
+          `The id ${String(properties.id)} has already been used with another '${normalizedModelName}' record.`,
+          !identifier
+        );
+      }
 
-        const identifier = this.identifierCache.createIdentifierForNewRecord(resource);
-        const cache = this.cache;
+      const identifier = this.identifierCache.createIdentifierForNewRecord(resource);
+      const cache = this.cache;
 
-        const createOptions = normalizeProperties(this, identifier, properties);
-        const resultProps = cache.clientDidCreate(identifier, createOptions);
+      const createOptions = normalizeProperties(this, identifier, properties);
+      const resultProps = cache.clientDidCreate(identifier, createOptions);
 
-        record = this._instanceCache.getRecord(identifier, resultProps);
-      });
+      record = this._instanceCache.getRecord(identifier, resultProps);
     });
     return record;
   }
@@ -738,9 +735,7 @@ class Store extends EmberObject {
       cache.setIsDeleted(identifier, true);
 
       if (cache.isNew(identifier)) {
-        emberBackburner.join(() => {
-          this._instanceCache.unloadRecord(identifier);
-        });
+        this._instanceCache.unloadRecord(identifier);
       }
     });
   }

tests/adapter-encapsulation/tests/integration/belongs-to-test.js

@@ -2,7 +2,6 @@ import EmberObject from '@ember/object';
 
 import Store from 'adapter-encapsulation-test-app/services/store';
 import { module, test } from 'qunit';
-import { resolve } from 'rsvp';
 
 import { setupTest } from 'ember-qunit';
 
@@ -165,7 +164,7 @@ module('integration/belongs-to - Belongs To Tests', function (hooks) {
         assert.strictEqual(snapshot.modelName, 'comment', 'snapshot is passed to findBelongsTo with correct modelName');
         assert.strictEqual(snapshot.id, '3', 'snapshot is passed to findBelongsTo with correct id');
 
-        return resolve(expectedResultCopy);
+        return Promise.resolve(expectedResultCopy);
       }
     }
 
@@ -276,7 +275,7 @@ module('integration/belongs-to - Belongs To Tests', function (hooks) {
         assert.strictEqual(snapshot.modelName, 'post', 'snapshot is passed to findRecord with correct modelName');
         assert.strictEqual(snapshot.id, '2', 'snapshot is passed to findRecord with correct id');
 
-        return resolve(expectedResultCopy);
+        return Promise.resolve(expectedResultCopy);
       }
 
       findBelongsTo() {
@@ -355,7 +354,7 @@ module('integration/belongs-to - Belongs To Tests', function (hooks) {
         assert.strictEqual(snapshot.modelName, 'post', 'snapshot is passed to findRecord with correct modelName');
         assert.strictEqual(snapshot.id, '2', 'snapshot is passed to findRecord with correct id');
 
-        return resolve(expectedResultCopy);
+        return Promise.resolve(expectedResultCopy);
       }
     }
 
@@ -439,7 +438,7 @@ module('integration/belongs-to - Belongs To Tests', function (hooks) {
         assert.strictEqual(snapshot.modelName, 'comment', 'snapshot is passed to findBelongsTo with correct modelName');
         assert.strictEqual(snapshot.id, '3', 'snapshot is passed to findBelongsTo with correct id');
 
-        return resolve(expectedResultCopy);
+        return Promise.resolve(expectedResultCopy);
       }
     }
 
@@ -514,7 +513,7 @@ module('integration/belongs-to - Belongs To Tests', function (hooks) {
         assert.strictEqual(snapshot.modelName, 'post', 'snapshot is passed to findRecord with correct modelName');
         assert.strictEqual(snapshot.id, '2', 'snapshot is passed to findRecord with correct id');
 
-        return resolve(expectedResultCopy);
+        return Promise.resolve(expectedResultCopy);
       }
     }